Commit 7d641938 authored by Eric Anholt's avatar Eric Anholt Committed by Jassi Brar

mailbox/bcm2835: Fix mailbox full detection.

With the VC reader blocked and the ARM writing, MAIL0_STA reads empty
permanently while MAIL1_STA goes from empty (0x40000000) to non-empty
(0x00000001-0x00000007) to full (0x80000008).

This bug ended up having no effect on us, because all of our
transactions in the client driver were synchronous and under a mutex.
Suggested-by: default avatarPhil Elwell <phil@raspberrypi.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent 07a7dba1
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define MAIL0_STA (ARM_0_MAIL0 + 0x18) #define MAIL0_STA (ARM_0_MAIL0 + 0x18)
#define MAIL0_CNF (ARM_0_MAIL0 + 0x1C) #define MAIL0_CNF (ARM_0_MAIL0 + 0x1C)
#define MAIL1_WRT (ARM_0_MAIL1 + 0x00) #define MAIL1_WRT (ARM_0_MAIL1 + 0x00)
#define MAIL1_STA (ARM_0_MAIL1 + 0x18)
/* Status register: FIFO state. */ /* Status register: FIFO state. */
#define ARM_MS_FULL BIT(31) #define ARM_MS_FULL BIT(31)
...@@ -117,7 +118,7 @@ static bool bcm2835_last_tx_done(struct mbox_chan *link) ...@@ -117,7 +118,7 @@ static bool bcm2835_last_tx_done(struct mbox_chan *link)
bool ret; bool ret;
spin_lock(&mbox->lock); spin_lock(&mbox->lock);
ret = !(readl(mbox->regs + MAIL0_STA) & ARM_MS_FULL); ret = !(readl(mbox->regs + MAIL1_STA) & ARM_MS_FULL);
spin_unlock(&mbox->lock); spin_unlock(&mbox->lock);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment