AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 14:13:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

brcmfmac: Remove brcmf_sdiod_request_data()

Browse Source 
This function is obfuscating how IO works on this chip. Remove it
and push its logic into brcmf_sdiod_reg_{read,write}().

Handling of -ENOMEDIUM is altered, but as that's pretty much broken anyway
we can ignore that.

Signed-off-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ian Molton 2017-11-13 21:35:44 +01:00 committed by Kalle Valo
parent 4a3338ba2a
commit 993a98a42e
2 changed files with 87 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
View File

@ -230,6 +230,43 @@ void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
sdiodev->state = state; sdiodev->state = state;
} }
static int brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev,
u32 address)
{
int err = 0, i;
u32 addr;
if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
return -ENOMEDIUM;
addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
for (i = 0 ; i < 3 && !err ; i++, addr >>= 8)
brcmf_sdiod_regwb(sdiodev, SBSDIO_FUNC1_SBADDRLOW + i,
addr & 0xff, &err);
return err;
}
static int brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
{
uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;
if (bar0 != sdiodev->sbwad) {
err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
if (err)
return err;
sdiodev->sbwad = bar0;
}
*addr &= SBSDIO_SB_OFT_ADDR_MASK;
*addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
return 0;
}
static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, u8 byte, static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, u8 byte,
uint regaddr) uint regaddr)
{ {
@ -249,173 +286,84 @@ static inline int brcmf_sdiod_f0_writeb(struct sdio_func *func, u8 byte,
return err_ret; return err_ret;
} }
static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn,
u32 addr, u8 regsz, void *data, bool write)
{
struct sdio_func *func;
int ret = -EINVAL;
brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
write, fn, addr, regsz);
/* only allow byte access on F0 */
if (WARN_ON(regsz > 1 && !fn))
return -EINVAL;
func = sdiodev->func[fn];
switch (regsz) {
case 1:
if (write) {
if (fn)
sdio_writeb(func, *(u8 *)data, addr, &ret);
else
ret = brcmf_sdiod_f0_writeb(func, *(u8 *)data,
addr);
} else {
if (fn)
*(u8 *)data = sdio_readb(func, addr, &ret);
else
*(u8 *)data = sdio_f0_readb(func, addr, &ret);
}
break;
case 2:
if (write)
sdio_writew(func, *(u16 *)data, addr, &ret);
else
*(u16 *)data = sdio_readw(func, addr, &ret);
break;
case 4:
if (write)
sdio_writel(func, *(u32 *)data, addr, &ret);
else
*(u32 *)data = sdio_readl(func, addr, &ret);
break;
default:
brcmf_err("invalid size: %d\n", regsz);
break;
}
if (ret)
brcmf_dbg(SDIO, "failed to %s data F%d@0x%05x, err: %d\n",
write ? "write" : "read", fn, addr, ret);
return ret;
}
static int brcmf_sdiod_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, static int brcmf_sdiod_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr,
u8 regsz, void *data) u8 regsz, void *data)
{ {
u8 func;
s32 retry = 0;
int ret; int ret;
if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
return -ENOMEDIUM;
/* /*
* figure out how to read the register based on address range * figure out how to read the register based on address range
* 0x00 ~ 0x7FF: function 0 CCCR and FBR * 0x00 ~ 0x7FF: function 0 CCCR and FBR
* 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
* The rest: function 1 silicon backplane core registers * The rest: function 1 silicon backplane core registers
* f0 writes must be bytewise
*/ */
if ((addr & ~REG_F0_REG_MASK) == 0)
func = SDIO_FUNC_0;
else
func = SDIO_FUNC_1;
do { if ((addr & ~REG_F0_REG_MASK) == 0) {
/* for retry wait for 1 ms till bus get settled down */ if (WARN_ON(regsz > 1))
if (retry) return -EINVAL;
usleep_range(1000, 2000); ret = brcmf_sdiod_f0_writeb(sdiodev->func[0],
*(u8 *)data, addr);
} else {
switch (regsz) {
case 1:
sdio_writeb(sdiodev->func[1], *(u8 *)data, addr, &ret);
break;
case 4:
ret = brcmf_sdiod_addrprep(sdiodev, &addr);
if (ret)
goto done;
ret = brcmf_sdiod_request_data(sdiodev, func, addr, regsz, sdio_writel(sdiodev->func[1], *(u32 *)data, addr, &ret);
data, true); break;
default:
} while (ret != 0 && ret != -ENOMEDIUM && WARN(1, "Invalid reg size\n");
retry++ < SDIOH_API_ACCESS_RETRY_LIMIT); ret = -EINVAL;
break;
if (ret == -ENOMEDIUM) }
brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM); }
done:
return ret; return ret;
} }
static int brcmf_sdiod_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, static int brcmf_sdiod_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr,
u8 regsz, void *data) u8 regsz, void *data)
{ {
u8 func;
s32 retry = 0;
int ret; int ret;
if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
return -ENOMEDIUM;
/* /*
* figure out how to read the register based on address range * figure out how to read the register based on address range
* 0x00 ~ 0x7FF: function 0 CCCR and FBR * 0x00 ~ 0x7FF: function 0 CCCR and FBR
* 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
* The rest: function 1 silicon backplane core registers * The rest: function 1 silicon backplane core registers
* f0 reads must be bytewise
*/ */
if ((addr & ~REG_F0_REG_MASK) == 0) if ((addr & ~REG_F0_REG_MASK) == 0) {
func = SDIO_FUNC_0; if (WARN_ON(regsz > 1))
else return -EINVAL;
func = SDIO_FUNC_1; *(u8 *)data = sdio_f0_readb(sdiodev->func[0], addr, &ret);
} else {
switch (regsz) {
case 1:
*(u8 *)data = sdio_readb(sdiodev->func[1], addr, &ret);
break;
case 4:
ret = brcmf_sdiod_addrprep(sdiodev, &addr);
if (ret)
goto done;
do { *(u32 *)data = sdio_readl(sdiodev->func[1], addr, &ret);
memset(data, 0, regsz); break;
default:
/* for retry wait for 1 ms till bus get settled down */ WARN(1, "Invalid reg size\n");
if (retry) ret = -EINVAL;
usleep_range(1000, 2000); break;
}
ret = brcmf_sdiod_request_data(sdiodev, func, addr, regsz,
data, false);
} while (ret != 0 && ret != -ENOMEDIUM &&
retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
if (ret == -ENOMEDIUM)
brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);
return ret;
}
static int
brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
{
int err = 0, i;
u32 addr;
if (sdiodev->state == BRCMF_SDIOD_NOMEDIUM)
return -ENOMEDIUM;
addr = (address & SBSDIO_SBWINDOW_MASK) >> 8;
for (i = 0 ; i < 3 && !err ; i++, addr >>= 8)
brcmf_sdiod_regwb(sdiodev, SBSDIO_FUNC1_SBADDRLOW + i,
addr & 0xff, &err);
return err;
}
static int
brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
{
uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;
if (bar0 != sdiodev->sbwad) {
err = brcmf_sdiod_set_sbaddr_window(sdiodev, bar0);
if (err)
return err;
sdiodev->sbwad = bar0;
} }
*addr &= SBSDIO_SB_OFT_ADDR_MASK; done:
*addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; return ret;
return 0;
} }
u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret) u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
@ -439,15 +387,9 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
int retval; int retval;
brcmf_dbg(SDIO, "addr:0x%08x\n", addr); brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
retval = brcmf_sdiod_addrprep(sdiodev, &addr);
if (retval)
goto done;
retval = brcmf_sdiod_reg_read(sdiodev, addr, 4, &data); retval = brcmf_sdiod_reg_read(sdiodev, addr, 4, &data);
brcmf_dbg(SDIO, "data:0x%08x\n", data); brcmf_dbg(SDIO, "data:0x%08x\n", data);
done:
if (ret) if (ret)
*ret = retval; *ret = retval;
@ -472,13 +414,8 @@ void brcmf_sdiod_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
int retval; int retval;
brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data); brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
retval = brcmf_sdiod_addrprep(sdiodev, &addr);
if (retval)
goto done;
retval = brcmf_sdiod_reg_write(sdiodev, addr, 4, &data); retval = brcmf_sdiod_reg_write(sdiodev, addr, 4, &data);
done:
if (ret) if (ret)
*ret = retval; *ret = retval;
} }
@ -886,14 +823,12 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
return bcmerror; return bcmerror;
} }
int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn) int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn)
{ {
char t_func = (char)fn;
brcmf_dbg(SDIO, "Enter\n"); brcmf_dbg(SDIO, "Enter\n");
/* issue abort cmd52 command through F0 */ /* issue abort cmd52 command through F0 */
brcmf_sdiod_request_data(sdiodev, SDIO_FUNC_0, SDIO_CCCR_ABORT, brcmf_sdiod_reg_write(sdiodev, SDIO_CCCR_ABORT, 1, &fn);
1, &t_func, true);
brcmf_dbg(SDIO, "Exit\n"); brcmf_dbg(SDIO, "Exit\n");
return 0; return 0;

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
View File

@ -339,7 +339,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
u8 *data, uint size); u8 *data, uint size);
/* Issue an abort to the specified function */ /* Issue an abort to the specified function */
int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn); int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn);
void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev); void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);
void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev, void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
enum brcmf_sdiod_state state); enum brcmf_sdiod_state state);