[PATCH for-4.20] spi: bcm2835: Unbreak the build of esoteric configs

[PATCH for-4.20] spi: bcm2835: Unbreak the build of esoteric configs

[Lukas Wunner]

Commit e82b0b382845 ("spi: bcm2835: Fix race on DMA termination") broke
the build with COMPILE_TEST=y on arches whose cmpxchg() requires 32-bit
operands (xtensa, older arm ISAs).

Unfortunately the commit was applied despite prior warning that it needs
to be respun:
https://marc.info/?l=linux-spi&m=154186019626675&w=2

Fix by changing the dma_pending flag's type from bool to unsigned int.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Fixes: e82b0b382845 ("spi: bcm2835: Fix race on DMA termination")
Cc: Frank Pavlic <f.pavlic@kunbus.de>
Cc: Martin Sperl <kernel@martin.sperl.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
---
 drivers/spi/spi-bcm2835.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 774161b..25abf2d 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -88,7 +88,7 @@ struct bcm2835_spi {
 	u8 *rx_buf;
 	int tx_len;
 	int rx_len;
-	bool dma_pending;
+	unsigned int dma_pending;
 };
 
 static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg)
-- 
2.19.2


_______________________________________________
linux-rpi-kernel mailing list
linux-rpi-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel

Re: [PATCH for-4.20] spi: bcm2835: Unbreak the build of esoteric configs

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 449 bytes --]

On Thu, Nov 29, 2018 at 03:14:49PM +0100, Lukas Wunner wrote:

> Unfortunately the commit was applied despite prior warning that it needs
> to be respun:
> https://marc.info/?l=linux-spi&m=154186019626675&w=2

Sorry about that, I started scanning the changelog when it hit
discussion about doing a more involved fix for -next - it's good to draw
attention to reasons not to merge the patch a bit more prominently as it
helps avoid things like that.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 206 bytes --]

_______________________________________________
linux-rpi-kernel mailing list
linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel