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()
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.
9 Remove it, and rename brcmf_sdiod_set_sbaddr_window() to
10 brcmf_sdiod_set_backplane_window() as it's easier to understand.
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>
17 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 84 ++++++++++++----------
18 1 file changed, 46 insertions(+), 38 deletions(-)
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;
26 -static int brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev,
28 +static int brcmf_sdiod_set_backplane_window(struct brcmf_sdio_dev *sdiodev,
31 + u32 v, bar0 = addr & SBSDIO_SBWINDOW_MASK;
35 - if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
37 + if (bar0 == sdiodev->sbwad)
40 - addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
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,
51 -static int brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
53 - uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
56 - if (bar0 != sdiodev->sbwad) {
57 - err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
63 sdiodev->sbwad = bar0;
66 - *addr &= SBSDIO_SB_OFT_ADDR_MASK;
67 - *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
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_
78 - retval = brcmf_sdiod_addrprep(sdiodev, &addr);
79 + retval = brcmf_sdiod_set_backplane_window(sdiodev, addr);
83 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
84 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
87 - data = sdio_readl(sdiodev->func[1], addr, &retval);
88 + data = sdio_readl(sdiodev->func[1], addr, &retval);
94 @@ -288,11 +277,16 @@ void brcmf_sdiod_writel(struct brcmf_sdi
98 - retval = brcmf_sdiod_addrprep(sdiodev, &addr);
99 + retval = brcmf_sdiod_set_backplane_window(sdiodev, addr);
104 - sdio_writel(sdiodev->func[1], data, addr, &retval);
105 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
106 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
108 + sdio_writel(sdiodev->func[1], data, addr, &retval);
114 @@ -540,10 +534,13 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sd
116 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pkt->len);
118 - err = brcmf_sdiod_addrprep(sdiodev, &addr);
119 + err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
123 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
124 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
126 err = brcmf_sdiod_buff_read(sdiodev, SDIO_FUNC_2, addr, pkt);
129 @@ -561,10 +558,13 @@ int brcmf_sdiod_recv_chain(struct brcmf_
130 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n",
133 - err = brcmf_sdiod_addrprep(sdiodev, &addr);
134 + err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
138 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
139 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
142 err = brcmf_sdiod_buff_read(sdiodev, SDIO_FUNC_2, addr,
144 @@ -606,7 +606,12 @@ int brcmf_sdiod_send_buf(struct brcmf_sd
146 memcpy(mypkt->data, buf, nbytes);
148 - err = brcmf_sdiod_addrprep(sdiodev, &addr);
149 + err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
153 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
154 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
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
160 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pktq->qlen);
162 - err = brcmf_sdiod_addrprep(sdiodev, &addr);
163 + err = brcmf_sdiod_set_backplane_window(sdiodev, addr);
167 + addr &= SBSDIO_SB_OFT_ADDR_MASK;
168 + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
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) */
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);
182 @@ -716,7 +724,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev
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",