1 From 993a98a42e6e790fd0d2bf7d55a031513c7ba7dc Mon Sep 17 00:00:00 2001
2 From: Ian Molton <ian@mnementh.co.uk>
3 Date: Mon, 13 Nov 2017 21:35:44 +0100
4 Subject: [PATCH] brcmfmac: Remove brcmf_sdiod_request_data()
6 This function is obfuscating how IO works on this chip. Remove it
7 and push its logic into brcmf_sdiod_reg_{read,write}().
9 Handling of -ENOMEDIUM is altered, but as that's pretty much broken anyway
12 Signed-off-by: Ian Molton <ian@mnementh.co.uk>
13 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
16 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 237 ++++++++-------------
17 .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 +-
18 2 files changed, 87 insertions(+), 152 deletions(-)
20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
22 @@ -230,6 +230,43 @@ void brcmf_sdiod_change_state(struct brc
23 sdiodev->state = state;
26 +static int brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev,
32 + if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
35 + addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
37 + for (i = 0 ; i < 3 && !err ; i++, addr >>= 8)
38 + brcmf_sdiod_regwb(sdiodev, SBSDIO_FUNC1_SBADDRLOW + i,
44 +static int brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
46 + uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
49 + if (bar0 != sdiodev->sbwad) {
50 + err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
54 + sdiodev->sbwad = bar0;
57 + *addr &= SBSDIO_SB_OFT_ADDR_MASK;
58 + *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
63 static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, u8 byte,
66 @@ -249,173 +286,84 @@ static inline int brcmf_sdiod_f0_writeb(
70 -static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn,
71 - u32 addr, u8 regsz, void *data, bool write)
73 - struct sdio_func *func;
76 - brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
77 - write, fn, addr, regsz);
79 - /* only allow byte access on F0 */
80 - if (WARN_ON(regsz > 1 && !fn))
82 - func = sdiodev->func[fn];
88 - sdio_writeb(func, *(u8 *)data, addr, &ret);
90 - ret = brcmf_sdiod_f0_writeb(func, *(u8 *)data,
94 - *(u8 *)data = sdio_readb(func, addr, &ret);
96 - *(u8 *)data = sdio_f0_readb(func, addr, &ret);
101 - sdio_writew(func, *(u16 *)data, addr, &ret);
103 - *(u16 *)data = sdio_readw(func, addr, &ret);
107 - sdio_writel(func, *(u32 *)data, addr, &ret);
109 - *(u32 *)data = sdio_readl(func, addr, &ret);
112 - brcmf_err("invalid size: %d\n", regsz);
117 - brcmf_dbg(SDIO, "failed to %s data F%d@0x%05x, err: %d\n",
118 - write ? "write" : "read", fn, addr, ret);
123 static int brcmf_sdiod_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr,
124 u8 regsz, void *data)
130 - if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
134 * figure out how to read the register based on address range
135 * 0x00 ~ 0x7FF: function 0 CCCR and FBR
136 * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
137 * The rest: function 1 silicon backplane core registers
138 + * f0 writes must be bytewise
140 - if ((addr & ~REG_F0_REG_MASK) == 0)
141 - func = SDIO_FUNC_0;
143 - func = SDIO_FUNC_1;
146 - /* for retry wait for 1 ms till bus get settled down */
148 - usleep_range(1000, 2000);
150 - ret = brcmf_sdiod_request_data(sdiodev, func, addr, regsz,
153 - } while (ret != 0 && ret != -ENOMEDIUM &&
154 - retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
155 + if ((addr & ~REG_F0_REG_MASK) == 0) {
156 + if (WARN_ON(regsz > 1))
158 + ret = brcmf_sdiod_f0_writeb(sdiodev->func[0],
159 + *(u8 *)data, addr);
163 + sdio_writeb(sdiodev->func[1], *(u8 *)data, addr, &ret);
166 + ret = brcmf_sdiod_addrprep(sdiodev, &addr);
170 - if (ret == -ENOMEDIUM)
171 - brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
172 + sdio_writel(sdiodev->func[1], *(u32 *)data, addr, &ret);
175 + WARN(1, "Invalid reg size\n");
185 static int brcmf_sdiod_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr,
186 u8 regsz, void *data)
192 - if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
196 * figure out how to read the register based on address range
197 * 0x00 ~ 0x7FF: function 0 CCCR and FBR
198 * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
199 * The rest: function 1 silicon backplane core registers
200 + * f0 reads must be bytewise
202 - if ((addr & ~REG_F0_REG_MASK) == 0)
203 - func = SDIO_FUNC_0;
205 - func = SDIO_FUNC_1;
208 - memset(data, 0, regsz);
210 - /* for retry wait for 1 ms till bus get settled down */
212 - usleep_range(1000, 2000);
214 - ret = brcmf_sdiod_request_data(sdiodev, func, addr, regsz,
217 - } while (ret != 0 && ret != -ENOMEDIUM &&
218 - retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
220 - if (ret == -ENOMEDIUM)
221 - brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
227 -brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
232 - if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
235 - addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
237 - for (i = 0 ; i < 3 && !err ; i++, addr >>= 8)
238 - brcmf_sdiod_regwb(sdiodev, SBSDIO_FUNC1_SBADDRLOW + i,
239 - addr & 0xff, &err);
245 -brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
247 - uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
250 - if (bar0 != sdiodev->sbwad) {
251 - err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
254 + if ((addr & ~REG_F0_REG_MASK) == 0) {
255 + if (WARN_ON(regsz > 1))
257 + *(u8 *)data = sdio_f0_readb(sdiodev->func[0], addr, &ret);
261 + *(u8 *)data = sdio_readb(sdiodev->func[1], addr, &ret);
264 + ret = brcmf_sdiod_addrprep(sdiodev, &addr);
268 - sdiodev->sbwad = bar0;
269 + *(u32 *)data = sdio_readl(sdiodev->func[1], addr, &ret);
272 + WARN(1, "Invalid reg size\n");
278 - *addr &= SBSDIO_SB_OFT_ADDR_MASK;
279 - *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
286 u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
287 @@ -439,15 +387,9 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_
290 brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
291 - retval = brcmf_sdiod_addrprep(sdiodev, &addr);
295 retval = brcmf_sdiod_reg_read(sdiodev, addr, 4, &data);
297 brcmf_dbg(SDIO, "data:0x%08x\n", data);
303 @@ -472,13 +414,8 @@ void brcmf_sdiod_regwl(struct brcmf_sdio
306 brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
307 - retval = brcmf_sdiod_addrprep(sdiodev, &addr);
311 retval = brcmf_sdiod_reg_write(sdiodev, addr, 4, &data);
317 @@ -886,14 +823,12 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev
321 -int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
322 +int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn)
324 - char t_func = (char)fn;
325 brcmf_dbg(SDIO, "Enter\n");
327 /* issue abort cmd52 command through F0 */
328 - brcmf_sdiod_request_data(sdiodev, SDIO_FUNC_0, SDIO_CCCR_ABORT,
330 + brcmf_sdiod_reg_write(sdiodev, SDIO_CCCR_ABORT, 1, &fn);
332 brcmf_dbg(SDIO, "Exit\n");
334 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
335 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
336 @@ -339,7 +339,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_
337 u8 *data, uint size);
339 /* Issue an abort to the specified function */
340 -int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
341 +int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn);
342 void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);
343 void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
344 enum brcmf_sdiod_state state);