package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch

   1 From a7c3aa1509e243a09c5b1660c8702d792ca76aed Mon Sep 17 00:00:00 2001
   2 From: Ian Molton <ian@mnementh.co.uk>
   3 Date: Fri, 8 Dec 2017 13:10:31 +0100
   4 Subject: [PATCH] brcmfmac: Remove brcmf_sdiod_addrprep()
   5
   6 This function has become trivial enough that it may as well be pushed into
   7 its callers, which has the side-benefit of clarifying what's going on.
   8
   9 Remove it, and rename brcmf_sdiod_set_sbaddr_window() to
  10 brcmf_sdiod_set_backplane_window() as it's easier to understand.
  11
  12 Signed-off-by: Ian Molton <ian@mnementh.co.uk>
  13 Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17  .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 84 ++++++++++++----------
  18  1 file changed, 46 insertions(+), 38 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  22 @@ -230,41 +230,25 @@ void brcmf_sdiod_change_state(struct brc
  23         sdiodev->state = state;
  24  }
  25
  26 -static int brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev,
  27 -                                        u32 address)
  28 +static int brcmf_sdiod_set_backplane_window(struct brcmf_sdio_dev *sdiodev,
  29 +                                           u32 addr)
  30  {
  31 +       u32 v, bar0 = addr & SBSDIO_SBWINDOW_MASK;
  32         int err = 0, i;
  33 -       u32 addr;
  34
  35 -       if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
  36 -               return -ENOMEDIUM;
  37 +       if (bar0 == sdiodev->sbwad)
  38 +               return 0;
  39
  40 -       addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
  41 +       v = bar0 >> 8;
  42
  43 -       for (i = 0 ; i < 3 && !err ; i++, addr >>= 8)
  44 +       for (i = 0 ; i < 3 && !err ; i++, v >>= 8)
  45                 brcmf_sdiod_writeb(sdiodev, SBSDIO_FUNC1_SBADDRLOW + i,
  46 -                                  addr & 0xff, &err);
  47 -
  48 -       return err;
  49 -}
  50 -
  51 -static int brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
  52 -{
  53 -       uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
  54 -       int err = 0;
  55 -
  56 -       if (bar0 != sdiodev->sbwad) {
  57 -               err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
  58 -               if (err)
  59 -                       return err;
  60 +                                  v & 0xff, &err);
  61
  62 +       if (!err)
  63                 sdiodev->sbwad = bar0;
  64 -       }
  65 -
  66 -       *addr &= SBSDIO_SB_OFT_ADDR_MASK;
  67 -       *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
  68
  69 -       return 0;
  70 +       return err;
  71  }
  72
  73  u32 brcmf_sdiod_readl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
  74 @@ -272,11 +256,16 @@ u32 brcmf_sdiod_readl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
  75         u32 data = 0;
  76         int retval;
  77
  78 -       retval = brcmf_sdiod_addrprep(sdiodev, &addr);
  79 +       retval = brcmf_sdiod_set_backplane_window(sdiodev, addr);
  80 +       if (retval)
  81 +               goto out;
  82 +
  83 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
  84 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
  85
  86 -       if (!retval)
  87 -               data = sdio_readl(sdiodev->func[1], addr, &retval);
  88 +       data = sdio_readl(sdiodev->func[1], addr, &retval);
  89
  90 +out:
  91         if (ret)
  92                 *ret = retval;
  93
  94 @@ -288,11 +277,16 @@ void brcmf_sdiod_writel(struct brcmf_sdi
  95  {
  96         int retval;
  97
  98 -       retval = brcmf_sdiod_addrprep(sdiodev, &addr);
  99 +       retval = brcmf_sdiod_set_backplane_window(sdiodev, addr);
 100 +       if (retval)
 101 +               goto out;
 102 +
 103 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
 104 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 105
 106 -       if (!retval)
 107 -               sdio_writel(sdiodev->func[1], data, addr, &retval);
 108 +       sdio_writel(sdiodev->func[1], data, addr, &retval);
 109
 110 +out:
 111         if (ret)
 112                 *ret = retval;
 113  }
 114 @@ -540,10 +534,13 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sdio_dev *sdiodev, struct sk_buff *pkt)
 115
 116         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pkt->len);
 117
 118 -       err = brcmf_sdiod_addrprep(sdiodev, &addr);
 119 +       err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
 120         if (err)
 121                 goto done;
 122
 123 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
 124 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 125 +
 126         err = brcmf_sdiod_buff_read(sdiodev, SDIO_FUNC_2, addr, pkt);
 127
 128  done:
 129 @@ -561,10 +558,13 @@ int brcmf_sdiod_recv_chain(struct brcmf_
 130         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n",
 131                   addr, pktq->qlen);
 132
 133 -       err = brcmf_sdiod_addrprep(sdiodev, &addr);
 134 +       err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
 135         if (err)
 136                 goto done;
 137
 138 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
 139 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 140 +
 141         if (pktq->qlen == 1)
 142                 err = brcmf_sdiod_buff_read(sdiodev, SDIO_FUNC_2, addr,
 143                                             pktq->next);
 144 @@ -606,7 +606,12 @@ int brcmf_sdiod_send_buf(struct brcmf_sd
 145
 146         memcpy(mypkt->data, buf, nbytes);
 147
 148 -       err = brcmf_sdiod_addrprep(sdiodev, &addr);
 149 +       err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
 150 +       if (err)
 151 +               return err;
 152 +
 153 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
 154 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 155
 156         if (!err)
 157                 err = brcmf_sdiod_buff_write(sdiodev, SDIO_FUNC_2, addr, mypkt);
 158 @@ -625,10 +630,13 @@ int brcmf_sdiod_send_pkt(struct brcmf_sd
 159
 160         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pktq->qlen);
 161
 162 -       err = brcmf_sdiod_addrprep(sdiodev, &addr);
 163 +       err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
 164         if (err)
 165                 return err;
 166
 167 +       addr &= SBSDIO_SB_OFT_ADDR_MASK;
 168 +       addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 169 +
 170         if (pktq->qlen == 1 || !sdiodev->sg_support) {
 171                 skb_queue_walk(pktq, skb) {
 172                         err = brcmf_sdiod_buff_write(sdiodev, SDIO_FUNC_2,
 173 @@ -673,7 +681,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev
 174         /* Do the transfer(s) */
 175         while (size) {
 176                 /* Set the backplane window to include the start address */
 177 -               err = brcmf_sdiod_set_sbaddr_window(sdiodev, address);
 178 +               err = brcmf_sdiod_set_backplane_window(sdiodev, address);
 179                 if (err)
 180                         break;
 181
 182 @@ -716,7 +724,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev
 183         dev_kfree_skb(pkt);
 184
 185         /* Return the window to backplane enumeration space for core access */
 186 -       if (brcmf_sdiod_set_sbaddr_window(sdiodev, sdiodev->sbwad))
 187 +       if (brcmf_sdiod_set_backplane_window(sdiodev, sdiodev->sbwad))
 188                 brcmf_err("FAILED to set window back to 0x%x\n",
 189                           sdiodev->sbwad);
 190