From: Eric Anholt Date: Wed, 13 May 2015 20:10:32 +0000 (-0700) Subject: mailbox/bcm2835: Fix mailbox full detection. X-Git-Tag: v5.15~15566^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d641938aa2ae433a97cc65ec622547cfe08f2ed;p=platform%2Fkernel%2Flinux-starfive.git 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: Phil Elwell Signed-off-by: Eric Anholt Acked-by: Stephen Warren Signed-off-by: Jassi Brar --- diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c index 4b13268..0b47dd4 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -49,6 +49,7 @@ #define MAIL0_STA (ARM_0_MAIL0 + 0x18) #define MAIL0_CNF (ARM_0_MAIL0 + 0x1C) #define MAIL1_WRT (ARM_0_MAIL1 + 0x00) +#define MAIL1_STA (ARM_0_MAIL1 + 0x18) /* Status register: FIFO state. */ #define ARM_MS_FULL BIT(31) @@ -117,7 +118,7 @@ static bool bcm2835_last_tx_done(struct mbox_chan *link) bool ret; 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); return ret; }