package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch

   1 From f706821596d8a3dcda314c38b13d91f108fdc435 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Fri, 22 Jul 2011 17:10:29 +0200
   4 Subject: [PATCH 21/22] b43: read correct register on bcma bus.
   5
   6
   7 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
   8 ---
   9  drivers/net/wireless/b43/dma.c |   20 +++++++++++++++++---
  10  1 files changed, 17 insertions(+), 3 deletions(-)
  11
  12 --- a/drivers/net/wireless/b43/dma.c
  13 +++ b/drivers/net/wireless/b43/dma.c
  14 @@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43
  15         u32 tmp;
  16         u16 mmio_base;
  17
  18 -       tmp = b43_read32(dev, SSB_TMSHIGH);
  19 -       if (tmp & SSB_TMSHIGH_DMA64)
  20 -               return DMA_BIT_MASK(64);
  21 +       switch (dev->dev->bus_type) {
  22 +#ifdef CONFIG_B43_BCMA
  23 +       case B43_BUS_BCMA:
  24 +               tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST);
  25 +               if (tmp & BCMA_IOST_DMA64)
  26 +                       return DMA_BIT_MASK(64);
  27 +               break;
  28 +#endif
  29 +#ifdef CONFIG_B43_SSB
  30 +       case B43_BUS_SSB:
  31 +               tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
  32 +               if (tmp & SSB_TMSHIGH_DMA64)
  33 +                       return DMA_BIT_MASK(64);
  34 +               break;
  35 +#endif
  36 +       }
  37 +
  38         mmio_base = b43_dmacontroller_base(0, 0);
  39         b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK);
  40         tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);