From c13d2ad0599a73d87871c5a2b4468e8cbd4bf369 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Tue, 23 Aug 2011 14:13:59 +0200 Subject: [PATCH] staging: brcm80211: bugfix for fifo problem on 64 bits platforms. Message 'receive fifo overflow' appeared in the log. Root cause was an invalid physical address being programmed into the DMA engine. This was caused by an invalid pointer cast in the dma code. Issue was observed on a Sparc (Sun Fire V120) machine but could theoretically also pop up on other architectures. Driver was tested to scan and ping on aforementioned machine. Reviewed-by: Arend van Spriel Reviewed-by: Pieter-Paul Giesberts Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/dma.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c index 2ef416a9558e..05dad9fcc931 100644 --- a/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -600,13 +600,18 @@ static bool _dma_alloc(struct dma_info *di, uint direction) void *dma_alloc_consistent(struct pci_dev *pdev, uint size, u16 align_bits, uint *alloced, unsigned long *pap) { + void *rc; + dma_addr_t dma_addr; + if (align_bits) { u16 align = (1 << align_bits); if (!IS_ALIGNED(PAGE_SIZE, align)) size += align; *alloced = size; } - return pci_alloc_consistent(pdev, size, (dma_addr_t *) pap); + rc = pci_alloc_consistent(pdev, size, &dma_addr); + *pap = dma_addr; + return rc; } /* !! may be called with core in reset */ -- 2.20.1