Skip to content

L
linux
Commit 75bf74b9 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files
Options

staging: brcmfmac: Consolidate debugging macros 

Convert multiple BRCMF_<debug_level> macros to a single
brcmf_dbg(level, fmt, ...) macro.

Remove the now unnecessary double parentheses in the uses
of the old macros when converting to brcmf_dbg.

Delete all uses of "%s: [fmt]", __func__, args... and move
the "%s: ", __func__ to the macro for consistency.

Coalesce long formats.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09ebd6f2
Hide whitespace changes
Inline Side-by-side
Showing with 694 additions and 862 deletions
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file @ 75bf74b9
...@@ -86,8 +86,7 @@ brcmf_sdcard_iovar_op(struct brcmf_sdio_dev *sdiodev, const char *name, ...@@ -86,8 +86,7 @@ brcmf_sdcard_iovar_op(struct brcmf_sdio_dev *sdiodev, const char *name,
if (!set && !(arg && len)) if (!set && !(arg && len))
return -EINVAL; return -EINVAL;
BRCMF_TRACE(("%s: Enter (%s %s)\n", __func__, (set ? "set" : "get"), brcmf_dbg(TRACE, "Enter (%s %s)\n", set ? "set" : "get", name);
name));
vi = brcmu_iovar_lookup(sdioh_iovars, name); vi = brcmu_iovar_lookup(sdioh_iovars, name);
if (vi == NULL) { if (vi == NULL) {
...@@ -168,7 +167,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func) ...@@ -168,7 +167,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func)
{ {
struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev); struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
BRCMF_TRACE(("brcmf: ***IRQHandler\n")); brcmf_dbg(TRACE, "***IRQHandler\n");
sdio_release_host(func); sdio_release_host(func);
...@@ -179,7 +178,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func) ...@@ -179,7 +178,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func)
int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev) int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)
{ {
BRCMF_TRACE(("%s: Entering\n", __func__)); brcmf_dbg(TRACE, "Entering\n");
sdio_claim_host(sdiodev->func[1]); sdio_claim_host(sdiodev->func[1]);
sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler); sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler);
...@@ -190,7 +189,7 @@ int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev) ...@@ -190,7 +189,7 @@ int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)
int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev) int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)
{ {
BRCMF_TRACE(("%s: Entering\n", __func__)); brcmf_dbg(TRACE, "Entering\n");
sdio_claim_host(sdiodev->func[1]); sdio_claim_host(sdiodev->func[1]);
sdio_release_irq(sdiodev->func[1]); sdio_release_irq(sdiodev->func[1]);
...@@ -216,8 +215,8 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr, ...@@ -216,8 +215,8 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
if (err) if (err)
*err = status; *err = status;
BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n", brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data)); fnc_num, addr, data);
return data; return data;
} }
...@@ -239,8 +238,8 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr, ...@@ -239,8 +238,8 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
if (err) if (err)
*err = status; *err = status;
BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n", brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data)); fnc_num, addr, data);
} }
int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis, int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis,
...@@ -260,7 +259,7 @@ int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis, ...@@ -260,7 +259,7 @@ int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis,
into the provided buffer. */ into the provided buffer. */
tmp_buf = kmalloc(length, GFP_ATOMIC); tmp_buf = kmalloc(length, GFP_ATOMIC);
if (tmp_buf == NULL) { if (tmp_buf == NULL) {
BRCMF_ERROR(("%s: out of memory\n", __func__)); brcmf_dbg(ERROR, "out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
memcpy(tmp_buf, cis, length); memcpy(tmp_buf, cis, length);
...@@ -302,7 +301,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size) ...@@ -302,7 +301,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
u32 word = 0; u32 word = 0;
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
BRCMF_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr)); brcmf_dbg(INFO, "fun = 1, addr = 0x%x\n", addr);
if (bar0 != sdiodev->sbwad) { if (bar0 != sdiodev->sbwad) {
if (brcmf_sdcard_set_sbaddr_window(sdiodev, bar0)) if (brcmf_sdcard_set_sbaddr_window(sdiodev, bar0))
...@@ -320,7 +319,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size) ...@@ -320,7 +319,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
sdiodev->regfail = (status != 0); sdiodev->regfail = (status != 0);
BRCMF_INFO(("u32data = 0x%x\n", word)); brcmf_dbg(INFO, "u32data = 0x%x\n", word);
/* if ok, return appropriately masked word */ /* if ok, return appropriately masked word */
if (status == 0) { if (status == 0) {
...@@ -338,8 +337,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size) ...@@ -338,8 +337,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
} }
/* otherwise, bad sdio access or invalid size */ /* otherwise, bad sdio access or invalid size */
BRCMF_ERROR(("%s: error reading addr 0x%04x size %d\n", __func__, brcmf_dbg(ERROR, "error reading addr 0x%04x size %d\n", addr, size);
addr, size));
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
...@@ -350,8 +348,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size, ...@@ -350,8 +348,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0; int err = 0;
BRCMF_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n", brcmf_dbg(INFO, "fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",
__func__, addr, size * 8, data)); addr, size * 8, data);
if (bar0 != sdiodev->sbwad) { if (bar0 != sdiodev->sbwad) {
err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0); err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0);
...@@ -372,8 +370,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size, ...@@ -372,8 +370,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
if (status == 0) if (status == 0)
return 0; return 0;
BRCMF_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n", brcmf_dbg(ERROR, "error writing 0x%08x to addr 0x%04x size %d\n",
__func__, data, addr, size)); data, addr, size);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
...@@ -393,8 +391,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ...@@ -393,8 +391,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0; int err = 0;
BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);
__func__, fn, addr, nbytes));
/* Async not implemented yet */ /* Async not implemented yet */
if (flags & SDIO_REQ_ASYNC) if (flags & SDIO_REQ_ASYNC)
...@@ -430,8 +427,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ...@@ -430,8 +427,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0; int err = 0;
BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);
__func__, fn, addr, nbytes));
/* Async not implemented yet */ /* Async not implemented yet */
if (flags & SDIO_REQ_ASYNC) if (flags & SDIO_REQ_ASYNC)
...@@ -470,13 +466,13 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, ...@@ -470,13 +466,13 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn) int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
{ {
char t_func = (char)fn; char t_func = (char)fn;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* issue abort cmd52 command through F0 */ /* issue abort cmd52 command through F0 */
brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0, brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0,
SDIO_CCCR_ABORT, &t_func); SDIO_CCCR_ABORT, &t_func);
BRCMF_TRACE(("%s: Exit\n", __func__)); brcmf_dbg(TRACE, "Exit\n");
return 0; return 0;
} }
...@@ -502,7 +498,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) ...@@ -502,7 +498,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
/* try to attach to the target device */ /* try to attach to the target device */
sdiodev->bus = brcmf_sdbrcm_probe(0, 0, 0, 0, regs, sdiodev); sdiodev->bus = brcmf_sdbrcm_probe(0, 0, 0, 0, regs, sdiodev);
if (!sdiodev->bus) { if (!sdiodev->bus) {
BRCMF_ERROR(("%s: device attach failed\n", __func__)); brcmf_dbg(ERROR, "device attach failed\n");
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
......
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View file @ 75bf74b9
...@@ -111,21 +111,21 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev) ...@@ -111,21 +111,21 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)
u32 fbraddr; u32 fbraddr;
u8 func; u8 func;
BRCMF_TRACE(("%s\n", __func__)); brcmf_dbg(TRACE, "\n");
/* Get the Card's common CIS address */ /* Get the Card's common CIS address */
sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev, sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev,
SDIO_CCCR_CIS); SDIO_CCCR_CIS);
BRCMF_INFO(("%s: Card's Common CIS Ptr = 0x%x\n", __func__, brcmf_dbg(INFO, "Card's Common CIS Ptr = 0x%x\n",
sdiodev->func_cis_ptr[0])); sdiodev->func_cis_ptr[0]);
/* Get the Card's function CIS (for each function) */ /* Get the Card's function CIS (for each function) */
for (fbraddr = SDIO_FBR_BASE(1), func = 1; for (fbraddr = SDIO_FBR_BASE(1), func = 1;
func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) { func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
sdiodev->func_cis_ptr[func] = sdiodev->func_cis_ptr[func] =
brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr); brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr);
BRCMF_INFO(("%s: Function %d CIS Ptr = 0x%x\n", __func__, func, brcmf_dbg(INFO, "Function %d CIS Ptr = 0x%x\n",
sdiodev->func_cis_ptr[func])); func, sdiodev->func_cis_ptr[func]);
} }
/* Enable Function 1 */ /* Enable Function 1 */
...@@ -133,8 +133,7 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev) ...@@ -133,8 +133,7 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)
err_ret = sdio_enable_func(sdiodev->func[1]); err_ret = sdio_enable_func(sdiodev->func[1]);
sdio_release_host(sdiodev->func[1]); sdio_release_host(sdiodev->func[1]);
if (err_ret) if (err_ret)
BRCMF_ERROR(("brcmf_sdioh_enablefuncs: Failed to enable F1 " brcmf_dbg(ERROR, "Failed to enable F1 Err: 0x%08x\n", err_ret);
"Err: 0x%08x\n", err_ret));
return false; return false;
} }
...@@ -146,7 +145,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) ...@@ -146,7 +145,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
{ {
int err_ret = 0; int err_ret = 0;
BRCMF_TRACE(("%s\n", __func__)); brcmf_dbg(TRACE, "\n");
sdiodev->num_funcs = 2; sdiodev->num_funcs = 2;
...@@ -154,7 +153,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) ...@@ -154,7 +153,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
err_ret = sdio_set_block_size(sdiodev->func[1], 64); err_ret = sdio_set_block_size(sdiodev->func[1], 64);
sdio_release_host(sdiodev->func[1]); sdio_release_host(sdiodev->func[1]);
if (err_ret) { if (err_ret) {
BRCMF_ERROR(("%s: Failed to set F1 blocksize\n", __func__)); brcmf_dbg(ERROR, "Failed to set F1 blocksize\n");
goto out; goto out;
} }
...@@ -162,21 +161,21 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) ...@@ -162,21 +161,21 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
err_ret = sdio_set_block_size(sdiodev->func[2], sd_f2_blocksize); err_ret = sdio_set_block_size(sdiodev->func[2], sd_f2_blocksize);
sdio_release_host(sdiodev->func[2]); sdio_release_host(sdiodev->func[2]);
if (err_ret) { if (err_ret) {
BRCMF_ERROR(("%s: Failed to set F2 blocksize" brcmf_dbg(ERROR, "Failed to set F2 blocksize to %d\n",
" to %d\n", __func__, sd_f2_blocksize)); sd_f2_blocksize);
goto out; goto out;
} }
brcmf_sdioh_enablefuncs(sdiodev); brcmf_sdioh_enablefuncs(sdiodev);
out: out:
BRCMF_TRACE(("%s: Done\n", __func__)); brcmf_dbg(TRACE, "Done\n");
return err_ret; return err_ret;
} }
void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev) void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
{ {
BRCMF_TRACE(("%s\n", __func__)); brcmf_dbg(TRACE, "\n");
/* Disable Function 2 */ /* Disable Function 2 */
sdio_claim_host(sdiodev->func[2]); sdio_claim_host(sdiodev->func[2]);
...@@ -199,7 +198,7 @@ static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr) ...@@ -199,7 +198,7 @@ static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if ((brcmf_sdioh_card_regread(sdiodev, 0, regaddr, 1, if ((brcmf_sdioh_card_regread(sdiodev, 0, regaddr, 1,
&regdata)) != SUCCESS) &regdata)) != SUCCESS)
BRCMF_ERROR(("%s: Can't read!\n", __func__)); brcmf_dbg(ERROR, "Can't read!\n");
*ptr++ = (u8) regdata; *ptr++ = (u8) regdata;
regaddr++; regaddr++;
...@@ -220,22 +219,21 @@ brcmf_sdioh_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, ...@@ -220,22 +219,21 @@ brcmf_sdioh_cis_read(struct brcmf_sdio_dev *sdiodev, uint func,
u32 foo; u32 foo;
u8 *cis = cisd; u8 *cis = cisd;
BRCMF_TRACE(("%s: Func = %d\n", __func__, func)); brcmf_dbg(TRACE, "Func = %d\n", func);
if (!sdiodev->func_cis_ptr[func]) { if (!sdiodev->func_cis_ptr[func]) {
memset(cis, 0, length); memset(cis, 0, length);
BRCMF_ERROR(("%s: no func_cis_ptr[%d]\n", __func__, func)); brcmf_dbg(ERROR, "no func_cis_ptr[%d]\n", func);
return -ENOTSUPP; return -ENOTSUPP;
} }
BRCMF_ERROR(("%s: func_cis_ptr[%d]=0x%04x\n", __func__, func, brcmf_dbg(ERROR, "func_cis_ptr[%d]=0x%04x\n",
sdiodev->func_cis_ptr[func])); func, sdiodev->func_cis_ptr[func]);
for (count = 0; count < length; count++) { for (count = 0; count < length; count++) {
offset = sdiodev->func_cis_ptr[func] + count; offset = sdiodev->func_cis_ptr[func] + count;
if (brcmf_sdioh_card_regread(sdiodev, 0, offset, 1, &foo) < 0) { if (brcmf_sdioh_card_regread(sdiodev, 0, offset, 1, &foo) < 0) {
BRCMF_ERROR(("%s: regread failed: Can't read CIS\n", brcmf_dbg(ERROR, "regread failed: Can't read CIS\n");
__func__));
return -EIO; return -EIO;
} }
...@@ -252,8 +250,7 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, ...@@ -252,8 +250,7 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
{ {
int err_ret; int err_ret;
BRCMF_INFO(("%s: rw=%d, func=%d, addr=0x%05x\n", __func__, rw, func, brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);
regaddr));
BRCMF_PM_RESUME_WAIT(sdioh_request_byte_wait, sdiodev); BRCMF_PM_RESUME_WAIT(sdioh_request_byte_wait, sdiodev);
BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev);
...@@ -272,22 +269,18 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, ...@@ -272,22 +269,18 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
sdio_enable_func sdio_enable_func
(sdiodev->func[2]); (sdiodev->func[2]);
if (err_ret) if (err_ret)
BRCMF_ERROR(( brcmf_dbg(ERROR,
"request_byte: " "enable F2 failed:%d\n",
"enable F2 " err_ret);
"failed:%d\n",
err_ret));
} else { } else {
/* Disable Function 2 */ /* Disable Function 2 */
err_ret = err_ret =
sdio_disable_func sdio_disable_func
(sdiodev->func[2]); (sdiodev->func[2]);
if (err_ret) if (err_ret)
BRCMF_ERROR(( brcmf_dbg(ERROR,
"request_byte: " "Disable F2 failed:%d\n",
"Disab F2 " err_ret);
"failed:%d\n",
err_ret));
} }
sdio_release_host(sdiodev->func[2]); sdio_release_host(sdiodev->func[2]);
} }
...@@ -305,8 +298,8 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, ...@@ -305,8 +298,8 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
regaddr, &err_ret); regaddr, &err_ret);
sdio_release_host(sdiodev->func[func]); sdio_release_host(sdiodev->func[func]);
} else if (regaddr < 0xF0) { } else if (regaddr < 0xF0) {
BRCMF_ERROR(("brcmf: F0 Wr:0x%02x: write " brcmf_dbg(ERROR, "F0 Wr:0x%02x: write disallowed\n",
"disallowed\n", regaddr)); regaddr);
} else { } else {
/* Claim host controller, perform F0 write, /* Claim host controller, perform F0 write,
and release */ and release */
...@@ -341,9 +334,8 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, ...@@ -341,9 +334,8 @@ brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
} }
if (err_ret) if (err_ret)
BRCMF_ERROR(("brcmf: Failed to %s byte F%d:@0x%05x=%02x, " brcmf_dbg(ERROR, "Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",
"Err: %d\n", rw ? "Write" : "Read", func, regaddr, rw ? "write" : "read", func, regaddr, *byte, err_ret);
*byte, err_ret));
return err_ret; return err_ret;
} }
...@@ -355,12 +347,12 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw, ...@@ -355,12 +347,12 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw,
int err_ret = -EIO; int err_ret = -EIO;
if (func == 0) { if (func == 0) {
BRCMF_ERROR(("%s: Only CMD52 allowed to F0.\n", __func__)); brcmf_dbg(ERROR, "Only CMD52 allowed to F0\n");
return -EINVAL; return -EINVAL;
} }
BRCMF_INFO(("%s: cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n", brcmf_dbg(INFO, "cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
__func__, cmd_type, rw, func, addr, nbytes)); cmd_type, rw, func, addr, nbytes);
BRCMF_PM_RESUME_WAIT(sdioh_request_word_wait, sdiodev); BRCMF_PM_RESUME_WAIT(sdioh_request_word_wait, sdiodev);
BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev);
...@@ -375,8 +367,7 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw, ...@@ -375,8 +367,7 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw,
sdio_writew(sdiodev->func[func], (*word & 0xFFFF), sdio_writew(sdiodev->func[func], (*word & 0xFFFF),
addr, &err_ret); addr, &err_ret);
else else
BRCMF_ERROR(("%s: Invalid nbytes: %d\n", brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes);
__func__, nbytes));
} else { /* CMD52 Read */ } else { /* CMD52 Read */
if (nbytes == 4) if (nbytes == 4)
*word = *word =
...@@ -386,16 +377,15 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw, ...@@ -386,16 +377,15 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint cmd_type, uint rw,
sdio_readw(sdiodev->func[func], addr, sdio_readw(sdiodev->func[func], addr,
&err_ret) & 0xFFFF; &err_ret) & 0xFFFF;
else else
BRCMF_ERROR(("%s: Invalid nbytes: %d\n", brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes);
__func__, nbytes));
} }
/* Release host controller */ /* Release host controller */
sdio_release_host(sdiodev->func[func]); sdio_release_host(sdiodev->func[func]);
if (err_ret) if (err_ret)
BRCMF_ERROR(("brcmf: Failed to %s word, Err: 0x%08x\n", brcmf_dbg(ERROR, "Failed to %s word, Err: 0x%08x\n",
rw ? "Write" : "Read", err_ret)); rw ? "write" : "read", err_ret);
return err_ret; return err_ret;
} }
...@@ -411,7 +401,7 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc, ...@@ -411,7 +401,7 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
struct sk_buff *pnext; struct sk_buff *pnext;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_PM_RESUME_WAIT(sdioh_request_packet_wait, sdiodev); BRCMF_PM_RESUME_WAIT(sdioh_request_packet_wait, sdiodev);
BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev);
...@@ -442,15 +432,13 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc, ...@@ -442,15 +432,13 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
} }
if (err_ret) { if (err_ret) {
BRCMF_ERROR(("%s: %s FAILED %p[%d], addr=0x%05x, " brcmf_dbg(ERROR, "%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
"pkt_len=%d, ERR=0x%08x\n", __func__, write ? "TX" : "RX", pnext, SGCount, addr,
(write) ? "TX" : "RX", pkt_len, err_ret);
pnext, SGCount, addr, pkt_len, err_ret));
} else { } else {
BRCMF_TRACE(("%s: %s xfr'd %p[%d], addr=0x%05x, " brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
"len=%d\n", __func__, write ? "TX" : "RX", pnext, SGCount, addr,
(write) ? "TX" : "RX", pkt_len);
pnext, SGCount, addr, pkt_len));
} }
if (!fifo) if (!fifo)
...@@ -462,7 +450,7 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc, ...@@ -462,7 +450,7 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
/* Release host controller */ /* Release host controller */
sdio_release_host(sdiodev->func[func]); sdio_release_host(sdiodev->func[func]);
BRCMF_TRACE(("%s: Exit\n", __func__)); brcmf_dbg(TRACE, "Exit\n");
return err_ret; return err_ret;
} }
...@@ -490,18 +478,18 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma, ...@@ -490,18 +478,18 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma,
int Status; int Status;
struct sk_buff *mypkt = NULL; struct sk_buff *mypkt = NULL;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_PM_RESUME_WAIT(sdioh_request_buffer_wait, sdiodev); BRCMF_PM_RESUME_WAIT(sdioh_request_buffer_wait, sdiodev);
BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev); BRCMF_PM_RESUME_RETURN_ERROR(-EIO, sdiodev);
/* Case 1: we don't have a packet. */ /* Case 1: we don't have a packet. */
if (pkt == NULL) { if (pkt == NULL) {
BRCMF_DATA(("%s: Creating new %s Packet, len=%d\n", brcmf_dbg(DATA, "Creating new %s Packet, len=%d\n",
__func__, write ? "TX" : "RX", buflen_u)); write ? "TX" : "RX", buflen_u);
mypkt = brcmu_pkt_buf_get_skb(buflen_u); mypkt = brcmu_pkt_buf_get_skb(buflen_u);
if (!mypkt) { if (!mypkt) {
BRCMF_ERROR(("%s: brcmu_pkt_buf_get_skb failed: " brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
"len %d\n", __func__, buflen_u)); buflen_u);
return -EIO; return -EIO;
} }
...@@ -522,12 +510,12 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma, ...@@ -522,12 +510,12 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma,
* Case 2: We have a packet, but it is unaligned. * Case 2: We have a packet, but it is unaligned.
* In this case, we cannot have a chain (pkt->next == NULL) * In this case, we cannot have a chain (pkt->next == NULL)
*/ */
BRCMF_DATA(("%s: Creating aligned %s Packet, len=%d\n", brcmf_dbg(DATA, "Creating aligned %s Packet, len=%d\n",
__func__, write ? "TX" : "RX", pkt->len)); write ? "TX" : "RX", pkt->len);
mypkt = brcmu_pkt_buf_get_skb(pkt->len); mypkt = brcmu_pkt_buf_get_skb(pkt->len);
if (!mypkt) { if (!mypkt) {
BRCMF_ERROR(("%s: brcmu_pkt_buf_get_skb failed: " brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
"len %d\n", __func__, pkt->len)); pkt->len);
return -EIO; return -EIO;
} }
...@@ -545,8 +533,8 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma, ...@@ -545,8 +533,8 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, uint pio_dma,
brcmu_pkt_buf_free_skb(mypkt); brcmu_pkt_buf_free_skb(mypkt);
} else { /* case 3: We have a packet and } else { /* case 3: We have a packet and
it is aligned. */ it is aligned. */
BRCMF_DATA(("%s: Aligned %s Packet, direct DMA\n", brcmf_dbg(DATA, "Aligned %s Packet, direct DMA\n",
__func__, write ? "Tx" : "Rx")); write ? "Tx" : "Rx");
Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write, Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,
func, addr, pkt); func, addr, pkt);
} }
...@@ -567,14 +555,14 @@ brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr, ...@@ -567,14 +555,14 @@ brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr,
&temp); &temp);
*data = temp; *data = temp;
*data &= 0xff; *data &= 0xff;
BRCMF_DATA(("%s: byte read data=0x%02x\n", __func__, *data)); brcmf_dbg(DATA, "byte read data=0x%02x\n", *data);
} else { } else {
brcmf_sdioh_request_word(sdiodev, 0, SDIOH_READ, func, regaddr, brcmf_sdioh_request_word(sdiodev, 0, SDIOH_READ, func, regaddr,
data, regsize); data, regsize);
if (regsize == 2) if (regsize == 2)
*data &= 0xffff; *data &= 0xffff;
BRCMF_DATA(("%s: word read data=0x%08x\n", __func__, *data)); brcmf_dbg(DATA, "word read data=0x%08x\n", *data);
} }
return SUCCESS; return SUCCESS;
...@@ -585,16 +573,15 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, ...@@ -585,16 +573,15 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
{ {
int ret = 0; int ret = 0;
struct brcmf_sdio_dev *sdiodev; struct brcmf_sdio_dev *sdiodev;
BRCMF_TRACE(("sdio_probe: %s Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_TRACE(("sdio_probe: func->class=%x\n", func->class)); brcmf_dbg(TRACE, "func->class=%x\n", func->class);
BRCMF_TRACE(("sdio_vendor: 0x%04x\n", func->vendor)); brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func->vendor);
BRCMF_TRACE(("sdio_device: 0x%04x\n", func->device)); brcmf_dbg(TRACE, "sdio_device: 0x%04x\n", func->device);
BRCMF_TRACE(("Function#: 0x%04x\n", func->num)); brcmf_dbg(TRACE, "Function#: 0x%04x\n", func->num);
if (func->num == 1) { if (func->num == 1) {
if (dev_get_drvdata(&func->card->dev)) { if (dev_get_drvdata(&func->card->dev)) {
BRCMF_ERROR(("%s: card private drvdata occupied.\n", brcmf_dbg(ERROR, "card private drvdata occupied\n");
__func__));
return -ENXIO; return -ENXIO;
} }
sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL); sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);
...@@ -614,7 +601,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, ...@@ -614,7 +601,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
sdiodev->func[2] = func; sdiodev->func[2] = func;
brcmf_cfg80211_sdio_func(func); brcmf_cfg80211_sdio_func(func);
BRCMF_TRACE(("F2 found, calling brcmf_sdio_probe...\n")); brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");
ret = brcmf_sdio_probe(sdiodev); ret = brcmf_sdio_probe(sdiodev);
} }
...@@ -624,15 +611,15 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, ...@@ -624,15 +611,15 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
static void brcmf_ops_sdio_remove(struct sdio_func *func) static void brcmf_ops_sdio_remove(struct sdio_func *func)
{ {
struct brcmf_sdio_dev *sdiodev; struct brcmf_sdio_dev *sdiodev;
BRCMF_TRACE(("%s Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_INFO(("func->class=%x\n", func->class)); brcmf_dbg(INFO, "func->class=%x\n", func->class);
BRCMF_INFO(("sdio_vendor: 0x%04x\n", func->vendor)); brcmf_dbg(INFO, "sdio_vendor: 0x%04x\n", func->vendor);
BRCMF_INFO(("sdio_device: 0x%04x\n", func->device)); brcmf_dbg(INFO, "sdio_device: 0x%04x\n", func->device);
BRCMF_INFO(("Function#: 0x%04x\n", func->num)); brcmf_dbg(INFO, "Function#: 0x%04x\n", func->num);
if (func->num == 2) { if (func->num == 2) {
sdiodev = dev_get_drvdata(&func->card->dev); sdiodev = dev_get_drvdata(&func->card->dev);
BRCMF_TRACE(("F2 found, calling brcmf_sdio_remove...\n")); brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_remove...\n");
brcmf_sdio_remove(sdiodev); brcmf_sdio_remove(sdiodev);
dev_set_drvdata(&func->card->dev, NULL); dev_set_drvdata(&func->card->dev, NULL);
kfree(sdiodev); kfree(sdiodev);
...@@ -648,7 +635,7 @@ static int brcmf_sdio_suspend(struct device *dev) ...@@ -648,7 +635,7 @@ static int brcmf_sdio_suspend(struct device *dev)
struct sdio_func *func = dev_to_sdio_func(dev); struct sdio_func *func = dev_to_sdio_func(dev);
int ret = 0; int ret = 0;
BRCMF_TRACE(("%s\n", __func__)); brcmf_dbg(TRACE, "\n");
sdiodev = dev_get_drvdata(&func->card->dev); sdiodev = dev_get_drvdata(&func->card->dev);
...@@ -656,13 +643,13 @@ static int brcmf_sdio_suspend(struct device *dev) ...@@ -656,13 +643,13 @@ static int brcmf_sdio_suspend(struct device *dev)
sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]); sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]);
if (!(sdio_flags & MMC_PM_KEEP_POWER)) { if (!(sdio_flags & MMC_PM_KEEP_POWER)) {
BRCMF_ERROR(("Host can't keep power while suspended\n")); brcmf_dbg(ERROR, "Host can't keep power while suspended\n");
return -EINVAL; return -EINVAL;
} }
ret = sdio_set_host_pm_flags(sdiodev->func[1], MMC_PM_KEEP_POWER); ret = sdio_set_host_pm_flags(sdiodev->func[1], MMC_PM_KEEP_POWER);
if (ret) { if (ret) {
BRCMF_ERROR(("Failed to set pm_flags\n")); brcmf_dbg(ERROR, "Failed to set pm_flags\n");
return ret; return ret;
} }
...@@ -689,7 +676,7 @@ static int brcmf_sdio_resume(struct device *dev) ...@@ -689,7 +676,7 @@ static int brcmf_sdio_resume(struct device *dev)
int brcmf_sdio_function_init(void) int brcmf_sdio_function_init(void)
{ {
int error = 0; int error = 0;
BRCMF_TRACE(("brcmf_sdio_function_init: %s Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
error = sdio_register_driver(&brcmf_sdmmc_driver); error = sdio_register_driver(&brcmf_sdmmc_driver);
...@@ -701,7 +688,7 @@ int brcmf_sdio_function_init(void) ...@@ -701,7 +688,7 @@ int brcmf_sdio_function_init(void)
*/ */
void brcmf_sdio_function_cleanup(void) void brcmf_sdio_function_cleanup(void)
{ {
BRCMF_TRACE(("%s Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
sdio_unregister_driver(&brcmf_sdmmc_driver); sdio_unregister_driver(&brcmf_sdmmc_driver);
} }
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View file @ 75bf74b9
...@@ -104,7 +104,7 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr) ...@@ -104,7 +104,7 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr)
int len = le32_to_cpu(prot->msg.len) + int len = le32_to_cpu(prot->msg.len) +
sizeof(struct brcmf_proto_cdc_ioctl); sizeof(struct brcmf_proto_cdc_ioctl);
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* NOTE : cdc->msg.len holds the desired length of the buffer to be /* NOTE : cdc->msg.len holds the desired length of the buffer to be
* returned. Only up to CDC_MAX_MSG_SIZE of this buffer area * returned. Only up to CDC_MAX_MSG_SIZE of this buffer area
...@@ -123,7 +123,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len) ...@@ -123,7 +123,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
int ret; int ret;
struct brcmf_proto *prot = drvr->prot; struct brcmf_proto *prot = drvr->prot;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
do { do {
ret = brcmf_sdbrcm_bus_rxctl(drvr->bus, ret = brcmf_sdbrcm_bus_rxctl(drvr->bus,
...@@ -146,8 +146,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, ...@@ -146,8 +146,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd,
int ret = 0, retries = 0; int ret = 0, retries = 0;
u32 id, flags = 0; u32 id, flags = 0;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_CTL(("%s: cmd %d len %d\n", __func__, cmd, len)); brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len);
/* Respond "bcmerror" and "bcmerrorstr" with local cache */ /* Respond "bcmerror" and "bcmerrorstr" with local cache */
if (cmd == BRCMF_C_GET_VAR && buf) { if (cmd == BRCMF_C_GET_VAR && buf) {
...@@ -174,8 +174,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, ...@@ -174,8 +174,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd,
ret = brcmf_proto_cdc_msg(drvr); ret = brcmf_proto_cdc_msg(drvr);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("brcmf_proto_cdc_query_ioctl: brcmf_proto_cdc_msg " brcmf_dbg(ERROR, "brcmf_proto_cdc_msg failed w/status %d\n",
"failed w/status %d\n", ret)); ret);
goto done; goto done;
} }
...@@ -191,9 +191,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, ...@@ -191,9 +191,8 @@ brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd,
if ((id < prot->reqid) && (++retries < RETRIES)) if ((id < prot->reqid) && (++retries < RETRIES))
goto retry; goto retry;
if (id != prot->reqid) { if (id != prot->reqid) {
BRCMF_ERROR(("%s: %s: unexpected request id %d (expected %d)\n", brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n",
brcmf_ifname(drvr, ifidx), __func__, id, brcmf_ifname(drvr, ifidx), id, prot->reqid);
prot->reqid));
ret = -EINVAL; ret = -EINVAL;
goto done; goto done;
} }
...@@ -227,8 +226,8 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, ...@@ -227,8 +226,8 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd,
int ret = 0; int ret = 0;
u32 flags, id; u32 flags, id;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
BRCMF_CTL(("%s: cmd %d len %d\n", __func__, cmd, len)); brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len);
memset(msg, 0, sizeof(struct brcmf_proto_cdc_ioctl)); memset(msg, 0, sizeof(struct brcmf_proto_cdc_ioctl));
...@@ -253,9 +252,8 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd, ...@@ -253,9 +252,8 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *drvr, int ifidx, uint cmd,
id = (flags & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT; id = (flags & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT;
if (id != prot->reqid) { if (id != prot->reqid) {
BRCMF_ERROR(("%s: %s: unexpected request id %d (expected %d)\n", brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n",
brcmf_ifname(drvr, ifidx), __func__, id, brcmf_ifname(drvr, ifidx), id, prot->reqid);
prot->reqid));
ret = -EINVAL; ret = -EINVAL;
goto done; goto done;
} }
...@@ -279,25 +277,23 @@ brcmf_proto_ioctl(struct brcmf_pub *drvr, int ifidx, struct brcmf_ioctl *ioc, ...@@ -279,25 +277,23 @@ brcmf_proto_ioctl(struct brcmf_pub *drvr, int ifidx, struct brcmf_ioctl *ioc,
int ret = -1; int ret = -1;
if (drvr->busstate == BRCMF_BUS_DOWN) { if (drvr->busstate == BRCMF_BUS_DOWN) {
BRCMF_ERROR(("%s : bus is down. we have nothing to do\n", brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n");
__func__));
return ret; return ret;
} }
brcmf_os_proto_block(drvr); brcmf_os_proto_block(drvr);
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (len > BRCMF_C_IOCTL_MAXLEN) if (len > BRCMF_C_IOCTL_MAXLEN)
goto done; goto done;
if (prot->pending == true) { if (prot->pending == true) {
BRCMF_TRACE(("CDC packet is pending!!!! cmd=0x%x (%lu) " brcmf_dbg(TRACE, "CDC packet is pending!!!! cmd=0x%x (%lu) lastcmd=0x%x (%lu)\n",
"lastcmd=0x%x (%lu)\n", ioc->cmd, (unsigned long)ioc->cmd, prot->lastcmd,
ioc->cmd, (unsigned long)ioc->cmd, prot->lastcmd, (unsigned long)prot->lastcmd);
(unsigned long)prot->lastcmd));
if ((ioc->cmd == BRCMF_C_SET_VAR) || if ((ioc->cmd == BRCMF_C_SET_VAR) ||
(ioc->cmd == BRCMF_C_GET_VAR)) (ioc->cmd == BRCMF_C_GET_VAR))
BRCMF_TRACE(("iovar cmd=%s\n", (char *)buf)); brcmf_dbg(TRACE, "iovar cmd=%s\n", (char *)buf);
goto done; goto done;
} }
...@@ -358,7 +354,7 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx, ...@@ -358,7 +354,7 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
{ {
struct brcmf_proto_bdc_header *h; struct brcmf_proto_bdc_header *h;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Push BDC header used to convey priority for buses that don't */ /* Push BDC header used to convey priority for buses that don't */
...@@ -381,13 +377,13 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx, ...@@ -381,13 +377,13 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx,
{ {
struct brcmf_proto_bdc_header *h; struct brcmf_proto_bdc_header *h;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Pop BDC header used to convey priority for buses that don't */ /* Pop BDC header used to convey priority for buses that don't */
if (pktbuf->len < BDC_HEADER_LEN) { if (pktbuf->len < BDC_HEADER_LEN) {
BRCMF_ERROR(("%s: rx data too short (%d < %d)\n", __func__, brcmf_dbg(ERROR, "rx data too short (%d < %d)\n",
pktbuf->len, BDC_HEADER_LEN)); pktbuf->len, BDC_HEADER_LEN);
return -EBADE; return -EBADE;
} }
...@@ -395,22 +391,20 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx, ...@@ -395,22 +391,20 @@ int brcmf_proto_hdrpull(struct brcmf_pub *drvr, int *ifidx,
*ifidx = BDC_GET_IF_IDX(h); *ifidx = BDC_GET_IF_IDX(h);
if (*ifidx >= BRCMF_MAX_IFS) { if (*ifidx >= BRCMF_MAX_IFS) {
BRCMF_ERROR(("%s: rx data ifnum out of range (%d)\n", brcmf_dbg(ERROR, "rx data ifnum out of range (%d)\n", *ifidx);
__func__, *ifidx));
return -EBADE; return -EBADE;
} }
if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) != if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) !=
BDC_PROTO_VER) { BDC_PROTO_VER) {
BRCMF_ERROR(("%s: non-BDC packet received, flags 0x%x\n", brcmf_dbg(ERROR, "%s: non-BDC packet received, flags 0x%x\n",
brcmf_ifname(drvr, *ifidx), h->flags)); brcmf_ifname(drvr, *ifidx), h->flags);
return -EBADE; return -EBADE;
} }
if (h->flags & BDC_FLAG_SUM_GOOD) { if (h->flags & BDC_FLAG_SUM_GOOD) {
BRCMF_INFO(("%s: BDC packet received with good rx-csum, " brcmf_dbg(INFO, "%s: BDC packet received with good rx-csum, flags 0x%x\n",
"flags 0x%x\n", brcmf_ifname(drvr, *ifidx), h->flags);
brcmf_ifname(drvr, *ifidx), h->flags));
PKTSETSUMGOOD(pktbuf, true); PKTSETSUMGOOD(pktbuf, true);
} }
...@@ -427,13 +421,13 @@ int brcmf_proto_attach(struct brcmf_pub *drvr) ...@@ -427,13 +421,13 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
cdc = kzalloc(sizeof(struct brcmf_proto), GFP_ATOMIC); cdc = kzalloc(sizeof(struct brcmf_proto), GFP_ATOMIC);
if (!cdc) { if (!cdc) {
BRCMF_ERROR(("%s: kmalloc failed\n", __func__)); brcmf_dbg(ERROR, "kmalloc failed\n");
goto fail; goto fail;
} }
/* ensure that the msg buf directly follows the cdc msg struct */ /* ensure that the msg buf directly follows the cdc msg struct */
if ((unsigned long)(&cdc->msg + 1) != (unsigned long)cdc->buf) { if ((unsigned long)(&cdc->msg + 1) != (unsigned long)cdc->buf) {
BRCMF_ERROR(("struct brcmf_proto is not correctly defined\n")); brcmf_dbg(ERROR, "struct brcmf_proto is not correctly defined\n");
goto fail; goto fail;
} }
...@@ -472,7 +466,7 @@ int brcmf_proto_init(struct brcmf_pub *drvr) ...@@ -472,7 +466,7 @@ int brcmf_proto_init(struct brcmf_pub *drvr)
int ret = 0; int ret = 0;
char buf[128]; char buf[128];
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
brcmf_os_proto_block(drvr); brcmf_os_proto_block(drvr);
......
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file @ 75bf74b9
...@@ -172,7 +172,7 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi, ...@@ -172,7 +172,7 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi,
int bcmerror = 0; int bcmerror = 0;
s32 int_val = 0; s32 int_val = 0;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
bcmerror = brcmu_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid)); bcmerror = brcmu_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid));
if (bcmerror != 0) if (bcmerror != 0)
...@@ -267,8 +267,8 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q, ...@@ -267,8 +267,8 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
p = discard_oldest ? brcmu_pktq_pdeq(q, eprec) : p = discard_oldest ? brcmu_pktq_pdeq(q, eprec) :
brcmu_pktq_pdeq_tail(q, eprec); brcmu_pktq_pdeq_tail(q, eprec);
if (p == NULL) if (p == NULL)
BRCMF_ERROR(("%s: brcmu_pktq_penq() failed, oldest %d.", brcmf_dbg(ERROR, "brcmu_pktq_penq() failed, oldest %d\n",
__func__, discard_oldest)); discard_oldest);
brcmu_pkt_buf_free_skb(p); brcmu_pkt_buf_free_skb(p);
} }
...@@ -276,7 +276,7 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q, ...@@ -276,7 +276,7 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
/* Enqueue */ /* Enqueue */
p = brcmu_pktq_penq(q, prec, pkt); p = brcmu_pktq_penq(q, prec, pkt);
if (p == NULL) if (p == NULL)
BRCMF_ERROR(("%s: brcmu_pktq_penq() failed.", __func__)); brcmf_dbg(ERROR, "brcmu_pktq_penq() failed\n");
return p != NULL; return p != NULL;
} }
...@@ -290,7 +290,7 @@ brcmf_c_iovar_op(struct brcmf_pub *drvr, const char *name, ...@@ -290,7 +290,7 @@ brcmf_c_iovar_op(struct brcmf_pub *drvr, const char *name,
const struct brcmu_iovar *vi = NULL; const struct brcmu_iovar *vi = NULL;
u32 actionid; u32 actionid;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (name == NULL || len < 0) if (name == NULL || len < 0)
return -EINVAL; return -EINVAL;
...@@ -309,8 +309,8 @@ brcmf_c_iovar_op(struct brcmf_pub *drvr, const char *name, ...@@ -309,8 +309,8 @@ brcmf_c_iovar_op(struct brcmf_pub *drvr, const char *name,
goto exit; goto exit;
} }
BRCMF_CTL(("%s: %s %s, len %d plen %d\n", __func__, brcmf_dbg(CTL, "%s %s, len %d plen %d\n",
name, (set ? "set" : "get"), len, plen)); name, set ? "set" : "get", len, plen);
/* set up 'params' pointer in case this is a set command so that /* set up 'params' pointer in case this is a set command so that
* the convenience int and bool code can be common to set and get * the convenience int and bool code can be common to set and get
...@@ -342,7 +342,7 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf, ...@@ -342,7 +342,7 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf,
{ {
int bcmerror = 0; int bcmerror = 0;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (!buf) if (!buf)
return -EINVAL; return -EINVAL;
...@@ -498,9 +498,9 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -498,9 +498,9 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
event_name = event_names[i].event_name; event_name = event_names[i].event_name;
} }
BRCMF_EVENT(("EVENT: %s, event ID = %d\n", event_name, event_type)); brcmf_dbg(EVENT, "EVENT: %s, event ID = %d\n", event_name, event_type);
BRCMF_EVENT(("flags 0x%04x, status %d, reason %d, auth_type %d" brcmf_dbg(EVENT, "flags 0x%04x, status %d, reason %d, auth_type %d MAC %s\n",
" MAC %s\n", flags, status, reason, auth_type, eabuf)); flags, status, reason, auth_type, eabuf);
if (flags & BRCMF_EVENT_MSG_LINK) if (flags & BRCMF_EVENT_MSG_LINK)
link = true; link = true;
...@@ -513,35 +513,34 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -513,35 +513,34 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
case BRCMF_E_START: case BRCMF_E_START:
case BRCMF_E_DEAUTH: case BRCMF_E_DEAUTH:
case BRCMF_E_DISASSOC: case BRCMF_E_DISASSOC:
BRCMF_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf)); brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);
break; break;
case BRCMF_E_ASSOC_IND: case BRCMF_E_ASSOC_IND:
case BRCMF_E_REASSOC_IND: case BRCMF_E_REASSOC_IND:
BRCMF_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf)); brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);
break; break;
case BRCMF_E_ASSOC: case BRCMF_E_ASSOC:
case BRCMF_E_REASSOC: case BRCMF_E_REASSOC:
if (status == BRCMF_E_STATUS_SUCCESS) if (status == BRCMF_E_STATUS_SUCCESS)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, SUCCESS\n", brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, SUCCESS\n",
event_name, eabuf)); event_name, eabuf);
else if (status == BRCMF_E_STATUS_TIMEOUT) else if (status == BRCMF_E_STATUS_TIMEOUT)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, TIMEOUT\n", brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, TIMEOUT\n",
event_name, eabuf)); event_name, eabuf);
else if (status == BRCMF_E_STATUS_FAIL) else if (status == BRCMF_E_STATUS_FAIL)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, FAILURE," brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, FAILURE, reason %d\n",
" reason %d\n", event_name, eabuf, event_name, eabuf, (int)reason);
(int)reason));
else else
BRCMF_EVENT(("MACEVENT: %s, MAC %s, unexpected status " brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, unexpected status %d\n",
"%d\n", event_name, eabuf, (int)status)); event_name, eabuf, (int)status);
break; break;
case BRCMF_E_DEAUTH_IND: case BRCMF_E_DEAUTH_IND:
case BRCMF_E_DISASSOC_IND: case BRCMF_E_DISASSOC_IND:
BRCMF_EVENT(("MACEVENT: %s, MAC %s, reason %d\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, reason %d\n",
eabuf, (int)reason)); event_name, eabuf, (int)reason);
break; break;
case BRCMF_E_AUTH: case BRCMF_E_AUTH:
...@@ -555,18 +554,17 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -555,18 +554,17 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
auth_str = err_msg; auth_str = err_msg;
} }
if (event_type == BRCMF_E_AUTH_IND) if (event_type == BRCMF_E_AUTH_IND)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s\n",
eabuf, auth_str)); event_name, eabuf, auth_str);
else if (status == BRCMF_E_STATUS_SUCCESS) else if (status == BRCMF_E_STATUS_SUCCESS)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, SUCCESS\n", brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, SUCCESS\n",
event_name, eabuf, auth_str)); event_name, eabuf, auth_str);
else if (status == BRCMF_E_STATUS_TIMEOUT) else if (status == BRCMF_E_STATUS_TIMEOUT)
BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, TIMEOUT\n", brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, TIMEOUT\n",
event_name, eabuf, auth_str)); event_name, eabuf, auth_str);
else if (status == BRCMF_E_STATUS_FAIL) { else if (status == BRCMF_E_STATUS_FAIL) {
BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, FAILURE, " brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, %s, FAILURE, reason %d\n",
"reason %d\n", event_name, eabuf, auth_str, (int)reason);
event_name, eabuf, auth_str, (int)reason));
} }
break; break;
...@@ -575,63 +573,63 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -575,63 +573,63 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
case BRCMF_E_ROAM: case BRCMF_E_ROAM:
case BRCMF_E_SET_SSID: case BRCMF_E_SET_SSID:
if (status == BRCMF_E_STATUS_SUCCESS) if (status == BRCMF_E_STATUS_SUCCESS)
BRCMF_EVENT(("MACEVENT: %s, MAC %s\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n",
eabuf)); event_name, eabuf);
else if (status == BRCMF_E_STATUS_FAIL) else if (status == BRCMF_E_STATUS_FAIL)
BRCMF_EVENT(("MACEVENT: %s, failed\n", event_name)); brcmf_dbg(EVENT, "MACEVENT: %s, failed\n", event_name);
else if (status == BRCMF_E_STATUS_NO_NETWORKS) else if (status == BRCMF_E_STATUS_NO_NETWORKS)
BRCMF_EVENT(("MACEVENT: %s, no networks found\n", brcmf_dbg(EVENT, "MACEVENT: %s, no networks found\n",
event_name)); event_name);
else else
BRCMF_EVENT(("MACEVENT: %s, unexpected status %d\n", brcmf_dbg(EVENT, "MACEVENT: %s, unexpected status %d\n",
event_name, (int)status)); event_name, (int)status);
break; break;
case BRCMF_E_BEACON_RX: case BRCMF_E_BEACON_RX:
if (status == BRCMF_E_STATUS_SUCCESS) if (status == BRCMF_E_STATUS_SUCCESS)
BRCMF_EVENT(("MACEVENT: %s, SUCCESS\n", event_name)); brcmf_dbg(EVENT, "MACEVENT: %s, SUCCESS\n", event_name);
else if (status == BRCMF_E_STATUS_FAIL) else if (status == BRCMF_E_STATUS_FAIL)
BRCMF_EVENT(("MACEVENT: %s, FAIL\n", event_name)); brcmf_dbg(EVENT, "MACEVENT: %s, FAIL\n", event_name);
else else
BRCMF_EVENT(("MACEVENT: %s, status %d\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s, status %d\n",
status)); event_name, status);
break; break;
case BRCMF_E_LINK: case BRCMF_E_LINK:
BRCMF_EVENT(("MACEVENT: %s %s\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s %s\n",
link ? "UP" : "DOWN")); event_name, link ? "UP" : "DOWN");
break; break;
case BRCMF_E_MIC_ERROR: case BRCMF_E_MIC_ERROR:
BRCMF_EVENT(("MACEVENT: %s, MAC %s, Group %d, Flush %d\n", brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s, Group %d, Flush %d\n",
event_name, eabuf, group, flush_txq)); event_name, eabuf, group, flush_txq);
break; break;
case BRCMF_E_ICV_ERROR: case BRCMF_E_ICV_ERROR:
case BRCMF_E_UNICAST_DECODE_ERROR: case BRCMF_E_UNICAST_DECODE_ERROR:
case BRCMF_E_MULTICAST_DECODE_ERROR: case BRCMF_E_MULTICAST_DECODE_ERROR:
BRCMF_EVENT(("MACEVENT: %s, MAC %s\n", event_name, eabuf)); brcmf_dbg(EVENT, "MACEVENT: %s, MAC %s\n", event_name, eabuf);
break; break;
case BRCMF_E_TXFAIL: case BRCMF_E_TXFAIL:
BRCMF_EVENT(("MACEVENT: %s, RA %s\n", event_name, eabuf)); brcmf_dbg(EVENT, "MACEVENT: %s, RA %s\n", event_name, eabuf);
break; break;
case BRCMF_E_SCAN_COMPLETE: case BRCMF_E_SCAN_COMPLETE:
case BRCMF_E_PMKID_CACHE: case BRCMF_E_PMKID_CACHE:
BRCMF_EVENT(("MACEVENT: %s\n", event_name)); brcmf_dbg(EVENT, "MACEVENT: %s\n", event_name);
break; break;
case BRCMF_E_PFN_NET_FOUND: case BRCMF_E_PFN_NET_FOUND:
case BRCMF_E_PFN_NET_LOST: case BRCMF_E_PFN_NET_LOST:
case BRCMF_E_PFN_SCAN_COMPLETE: case BRCMF_E_PFN_SCAN_COMPLETE:
BRCMF_EVENT(("PNOEVENT: %s\n", event_name)); brcmf_dbg(EVENT, "PNOEVENT: %s\n", event_name);
break; break;
case BRCMF_E_PSK_SUP: case BRCMF_E_PSK_SUP:
case BRCMF_E_PRUNE: case BRCMF_E_PRUNE:
BRCMF_EVENT(("MACEVENT: %s, status %d, reason %d\n", brcmf_dbg(EVENT, "MACEVENT: %s, status %d, reason %d\n",
event_name, (int)status, (int)reason)); event_name, (int)status, (int)reason);
break; break;
case BRCMF_E_TRACE: case BRCMF_E_TRACE:
...@@ -645,11 +643,9 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -645,11 +643,9 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
memcpy(&hdr, buf, sizeof(struct msgtrace_hdr)); memcpy(&hdr, buf, sizeof(struct msgtrace_hdr));
if (hdr.version != MSGTRACE_VERSION) { if (hdr.version != MSGTRACE_VERSION) {
BRCMF_ERROR( brcmf_dbg(ERROR, "MACEVENT: %s [unsupported version --> brcmf version:%d dongle version:%d]\n",
("\nMACEVENT: %s [unsupported version --> " event_name,
"brcmf version:%d dongle version:%d]\n", MSGTRACE_VERSION, hdr.version);
event_name, MSGTRACE_VERSION, hdr.version)
);
/* Reset datalen to avoid display below */ /* Reset datalen to avoid display below */
datalen = 0; datalen = 0;
break; break;
...@@ -661,18 +657,14 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -661,18 +657,14 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
if (be32_to_cpu(hdr.discarded_bytes) if (be32_to_cpu(hdr.discarded_bytes)
|| be32_to_cpu(hdr.discarded_printf)) || be32_to_cpu(hdr.discarded_printf))
BRCMF_ERROR(("\nWLC_E_TRACE: [Discarded traces " brcmf_dbg(ERROR, "WLC_E_TRACE: [Discarded traces in dongle --> discarded_bytes %d discarded_printf %d]\n",
"in dongle -->discarded_bytes %d " be32_to_cpu(hdr.discarded_bytes),
"discarded_printf %d]\n", be32_to_cpu(hdr.discarded_printf));
be32_to_cpu(hdr.discarded_bytes),
be32_to_cpu(hdr.discarded_printf)))
;
nblost = be32_to_cpu(hdr.seqnum) - seqnum_prev - 1; nblost = be32_to_cpu(hdr.seqnum) - seqnum_prev - 1;
if (nblost > 0) if (nblost > 0)
BRCMF_ERROR(("\nWLC_E_TRACE: [Event lost --> " brcmf_dbg(ERROR, "WLC_E_TRACE: [Event lost --> seqnum %d nblost %d\n",
"seqnum %d nblost %d\n", be32_to_cpu(hdr.seqnum), nblost);
be32_to_cpu(hdr.seqnum), nblost));
seqnum_prev = be32_to_cpu(hdr.seqnum); seqnum_prev = be32_to_cpu(hdr.seqnum);
/* Display the trace buffer. Advance from \n to \n to /* Display the trace buffer. Advance from \n to \n to
...@@ -693,24 +685,24 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) ...@@ -693,24 +685,24 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
break; break;
case BRCMF_E_RSSI: case BRCMF_E_RSSI:
BRCMF_EVENT(("MACEVENT: %s %d\n", event_name, brcmf_dbg(EVENT, "MACEVENT: %s %d\n",
be32_to_cpu(*((int *)event_data)))); event_name, be32_to_cpu(*((int *)event_data)));
break; break;
default: default:
BRCMF_EVENT(("MACEVENT: %s %d, MAC %s, status %d, reason %d, " brcmf_dbg(EVENT, "MACEVENT: %s %d, MAC %s, status %d, reason %d, auth %d\n",
"auth %d\n", event_name, event_type, eabuf, event_name, event_type, eabuf,
(int)status, (int)reason, (int)auth_type)); (int)status, (int)reason, (int)auth_type);
break; break;
} }
/* show any appended data */ /* show any appended data */
if (datalen) { if (datalen) {
buf = (unsigned char *) event_data; buf = (unsigned char *) event_data;
BRCMF_EVENT((" data (%d) : ", datalen)); brcmf_dbg(EVENT, " data (%d) : ", datalen);
for (i = 0; i < datalen; i++) for (i = 0; i < datalen; i++)
BRCMF_EVENT((" 0x%02x ", *buf++)); brcmf_dbg(EVENT, " 0x%02x ", *buf++);
BRCMF_EVENT(("\n")); brcmf_dbg(EVENT, "\n");
} }
} }
#endif /* SHOW_EVENTS */ #endif /* SHOW_EVENTS */
...@@ -727,14 +719,14 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, ...@@ -727,14 +719,14 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
int evlen; int evlen;
if (memcmp(BRCM_OUI, &pvt_data->hdr.oui[0], DOT11_OUI_LEN)) { if (memcmp(BRCM_OUI, &pvt_data->hdr.oui[0], DOT11_OUI_LEN)) {
BRCMF_ERROR(("%s: mismatched OUI, bailing\n", __func__)); brcmf_dbg(ERROR, "mismatched OUI, bailing\n");
return -EBADE; return -EBADE;
} }
/* BRCM event pkt may be unaligned - use xxx_ua to load user_subtype. */ /* BRCM event pkt may be unaligned - use xxx_ua to load user_subtype. */
if (get_unaligned_be16(&pvt_data->hdr.usr_subtype) != if (get_unaligned_be16(&pvt_data->hdr.usr_subtype) !=
BCMILCP_BCM_SUBTYPE_EVENT) { BCMILCP_BCM_SUBTYPE_EVENT) {
BRCMF_ERROR(("%s: mismatched subtype, bailing\n", __func__)); brcmf_dbg(ERROR, "mismatched subtype, bailing\n");
return -EBADE; return -EBADE;
} }
...@@ -755,7 +747,7 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, ...@@ -755,7 +747,7 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
{ {
struct brcmf_if_event *ifevent = struct brcmf_if_event *ifevent =
(struct brcmf_if_event *) event_data; (struct brcmf_if_event *) event_data;
BRCMF_TRACE(("%s: if event\n", __func__)); brcmf_dbg(TRACE, "if event\n");
if (ifevent->ifidx > 0 && if (ifevent->ifidx > 0 &&
ifevent->ifidx < BRCMF_MAX_IFS) { ifevent->ifidx < BRCMF_MAX_IFS) {
...@@ -768,9 +760,8 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, ...@@ -768,9 +760,8 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
else else
brcmf_del_if(drvr_priv, ifevent->ifidx); brcmf_del_if(drvr_priv, ifevent->ifidx);
} else { } else {
BRCMF_ERROR(("%s: Invalid ifidx %d for %s\n", brcmf_dbg(ERROR, "Invalid ifidx %d for %s\n",
__func__, ifevent->ifidx, ifevent->ifidx, event->ifname);
event->ifname));
} }
} }
/* send up the if event: btamp user needs it */ /* send up the if event: btamp user needs it */
...@@ -787,16 +778,16 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, ...@@ -787,16 +778,16 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
/* Fall through: this should get _everything_ */ /* Fall through: this should get _everything_ */
*ifidx = brcmf_ifname2idx(drvr_priv, event->ifname); *ifidx = brcmf_ifname2idx(drvr_priv, event->ifname);
BRCMF_TRACE(("%s: MAC event %d, flags %x, status %x\n", brcmf_dbg(TRACE, "MAC event %d, flags %x, status %x\n",
__func__, type, flags, status)); type, flags, status);
/* put it back to BRCMF_E_NDIS_LINK */ /* put it back to BRCMF_E_NDIS_LINK */
if (type == BRCMF_E_NDIS_LINK) { if (type == BRCMF_E_NDIS_LINK) {
u32 temp; u32 temp;
temp = get_unaligned_be32(&event->event_type); temp = get_unaligned_be32(&event->event_type);
BRCMF_TRACE(("Converted to WLC_E_LINK type %d\n", brcmf_dbg(TRACE, "Converted to WLC_E_LINK type %d\n",
temp)); temp);
temp = be32_to_cpu(BRCMF_E_NDIS_LINK); temp = be32_to_cpu(BRCMF_E_NDIS_LINK);
memcpy((void *)(&pvt_data->msg.event_type), &temp, memcpy((void *)(&pvt_data->msg.event_type), &temp,
...@@ -817,12 +808,12 @@ static int brcmf_c_pattern_atoh(char *src, char *dst) ...@@ -817,12 +808,12 @@ static int brcmf_c_pattern_atoh(char *src, char *dst)
{ {
int i; int i;
if (strncmp(src, "0x", 2) != 0 && strncmp(src, "0X", 2) != 0) { if (strncmp(src, "0x", 2) != 0 && strncmp(src, "0X", 2) != 0) {
BRCMF_ERROR(("Mask invalid format. Needs to start with 0x\n")); brcmf_dbg(ERROR, "Mask invalid format. Needs to start with 0x\n");
return -EINVAL; return -EINVAL;
} }
src = src + 2; /* Skip past 0x */ src = src + 2; /* Skip past 0x */
if (strlen(src) % 2 != 0) { if (strlen(src) % 2 != 0) {
BRCMF_ERROR(("Mask invalid format. Length must be even.\n")); brcmf_dbg(ERROR, "Mask invalid format. Length must be even.\n");
return -EINVAL; return -EINVAL;
} }
for (i = 0; *src != '\0'; i++) { for (i = 0; *src != '\0'; i++) {
...@@ -856,7 +847,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, ...@@ -856,7 +847,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable,
arg_save = kmalloc(strlen(arg) + 1, GFP_ATOMIC); arg_save = kmalloc(strlen(arg) + 1, GFP_ATOMIC);
if (!arg_save) { if (!arg_save) {
BRCMF_ERROR(("%s: kmalloc failed\n", __func__)); brcmf_dbg(ERROR, "kmalloc failed\n");
goto fail; goto fail;
} }
arg_org = arg_save; arg_org = arg_save;
...@@ -866,7 +857,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, ...@@ -866,7 +857,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable,
i = 0; i = 0;
if (NULL == argv[i]) { if (NULL == argv[i]) {
BRCMF_ERROR(("No args provided\n")); brcmf_dbg(ERROR, "No args provided\n");
goto fail; goto fail;
} }
...@@ -893,11 +884,10 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, ...@@ -893,11 +884,10 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable,
rc = brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, buf, buf_len); rc = brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, buf, buf_len);
rc = rc >= 0 ? 0 : rc; rc = rc >= 0 ? 0 : rc;
if (rc) if (rc)
BRCMF_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n", brcmf_dbg(TRACE, "failed to add pktfilter %s, retcode = %d\n",
__func__, arg, rc)); arg, rc);
else else
BRCMF_TRACE(("%s: successfully added pktfilter %s\n", brcmf_dbg(TRACE, "successfully added pktfilter %s\n", arg);
__func__, arg));
/* Contorl the master mode */ /* Contorl the master mode */
brcmu_mkiovar("pkt_filter_mode", (char *)&master_mode, 4, buf, brcmu_mkiovar("pkt_filter_mode", (char *)&master_mode, 4, buf,
...@@ -906,8 +896,8 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, ...@@ -906,8 +896,8 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable,
sizeof(buf)); sizeof(buf));
rc = rc >= 0 ? 0 : rc; rc = rc >= 0 ? 0 : rc;
if (rc) if (rc)
BRCMF_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n", brcmf_dbg(TRACE, "failed to add pktfilter %s, retcode = %d\n",
__func__, arg, rc)); arg, rc);
fail: fail:
kfree(arg_org); kfree(arg_org);
...@@ -930,7 +920,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -930,7 +920,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
arg_save = kstrdup(arg, GFP_ATOMIC); arg_save = kstrdup(arg, GFP_ATOMIC);
if (!arg_save) { if (!arg_save) {
BRCMF_ERROR(("%s: kmalloc failed\n", __func__)); brcmf_dbg(ERROR, "kmalloc failed\n");
goto fail; goto fail;
} }
...@@ -938,7 +928,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -938,7 +928,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
buf = kmalloc(PKTFILTER_BUF_SIZE, GFP_ATOMIC); buf = kmalloc(PKTFILTER_BUF_SIZE, GFP_ATOMIC);
if (!buf) { if (!buf) {
BRCMF_ERROR(("%s: kmalloc failed\n", __func__)); brcmf_dbg(ERROR, "kmalloc failed\n");
goto fail; goto fail;
} }
...@@ -948,7 +938,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -948,7 +938,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
i = 0; i = 0;
if (NULL == argv[i]) { if (NULL == argv[i]) {
BRCMF_ERROR(("No args provided\n")); brcmf_dbg(ERROR, "No args provided\n");
goto fail; goto fail;
} }
...@@ -965,7 +955,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -965,7 +955,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
pkt_filter.id = (u32)res; pkt_filter.id = (u32)res;
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
BRCMF_ERROR(("Polarity not provided\n")); brcmf_dbg(ERROR, "Polarity not provided\n");
goto fail; goto fail;
} }
...@@ -975,7 +965,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -975,7 +965,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
pkt_filter.negate_match = (u32)res; pkt_filter.negate_match = (u32)res;
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
BRCMF_ERROR(("Filter type not provided\n")); brcmf_dbg(ERROR, "Filter type not provided\n");
goto fail; goto fail;
} }
...@@ -985,7 +975,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -985,7 +975,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
pkt_filter.type = (u32)res; pkt_filter.type = (u32)res;
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
BRCMF_ERROR(("Offset not provided\n")); brcmf_dbg(ERROR, "Offset not provided\n");
goto fail; goto fail;
} }
...@@ -995,7 +985,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -995,7 +985,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
pkt_filter.u.pattern.offset = (u32)res; pkt_filter.u.pattern.offset = (u32)res;
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
BRCMF_ERROR(("Bitmask not provided\n")); brcmf_dbg(ERROR, "Bitmask not provided\n");
goto fail; goto fail;
} }
...@@ -1005,7 +995,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -1005,7 +995,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
(argv[i], (char *)pkt_filterp->u.pattern.mask_and_pattern); (argv[i], (char *)pkt_filterp->u.pattern.mask_and_pattern);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
BRCMF_ERROR(("Pattern not provided\n")); brcmf_dbg(ERROR, "Pattern not provided\n");
goto fail; goto fail;
} }
...@@ -1016,7 +1006,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -1016,7 +1006,7 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
mask_and_pattern[mask_size]); mask_and_pattern[mask_size]);
if (mask_size != pattern_size) { if (mask_size != pattern_size) {
BRCMF_ERROR(("Mask and pattern not the same size\n")); brcmf_dbg(ERROR, "Mask and pattern not the same size\n");
goto fail; goto fail;
} }
...@@ -1037,11 +1027,10 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg) ...@@ -1037,11 +1027,10 @@ void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg)
rc = rc >= 0 ? 0 : rc; rc = rc >= 0 ? 0 : rc;
if (rc) if (rc)
BRCMF_TRACE(("%s: failed to add pktfilter %s, retcode = %d\n", brcmf_dbg(TRACE, "failed to add pktfilter %s, retcode = %d\n",
__func__, arg, rc)); arg, rc);
else else
BRCMF_TRACE(("%s: successfully added pktfilter %s\n", brcmf_dbg(TRACE, "successfully added pktfilter %s\n", arg);
__func__, arg));
fail: fail:
kfree(arg_org); kfree(arg_org);
...@@ -1059,11 +1048,11 @@ void brcmf_c_arp_offload_set(struct brcmf_pub *drvr, int arp_mode) ...@@ -1059,11 +1048,11 @@ void brcmf_c_arp_offload_set(struct brcmf_pub *drvr, int arp_mode)
iovbuf, sizeof(iovbuf)); iovbuf, sizeof(iovbuf));
retcode = retcode >= 0 ? 0 : retcode; retcode = retcode >= 0 ? 0 : retcode;
if (retcode) if (retcode)
BRCMF_TRACE(("%s: failed to set ARP offload mode to 0x%x, " brcmf_dbg(TRACE, "failed to set ARP offload mode to 0x%x, retcode = %d\n",
"retcode = %d\n", __func__, arp_mode, retcode)); arp_mode, retcode);
else else
BRCMF_TRACE(("%s: successfully set ARP offload mode to 0x%x\n", brcmf_dbg(TRACE, "successfully set ARP offload mode to 0x%x\n",
__func__, arp_mode)); arp_mode);
} }
void brcmf_c_arp_offload_enable(struct brcmf_pub *drvr, int arp_enable) void brcmf_c_arp_offload_enable(struct brcmf_pub *drvr, int arp_enable)
...@@ -1076,11 +1065,11 @@ void brcmf_c_arp_offload_enable(struct brcmf_pub *drvr, int arp_enable) ...@@ -1076,11 +1065,11 @@ void brcmf_c_arp_offload_enable(struct brcmf_pub *drvr, int arp_enable)
iovbuf, sizeof(iovbuf)); iovbuf, sizeof(iovbuf));
retcode = retcode >= 0 ? 0 : retcode; retcode = retcode >= 0 ? 0 : retcode;
if (retcode) if (retcode)
BRCMF_TRACE(("%s: failed to enabe ARP offload to %d, " brcmf_dbg(TRACE, "failed to enable ARP offload to %d, retcode = %d\n",
"retcode = %d\n", __func__, arp_enable, retcode)); arp_enable, retcode);
else else
BRCMF_TRACE(("%s: successfully enabed ARP offload to %d\n", brcmf_dbg(TRACE, "successfully enabled ARP offload to %d\n",
__func__, arp_enable)); arp_enable);
} }
int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
...@@ -1103,8 +1092,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) ...@@ -1103,8 +1092,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
if (brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_COUNTRY, if (brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_COUNTRY,
drvr->country_code, drvr->country_code,
sizeof(drvr->country_code)) < 0) sizeof(drvr->country_code)) < 0)
BRCMF_ERROR(("%s: country code setting failed\n", brcmf_dbg(ERROR, "country code setting failed\n");
__func__));
} }
/* query for 'ver' to get version info from firmware */ /* query for 'ver' to get version info from firmware */
...@@ -1114,7 +1102,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) ...@@ -1114,7 +1102,7 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
brcmf_proto_cdc_query_ioctl(drvr, 0, BRCMF_C_GET_VAR, buf, sizeof(buf)); brcmf_proto_cdc_query_ioctl(drvr, 0, BRCMF_C_GET_VAR, buf, sizeof(buf));
strsep(&ptr, "\n"); strsep(&ptr, "\n");
/* Print fw version info */ /* Print fw version info */
BRCMF_ERROR(("Firmware version = %s\n", buf)); brcmf_dbg(ERROR, "Firmware version = %s\n", buf);
/* Match Host and Dongle rx alignment */ /* Match Host and Dongle rx alignment */
brcmu_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf, brcmu_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf,
......
drivers/staging/brcm80211/brcmfmac/dhd_dbg.h
View file @ 75bf74b9
...@@ -19,25 +19,21 @@ ...@@ -19,25 +19,21 @@
#if defined(BCMDBG) #if defined(BCMDBG)
#define BRCMF_ERROR(args) \ #define brcmf_dbg(level, fmt, ...) \
do {if ((brcmf_msg_level & BRCMF_ERROR_VAL) && (net_ratelimit())) \ do { \
printk args; } while (0) if (BRCMF_ERROR_VAL == BRCMF_##level##_VAL) { \
#define BRCMF_TRACE(args) do {if (brcmf_msg_level & BRCMF_TRACE_VAL) \ if (brcmf_msg_level & BRCMF_##level##_VAL) { \
printk args; } while (0) if (net_ratelimit()) \
#define BRCMF_INFO(args) do {if (brcmf_msg_level & BRCMF_INFO_VAL) \ printk(KERN_DEBUG "%s: " fmt, \
printk args; } while (0) __func__, ##__VA_ARGS__); \
#define BRCMF_DATA(args) do {if (brcmf_msg_level & BRCMF_DATA_VAL) \ } \
printk args; } while (0) } else { \
#define BRCMF_CTL(args) do {if (brcmf_msg_level & BRCMF_CTL_VAL) \ if (brcmf_msg_level & BRCMF_##level##_VAL) { \
printk args; } while (0) printk(KERN_DEBUG "%s: " fmt, \
#define BRCMF_TIMER(args) do {if (brcmf_msg_level & BRCMF_TIMER_VAL) \ __func__, ##__VA_ARGS__); \
printk args; } while (0) } \
#define BRCMF_INTR(args) do {if (brcmf_msg_level & BRCMF_INTR_VAL) \ } \
printk args; } while (0) } while (0)
#define BRCMF_GLOM(args) do {if (brcmf_msg_level & BRCMF_GLOM_VAL) \
printk args; } while (0)
#define BRCMF_EVENT(args) do {if (brcmf_msg_level & BRCMF_EVENT_VAL) \
printk args; } while (0)
#define BRCMF_DATA_ON() (brcmf_msg_level & BRCMF_DATA_VAL) #define BRCMF_DATA_ON() (brcmf_msg_level & BRCMF_DATA_VAL)
#define BRCMF_CTL_ON() (brcmf_msg_level & BRCMF_CTL_VAL) #define BRCMF_CTL_ON() (brcmf_msg_level & BRCMF_CTL_VAL)
...@@ -47,20 +43,12 @@ ...@@ -47,20 +43,12 @@
#else /* (defined BCMDBG) || (defined BCMDBG) */ #else /* (defined BCMDBG) || (defined BCMDBG) */
#define BRCMF_ERROR(args) do {if (net_ratelimit()) printk args; } while (0) #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#define BRCMF_TRACE(args)
#define BRCMF_INFO(args)
#define BRCMF_DATA(args)
#define BRCMF_CTL(args)
#define BRCMF_TIMER(args)
#define BRCMF_INTR(args)
#define BRCMF_GLOM(args)
#define BRCMF_EVENT(args)
#define BRCMF_DATA_ON() 0 #define BRCMF_DATA_ON() 0
#define BRCMF_CTL_ON() 0 #define BRCMF_CTL_ON() 0
#define BRCMF_HDRS_ON() 0 #define BRCMF_HDRS_ON() 0
#define BRCMF_BYTES_ON() 0 #define BRCMF_BYTES_ON() 0
#define BRCMF_GLOM_ON() 0 #define BRCMF_GLOM_ON() 0
#endif /* defined(BCMDBG) */ #endif /* defined(BCMDBG) */
......
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file @ 75bf74b9
...@@ -163,7 +163,7 @@ int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name) ...@@ -163,7 +163,7 @@ int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)
&& !strncmp(drvr_priv->iflist[i]->name, name, IFNAMSIZ)) && !strncmp(drvr_priv->iflist[i]->name, name, IFNAMSIZ))
break; break;
BRCMF_TRACE(("%s: return idx %d for \"%s\"\n", __func__, i, name)); brcmf_dbg(TRACE, "return idx %d for \"%s\"\n", i, name);
return i; /* default - the primary interface */ return i; /* default - the primary interface */
} }
...@@ -173,12 +173,12 @@ char *brcmf_ifname(struct brcmf_pub *drvr, int ifidx) ...@@ -173,12 +173,12 @@ char *brcmf_ifname(struct brcmf_pub *drvr, int ifidx)
struct brcmf_info *drvr_priv = drvr->info; struct brcmf_info *drvr_priv = drvr->info;
if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) { if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {
BRCMF_ERROR(("%s: ifidx %d out of range\n", __func__, ifidx)); brcmf_dbg(ERROR, "ifidx %d out of range\n", ifidx);
return "<if_bad>"; return "<if_bad>";
} }
if (drvr_priv->iflist[ifidx] == NULL) { if (drvr_priv->iflist[ifidx] == NULL) {
BRCMF_ERROR(("%s: null i/f %d\n", __func__, ifidx)); brcmf_dbg(ERROR, "null i/f %d\n", ifidx);
return "<if_null>"; return "<if_null>";
} }
...@@ -210,8 +210,8 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx) ...@@ -210,8 +210,8 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx)
buflen = sizeof("mcast_list") + sizeof(cnt) + (cnt * ETH_ALEN); buflen = sizeof("mcast_list") + sizeof(cnt) + (cnt * ETH_ALEN);
bufp = buf = kmalloc(buflen, GFP_ATOMIC); bufp = buf = kmalloc(buflen, GFP_ATOMIC);
if (!bufp) { if (!bufp) {
BRCMF_ERROR(("%s: out of memory for mcast_list, cnt %d\n", brcmf_dbg(ERROR, "%s: out of memory for mcast_list, cnt %d\n",
brcmf_ifname(&drvr_priv->pub, ifidx), cnt)); brcmf_ifname(&drvr_priv->pub, ifidx), cnt);
return; return;
} }
...@@ -238,8 +238,8 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx) ...@@ -238,8 +238,8 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("%s: set mcast_list failed, cnt %d\n", brcmf_dbg(ERROR, "%s: set mcast_list failed, cnt %d\n",
brcmf_ifname(&drvr_priv->pub, ifidx), cnt)); brcmf_ifname(&drvr_priv->pub, ifidx), cnt);
allmulti = cnt ? true : allmulti; allmulti = cnt ? true : allmulti;
} }
...@@ -253,18 +253,17 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx) ...@@ -253,18 +253,17 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx)
buflen = sizeof("allmulti") + sizeof(allmulti); buflen = sizeof("allmulti") + sizeof(allmulti);
buf = kmalloc(buflen, GFP_ATOMIC); buf = kmalloc(buflen, GFP_ATOMIC);
if (!buf) { if (!buf) {
BRCMF_ERROR(("%s: out of memory for allmulti\n", brcmf_dbg(ERROR, "%s: out of memory for allmulti\n",
brcmf_ifname(&drvr_priv->pub, ifidx))); brcmf_ifname(&drvr_priv->pub, ifidx));
return; return;
} }
allmulti = cpu_to_le32(allmulti); allmulti = cpu_to_le32(allmulti);
if (!brcmu_mkiovar if (!brcmu_mkiovar
("allmulti", (void *)&allmulti, sizeof(allmulti), buf, buflen)) { ("allmulti", (void *)&allmulti, sizeof(allmulti), buf, buflen)) {
BRCMF_ERROR(("%s: mkiovar failed for allmulti, datalen %d " brcmf_dbg(ERROR, "%s: mkiovar failed for allmulti, datalen %d buflen %u\n",
"buflen %u\n", brcmf_ifname(&drvr_priv->pub, ifidx),
brcmf_ifname(&drvr_priv->pub, ifidx), (int)sizeof(allmulti), buflen);
(int)sizeof(allmulti), buflen));
kfree(buf); kfree(buf);
return; return;
} }
...@@ -277,9 +276,9 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx) ...@@ -277,9 +276,9 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("%s: set allmulti %d failed\n", brcmf_dbg(ERROR, "%s: set allmulti %d failed\n",
brcmf_ifname(&drvr_priv->pub, ifidx), brcmf_ifname(&drvr_priv->pub, ifidx),
le32_to_cpu(allmulti))); le32_to_cpu(allmulti));
} }
kfree(buf); kfree(buf);
...@@ -298,9 +297,9 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx) ...@@ -298,9 +297,9 @@ static void _brcmf_set_multicast_list(struct brcmf_info *drvr_priv, int ifidx)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("%s: set promisc %d failed\n", brcmf_dbg(ERROR, "%s: set promisc %d failed\n",
brcmf_ifname(&drvr_priv->pub, ifidx), brcmf_ifname(&drvr_priv->pub, ifidx),
le32_to_cpu(allmulti))); le32_to_cpu(allmulti));
} }
} }
...@@ -311,11 +310,10 @@ _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *addr) ...@@ -311,11 +310,10 @@ _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *addr)
struct brcmf_ioctl ioc; struct brcmf_ioctl ioc;
int ret; int ret;
BRCMF_TRACE(("%s enter\n", __func__)); brcmf_dbg(TRACE, "enter\n");
if (!brcmu_mkiovar if (!brcmu_mkiovar("cur_etheraddr", (char *)addr, ETH_ALEN, buf, 32)) {
("cur_etheraddr", (char *)addr, ETH_ALEN, buf, 32)) { brcmf_dbg(ERROR, "%s: mkiovar failed for cur_etheraddr\n",
BRCMF_ERROR(("%s: mkiovar failed for cur_etheraddr\n", brcmf_ifname(&drvr_priv->pub, ifidx));
brcmf_ifname(&drvr_priv->pub, ifidx)));
return -1; return -1;
} }
memset(&ioc, 0, sizeof(ioc)); memset(&ioc, 0, sizeof(ioc));
...@@ -326,8 +324,8 @@ _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *addr) ...@@ -326,8 +324,8 @@ _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *addr)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) if (ret < 0)
BRCMF_ERROR(("%s: set cur_etheraddr failed\n", brcmf_dbg(ERROR, "%s: set cur_etheraddr failed\n",
brcmf_ifname(&drvr_priv->pub, ifidx))); brcmf_ifname(&drvr_priv->pub, ifidx));
else else
memcpy(drvr_priv->iflist[ifidx]->net->dev_addr, addr, ETH_ALEN); memcpy(drvr_priv->iflist[ifidx]->net->dev_addr, addr, ETH_ALEN);
...@@ -346,7 +344,7 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -346,7 +344,7 @@ static void brcmf_op_if(struct brcmf_if *ifp)
drvr_priv = ifp->info; drvr_priv = ifp->info;
BRCMF_TRACE(("%s: idx %d, state %d\n", __func__, ifp->idx, ifp->state)); brcmf_dbg(TRACE, "idx %d, state %d\n", ifp->idx, ifp->state);
switch (ifp->state) { switch (ifp->state) {
case BRCMF_E_IF_ADD: case BRCMF_E_IF_ADD:
...@@ -355,9 +353,8 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -355,9 +353,8 @@ static void brcmf_op_if(struct brcmf_if *ifp)
* in case we missed the BRCMF_E_IF_DEL event. * in case we missed the BRCMF_E_IF_DEL event.
*/ */
if (ifp->net != NULL) { if (ifp->net != NULL) {
BRCMF_ERROR(("%s: ERROR: netdev:%s already exists, " brcmf_dbg(ERROR, "ERROR: netdev:%s already exists, try free & unregister\n",
"try free & unregister\n", ifp->net->name);
__func__, ifp->net->name));
netif_stop_queue(ifp->net); netif_stop_queue(ifp->net);
unregister_netdev(ifp->net); unregister_netdev(ifp->net);
free_netdev(ifp->net); free_netdev(ifp->net);
...@@ -365,7 +362,7 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -365,7 +362,7 @@ static void brcmf_op_if(struct brcmf_if *ifp)
/* Allocate etherdev, including space for private structure */ /* Allocate etherdev, including space for private structure */
ifp->net = alloc_etherdev(sizeof(drvr_priv)); ifp->net = alloc_etherdev(sizeof(drvr_priv));
if (!ifp->net) { if (!ifp->net) {
BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__)); brcmf_dbg(ERROR, "OOM - alloc_etherdev\n");
ret = -ENOMEM; ret = -ENOMEM;
} }
if (ret == 0) { if (ret == 0) {
...@@ -374,9 +371,8 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -374,9 +371,8 @@ static void brcmf_op_if(struct brcmf_if *ifp)
sizeof(drvr_priv)); sizeof(drvr_priv));
err = brcmf_net_attach(&drvr_priv->pub, ifp->idx); err = brcmf_net_attach(&drvr_priv->pub, ifp->idx);
if (err != 0) { if (err != 0) {
BRCMF_ERROR(("%s: brcmf_net_attach failed, " brcmf_dbg(ERROR, "brcmf_net_attach failed, err %d\n",
"err %d\n", err);
__func__, err));
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
} else { } else {
#ifdef SOFTAP #ifdef SOFTAP
...@@ -391,17 +387,15 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -391,17 +387,15 @@ static void brcmf_op_if(struct brcmf_if *ifp)
wl0.1 is ready */ wl0.1 is ready */
up(&ap_eth_sema); up(&ap_eth_sema);
#endif #endif
BRCMF_TRACE(("\n ==== pid:%x, net_device for " brcmf_dbg(TRACE, " ==== pid:%x, net_device for if:%s created ===\n",
"if:%s created ===\n\n", current->pid, ifp->net->name);
current->pid, ifp->net->name));
ifp->state = 0; ifp->state = 0;
} }
} }
break; break;
case BRCMF_E_IF_DEL: case BRCMF_E_IF_DEL:
if (ifp->net != NULL) { if (ifp->net != NULL) {
BRCMF_TRACE(("\n%s: got 'WLC_E_IF_DEL' state\n", brcmf_dbg(TRACE, "got 'WLC_E_IF_DEL' state\n");
__func__));
netif_stop_queue(ifp->net); netif_stop_queue(ifp->net);
unregister_netdev(ifp->net); unregister_netdev(ifp->net);
ret = BRCMF_DEL_IF; /* Make sure the free_netdev() ret = BRCMF_DEL_IF; /* Make sure the free_netdev()
...@@ -409,7 +403,7 @@ static void brcmf_op_if(struct brcmf_if *ifp) ...@@ -409,7 +403,7 @@ static void brcmf_op_if(struct brcmf_if *ifp)
} }
break; break;
default: default:
BRCMF_ERROR(("%s: bad op %d\n", __func__, ifp->state)); brcmf_dbg(ERROR, "bad op %d\n", ifp->state);
break; break;
} }
...@@ -458,26 +452,21 @@ static int _brcmf_sysioc_thread(void *data) ...@@ -458,26 +452,21 @@ static int _brcmf_sysioc_thread(void *data)
brcmf_op_if(ifentry); brcmf_op_if(ifentry);
#ifdef SOFTAP #ifdef SOFTAP
if (drvr_priv->iflist[i] == NULL) { if (drvr_priv->iflist[i] == NULL) {
BRCMF_TRACE(("\n\n %s: interface %d " brcmf_dbg(TRACE, "interface %d removed!\n",
"removed!\n", __func__, i);
i));
continue; continue;
} }
if (in_ap && drvr_priv->set_macaddress) { if (in_ap && drvr_priv->set_macaddress) {
BRCMF_TRACE(("attempt to set MAC for" brcmf_dbg(TRACE, "attempt to set MAC for %s in AP Mode, blocked.\n",
" %s in AP Mode," ifentry->net->name);
" blocked.\n",
ifentry->net->name));
drvr_priv->set_macaddress = false; drvr_priv->set_macaddress = false;
continue; continue;
} }
if (in_ap && drvr_priv->set_multicast) { if (in_ap && drvr_priv->set_multicast) {
BRCMF_TRACE(("attempt to set MULTICAST " brcmf_dbg(TRACE, "attempt to set MULTICAST list for %s in AP Mode, blocked.\n",
"list for %s in AP Mode, " ifentry->net->name);
"blocked.\n",
ifentry->net->name));
drvr_priv->set_multicast = false; drvr_priv->set_multicast = false;
continue; continue;
} }
...@@ -561,20 +550,19 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *net) ...@@ -561,20 +550,19 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *net)
struct brcmf_info *drvr_priv = *(struct brcmf_info **) netdev_priv(net); struct brcmf_info *drvr_priv = *(struct brcmf_info **) netdev_priv(net);
int ifidx; int ifidx;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Reject if down */ /* Reject if down */
if (!drvr_priv->pub.up || (drvr_priv->pub.busstate == BRCMF_BUS_DOWN)) { if (!drvr_priv->pub.up || (drvr_priv->pub.busstate == BRCMF_BUS_DOWN)) {
BRCMF_ERROR(("%s: xmit rejected pub.up=%d busstate=%d\n", brcmf_dbg(ERROR, "xmit rejected pub.up=%d busstate=%d\n",
__func__, drvr_priv->pub.up, drvr_priv->pub.up, drvr_priv->pub.busstate);
drvr_priv->pub.busstate));
netif_stop_queue(net); netif_stop_queue(net);
return -ENODEV; return -ENODEV;
} }
ifidx = brcmf_net2idx(drvr_priv, net); ifidx = brcmf_net2idx(drvr_priv, net);
if (ifidx == BRCMF_BAD_IF) { if (ifidx == BRCMF_BAD_IF) {
BRCMF_ERROR(("%s: bad ifidx %d\n", __func__, ifidx)); brcmf_dbg(ERROR, "bad ifidx %d\n", ifidx);
netif_stop_queue(net); netif_stop_queue(net);
return -ENODEV; return -ENODEV;
} }
...@@ -583,15 +571,15 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *net) ...@@ -583,15 +571,15 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *net)
if (skb_headroom(skb) < drvr_priv->pub.hdrlen) { if (skb_headroom(skb) < drvr_priv->pub.hdrlen) {
struct sk_buff *skb2; struct sk_buff *skb2;
BRCMF_INFO(("%s: insufficient headroom\n", brcmf_dbg(INFO, "%s: insufficient headroom\n",
brcmf_ifname(&drvr_priv->pub, ifidx))); brcmf_ifname(&drvr_priv->pub, ifidx));
drvr_priv->pub.tx_realloc++; drvr_priv->pub.tx_realloc++;
skb2 = skb_realloc_headroom(skb, drvr_priv->pub.hdrlen); skb2 = skb_realloc_headroom(skb, drvr_priv->pub.hdrlen);
dev_kfree_skb(skb); dev_kfree_skb(skb);
skb = skb2; skb = skb2;
if (skb == NULL) { if (skb == NULL) {
BRCMF_ERROR(("%s: skb_realloc_headroom failed\n", brcmf_dbg(ERROR, "%s: skb_realloc_headroom failed\n",
brcmf_ifname(&drvr_priv->pub, ifidx))); brcmf_ifname(&drvr_priv->pub, ifidx));
ret = -ENOMEM; ret = -ENOMEM;
goto done; goto done;
} }
...@@ -614,7 +602,7 @@ void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state) ...@@ -614,7 +602,7 @@ void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)
struct net_device *net; struct net_device *net;
struct brcmf_info *drvr_priv = drvr->info; struct brcmf_info *drvr_priv = drvr->info;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
drvr->txoff = state; drvr->txoff = state;
net = drvr_priv->iflist[ifidx]->net; net = drvr_priv->iflist[ifidx]->net;
...@@ -636,7 +624,7 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb, ...@@ -636,7 +624,7 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,
struct brcmf_if *ifp; struct brcmf_if *ifp;
struct brcmf_event_msg event; struct brcmf_event_msg event;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
save_pktbuf = skb; save_pktbuf = skb;
...@@ -728,7 +716,7 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *net) ...@@ -728,7 +716,7 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *net)
struct brcmf_if *ifp; struct brcmf_if *ifp;
int ifidx; int ifidx;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
ifidx = brcmf_net2idx(drvr_priv, net); ifidx = brcmf_net2idx(drvr_priv, net);
if (ifidx == BRCMF_BAD_IF) if (ifidx == BRCMF_BAD_IF)
...@@ -774,13 +762,13 @@ static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol) ...@@ -774,13 +762,13 @@ static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol)
if (ret < 0) { if (ret < 0) {
/* Check for older dongle image that doesn't support toe_ol */ /* Check for older dongle image that doesn't support toe_ol */
if (ret == -EIO) { if (ret == -EIO) {
BRCMF_ERROR(("%s: toe not supported by device\n", brcmf_dbg(ERROR, "%s: toe not supported by device\n",
brcmf_ifname(&drvr_priv->pub, ifidx))); brcmf_ifname(&drvr_priv->pub, ifidx));
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
BRCMF_INFO(("%s: could not get toe_ol: ret=%d\n", brcmf_dbg(INFO, "%s: could not get toe_ol: ret=%d\n",
brcmf_ifname(&drvr_priv->pub, ifidx), ret)); brcmf_ifname(&drvr_priv->pub, ifidx), ret);
return ret; return ret;
} }
...@@ -810,8 +798,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol) ...@@ -810,8 +798,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("%s: could not set toe_ol: ret=%d\n", brcmf_dbg(ERROR, "%s: could not set toe_ol: ret=%d\n",
brcmf_ifname(&drvr_priv->pub, ifidx), ret)); brcmf_ifname(&drvr_priv->pub, ifidx), ret);
return ret; return ret;
} }
...@@ -824,8 +812,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol) ...@@ -824,8 +812,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol)
ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len); ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);
if (ret < 0) { if (ret < 0) {
BRCMF_ERROR(("%s: could not set toe: ret=%d\n", brcmf_dbg(ERROR, "%s: could not set toe: ret=%d\n",
brcmf_ifname(&drvr_priv->pub, ifidx), ret)); brcmf_ifname(&drvr_priv->pub, ifidx), ret);
return ret; return ret;
} }
...@@ -857,7 +845,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr) ...@@ -857,7 +845,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr)
u32 toe_cmpnt, csum_dir; u32 toe_cmpnt, csum_dir;
int ret; int ret;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* all ethtool calls start with a cmd word */ /* all ethtool calls start with a cmd word */
if (copy_from_user(&cmd, uaddr, sizeof(u32))) if (copy_from_user(&cmd, uaddr, sizeof(u32)))
...@@ -883,7 +871,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr) ...@@ -883,7 +871,7 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr)
/* otherwise, require dongle to be up */ /* otherwise, require dongle to be up */
else if (!drvr_priv->pub.up) { else if (!drvr_priv->pub.up) {
BRCMF_ERROR(("%s: dongle is not up\n", __func__)); brcmf_dbg(ERROR, "dongle is not up\n");
return -ENODEV; return -ENODEV;
} }
...@@ -896,8 +884,8 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr) ...@@ -896,8 +884,8 @@ static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr)
sprintf(info.version, "%lu", drvr_priv->pub.drv_version); sprintf(info.version, "%lu", drvr_priv->pub.drv_version);
if (copy_to_user(uaddr, &info, sizeof(info))) if (copy_to_user(uaddr, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
BRCMF_CTL(("%s: given %*s, returning %s\n", __func__, brcmf_dbg(CTL, "given %*s, returning %s\n",
(int)sizeof(drvname), drvname, info.driver)); (int)sizeof(drvname), drvname, info.driver);
break; break;
/* Get toe offload components from dongle */ /* Get toe offload components from dongle */
...@@ -972,7 +960,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr, ...@@ -972,7 +960,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr,
bool is_set_key_cmd; bool is_set_key_cmd;
ifidx = brcmf_net2idx(drvr_priv, net); ifidx = brcmf_net2idx(drvr_priv, net);
BRCMF_TRACE(("%s: ifidx %d, cmd 0x%04x\n", __func__, ifidx, cmd)); brcmf_dbg(TRACE, "ifidx %d, cmd 0x%04x\n", ifidx, cmd);
if (ifidx == BRCMF_BAD_IF) if (ifidx == BRCMF_BAD_IF)
return -1; return -1;
...@@ -1036,7 +1024,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr, ...@@ -1036,7 +1024,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr,
/* send to dongle (must be up, and wl) */ /* send to dongle (must be up, and wl) */
if ((drvr_priv->pub.busstate != BRCMF_BUS_DATA)) { if ((drvr_priv->pub.busstate != BRCMF_BUS_DATA)) {
BRCMF_ERROR(("%s DONGLE_DOWN,__func__\n", __func__)); brcmf_dbg(ERROR, "DONGLE_DOWN\n");
bcmerror = -EIO; bcmerror = -EIO;
goto done; goto done;
} }
...@@ -1080,7 +1068,7 @@ static int brcmf_netdev_stop(struct net_device *net) ...@@ -1080,7 +1068,7 @@ static int brcmf_netdev_stop(struct net_device *net)
#if !defined(IGNORE_ETH0_DOWN) #if !defined(IGNORE_ETH0_DOWN)
struct brcmf_info *drvr_priv = *(struct brcmf_info **) netdev_priv(net); struct brcmf_info *drvr_priv = *(struct brcmf_info **) netdev_priv(net);
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
brcmf_cfg80211_down(); brcmf_cfg80211_down();
if (drvr_priv->pub.up == 0) if (drvr_priv->pub.up == 0)
return 0; return 0;
...@@ -1089,8 +1077,7 @@ static int brcmf_netdev_stop(struct net_device *net) ...@@ -1089,8 +1077,7 @@ static int brcmf_netdev_stop(struct net_device *net)
drvr_priv->pub.up = 0; drvr_priv->pub.up = 0;
netif_stop_queue(net); netif_stop_queue(net);
#else #else
BRCMF_ERROR(("BYPASS %s:due to BRCM compilation: under investigation\n", brcmf_dbg(ERROR, "BYPASSed due to BRCM compilation: under investigation\n");
__func__));
#endif /* !defined(IGNORE_ETH0_DOWN) */ #endif /* !defined(IGNORE_ETH0_DOWN) */
return 0; return 0;
...@@ -1103,15 +1090,14 @@ static int brcmf_netdev_open(struct net_device *net) ...@@ -1103,15 +1090,14 @@ static int brcmf_netdev_open(struct net_device *net)
int ifidx = brcmf_net2idx(drvr_priv, net); int ifidx = brcmf_net2idx(drvr_priv, net);
s32 ret = 0; s32 ret = 0;
BRCMF_TRACE(("%s: ifidx %d\n", __func__, ifidx)); brcmf_dbg(TRACE, "ifidx %d\n", ifidx);
if (ifidx == 0) { /* do it only for primary eth0 */ if (ifidx == 0) { /* do it only for primary eth0 */
/* try to bring up bus */ /* try to bring up bus */
ret = brcmf_bus_start(&drvr_priv->pub); ret = brcmf_bus_start(&drvr_priv->pub);
if (ret != 0) { if (ret != 0) {
BRCMF_ERROR(("%s: failed with code %d\n", brcmf_dbg(ERROR, "failed with code %d\n", ret);
__func__, ret));
return -1; return -1;
} }
atomic_set(&drvr_priv->pend_8021x_cnt, 0); atomic_set(&drvr_priv->pend_8021x_cnt, 0);
...@@ -1131,8 +1117,7 @@ static int brcmf_netdev_open(struct net_device *net) ...@@ -1131,8 +1117,7 @@ static int brcmf_netdev_open(struct net_device *net)
netif_start_queue(net); netif_start_queue(net);
drvr_priv->pub.up = 1; drvr_priv->pub.up = 1;
if (unlikely(brcmf_cfg80211_up())) { if (unlikely(brcmf_cfg80211_up())) {
BRCMF_ERROR(("%s: failed to bring up cfg80211\n", brcmf_dbg(ERROR, "failed to bring up cfg80211\n");
__func__));
return -1; return -1;
} }
...@@ -1145,13 +1130,13 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *net, ...@@ -1145,13 +1130,13 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *net,
{ {
struct brcmf_if *ifp; struct brcmf_if *ifp;
BRCMF_TRACE(("%s: idx %d, handle->%p\n", __func__, ifidx, net)); brcmf_dbg(TRACE, "idx %d, handle->%p\n", ifidx, net);
ifp = drvr_priv->iflist[ifidx]; ifp = drvr_priv->iflist[ifidx];
if (!ifp) { if (!ifp) {
ifp = kmalloc(sizeof(struct brcmf_if), GFP_ATOMIC); ifp = kmalloc(sizeof(struct brcmf_if), GFP_ATOMIC);
if (!ifp) { if (!ifp) {
BRCMF_ERROR(("%s: OOM - struct brcmf_if\n", __func__)); brcmf_dbg(ERROR, "OOM - struct brcmf_if\n");
return -ENOMEM; return -ENOMEM;
} }
} }
...@@ -1177,11 +1162,11 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx) ...@@ -1177,11 +1162,11 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx)
{ {
struct brcmf_if *ifp; struct brcmf_if *ifp;
BRCMF_TRACE(("%s: idx %d\n", __func__, ifidx)); brcmf_dbg(TRACE, "idx %d\n", ifidx);
ifp = drvr_priv->iflist[ifidx]; ifp = drvr_priv->iflist[ifidx];
if (!ifp) { if (!ifp) {
BRCMF_ERROR(("%s: Null interface\n", __func__)); brcmf_dbg(ERROR, "Null interface\n");
return; return;
} }
...@@ -1195,19 +1180,19 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) ...@@ -1195,19 +1180,19 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
struct brcmf_info *drvr_priv = NULL; struct brcmf_info *drvr_priv = NULL;
struct net_device *net; struct net_device *net;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Allocate etherdev, including space for private structure */ /* Allocate etherdev, including space for private structure */
net = alloc_etherdev(sizeof(drvr_priv)); net = alloc_etherdev(sizeof(drvr_priv));
if (!net) { if (!net) {
BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__)); brcmf_dbg(ERROR, "OOM - alloc_etherdev\n");
goto fail; goto fail;
} }
/* Allocate primary brcmf_info */ /* Allocate primary brcmf_info */
drvr_priv = kzalloc(sizeof(struct brcmf_info), GFP_ATOMIC); drvr_priv = kzalloc(sizeof(struct brcmf_info), GFP_ATOMIC);
if (!drvr_priv) { if (!drvr_priv) {
BRCMF_ERROR(("%s: OOM - alloc brcmf_info\n", __func__)); brcmf_dbg(ERROR, "OOM - alloc brcmf_info\n");
goto fail; goto fail;
} }
...@@ -1244,13 +1229,13 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) ...@@ -1244,13 +1229,13 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
/* Attach and link in the protocol */ /* Attach and link in the protocol */
if (brcmf_proto_attach(&drvr_priv->pub) != 0) { if (brcmf_proto_attach(&drvr_priv->pub) != 0) {
BRCMF_ERROR(("brcmf_prot_attach failed\n")); brcmf_dbg(ERROR, "brcmf_prot_attach failed\n");
goto fail; goto fail;
} }
/* Attach and link in the cfg80211 */ /* Attach and link in the cfg80211 */
if (unlikely(brcmf_cfg80211_attach(net, &drvr_priv->pub))) { if (unlikely(brcmf_cfg80211_attach(net, &drvr_priv->pub))) {
BRCMF_ERROR(("wl_cfg80211_attach failed\n")); brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
goto fail; goto fail;
} }
...@@ -1289,19 +1274,18 @@ int brcmf_bus_start(struct brcmf_pub *drvr) ...@@ -1289,19 +1274,18 @@ int brcmf_bus_start(struct brcmf_pub *drvr)
/* Room for "event_msgs" + '\0' + bitvec */ /* Room for "event_msgs" + '\0' + bitvec */
char iovbuf[BRCMF_EVENTING_MASK_LEN + 12]; char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];
BRCMF_TRACE(("%s:\n", __func__)); brcmf_dbg(TRACE, "\n");
/* Bring up the bus */ /* Bring up the bus */
ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub, true); ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub, true);
if (ret != 0) { if (ret != 0) {
BRCMF_ERROR(("%s, brcmf_sdbrcm_bus_init failed %d\n", __func__, brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);
ret));
return ret; return ret;
} }
/* If bus is not ready, can't come up */ /* If bus is not ready, can't come up */
if (drvr_priv->pub.busstate != BRCMF_BUS_DATA) { if (drvr_priv->pub.busstate != BRCMF_BUS_DATA) {
BRCMF_ERROR(("%s failed bus is not ready\n", __func__)); brcmf_dbg(ERROR, "failed bus is not ready\n");
return -ENODEV; return -ENODEV;
} }
...@@ -1361,7 +1345,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx) ...@@ -1361,7 +1345,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)
u8 temp_addr[ETH_ALEN] = { u8 temp_addr[ETH_ALEN] = {
0x00, 0x90, 0x4c, 0x11, 0x22, 0x33}; 0x00, 0x90, 0x4c, 0x11, 0x22, 0x33};
BRCMF_TRACE(("%s: ifidx %d\n", __func__, ifidx)); brcmf_dbg(TRACE, "ifidx %d\n", ifidx);
net = drvr_priv->iflist[ifidx]->net; net = drvr_priv->iflist[ifidx]->net;
net->netdev_ops = &brcmf_netdev_ops_pri; net->netdev_ops = &brcmf_netdev_ops_pri;
...@@ -1376,7 +1360,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx) ...@@ -1376,7 +1360,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)
} }
if (ifidx == 1) { if (ifidx == 1) {
BRCMF_TRACE(("%s ACCESS POINT MAC:\n", __func__)); brcmf_dbg(TRACE, "ACCESS POINT MAC:\n");
/* ACCESSPOINT INTERFACE CASE */ /* ACCESSPOINT INTERFACE CASE */
temp_addr[0] |= 0X02; /* set bit 2 , temp_addr[0] |= 0X02; /* set bit 2 ,
- Locally Administered address */ - Locally Administered address */
...@@ -1391,12 +1375,11 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx) ...@@ -1391,12 +1375,11 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)
memcpy(net->dev_addr, temp_addr, ETH_ALEN); memcpy(net->dev_addr, temp_addr, ETH_ALEN);
if (register_netdev(net) != 0) { if (register_netdev(net) != 0) {
BRCMF_ERROR(("%s: couldn't register the net device\n", brcmf_dbg(ERROR, "couldn't register the net device\n");
__func__));
goto fail; goto fail;
} }
BRCMF_INFO(("%s: Broadcom Dongle Host Driver\n", net->name)); brcmf_dbg(INFO, "%s: Broadcom Dongle Host Driver\n", net->name);
return 0; return 0;
...@@ -1409,7 +1392,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr) ...@@ -1409,7 +1392,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
{ {
struct brcmf_info *drvr_priv; struct brcmf_info *drvr_priv;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (drvr) { if (drvr) {
drvr_priv = drvr->info; drvr_priv = drvr->info;
...@@ -1427,7 +1410,7 @@ void brcmf_detach(struct brcmf_pub *drvr) ...@@ -1427,7 +1410,7 @@ void brcmf_detach(struct brcmf_pub *drvr)
{ {
struct brcmf_info *drvr_priv; struct brcmf_info *drvr_priv;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (drvr) { if (drvr) {
drvr_priv = drvr->info; drvr_priv = drvr->info;
...@@ -1467,7 +1450,7 @@ void brcmf_detach(struct brcmf_pub *drvr) ...@@ -1467,7 +1450,7 @@ void brcmf_detach(struct brcmf_pub *drvr)
static void __exit brcmf_module_cleanup(void) static void __exit brcmf_module_cleanup(void)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
brcmf_bus_unregister(); brcmf_bus_unregister();
} }
...@@ -1476,12 +1459,12 @@ static int __init brcmf_module_init(void) ...@@ -1476,12 +1459,12 @@ static int __init brcmf_module_init(void)
{ {
int error; int error;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
error = brcmf_bus_register(); error = brcmf_bus_register();
if (error) { if (error) {
BRCMF_ERROR(("%s: brcmf_bus_register failed\n", __func__)); brcmf_dbg(ERROR, "brcmf_bus_register failed\n");
goto failed; goto failed;
} }
return 0; return 0;
...@@ -1583,7 +1566,7 @@ int brcmf_write_to_file(struct brcmf_pub *drvr, u8 *buf, int size) ...@@ -1583,7 +1566,7 @@ int brcmf_write_to_file(struct brcmf_pub *drvr, u8 *buf, int size)
/* open file to write */ /* open file to write */
fp = filp_open("/tmp/mem_dump", O_WRONLY | O_CREAT, 0640); fp = filp_open("/tmp/mem_dump", O_WRONLY | O_CREAT, 0640);
if (!fp) { if (!fp) {
BRCMF_ERROR(("%s: open file error\n", __func__)); brcmf_dbg(ERROR, "open file error\n");
ret = -1; ret = -1;
goto exit; goto exit;
} }
......
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file @ 75bf74b9
...@@ -859,7 +859,7 @@ r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar) ...@@ -859,7 +859,7 @@ r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
if (*retryvar) { if (*retryvar) {
bus->regfails += (*retryvar-1); bus->regfails += (*retryvar-1);
if (*retryvar > retry_limit) { if (*retryvar > retry_limit) {
BRCMF_ERROR(("FAILED READ %Xh\n", reg_offset)); brcmf_dbg(ERROR, "FAILED READ %Xh\n", reg_offset);
*regvar = 0; *regvar = 0;
} }
} }
...@@ -878,8 +878,8 @@ w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar) ...@@ -878,8 +878,8 @@ w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)
if (*retryvar) { if (*retryvar) {
bus->regfails += (*retryvar-1); bus->regfails += (*retryvar-1);
if (*retryvar > retry_limit) if (*retryvar > retry_limit)
BRCMF_ERROR(("FAILED REGISTER WRITE" brcmf_dbg(ERROR, "FAILED REGISTER WRITE %Xh\n",
" %Xh\n", reg_offset)); reg_offset);
} }
} }
...@@ -954,8 +954,8 @@ static void brcmf_sdbrcm_setmemsize(struct brcmf_bus *bus, int mem_size) ...@@ -954,8 +954,8 @@ static void brcmf_sdbrcm_setmemsize(struct brcmf_bus *bus, int mem_size)
{ {
s32 min_size = DONGLE_MIN_MEMSIZE; s32 min_size = DONGLE_MIN_MEMSIZE;
/* Restrict the memsize to user specified limit */ /* Restrict the memsize to user specified limit */
BRCMF_ERROR(("user: Restrict the dongle ram size to %d, min %d\n", brcmf_dbg(ERROR, "user: Restrict the dongle ram size to %d, min %d\n",
brcmf_dongle_memsize, min_size)); brcmf_dongle_memsize, min_size);
if ((brcmf_dongle_memsize > min_size) && if ((brcmf_dongle_memsize > min_size) &&
(brcmf_dongle_memsize < (s32) bus->orig_ramsize)) (brcmf_dongle_memsize < (s32) bus->orig_ramsize))
bus->ramsize = brcmf_dongle_memsize; bus->ramsize = brcmf_dongle_memsize;
...@@ -986,7 +986,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -986,7 +986,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
u8 clkctl, clkreq, devctl; u8 clkctl, clkreq, devctl;
unsigned long timeout; unsigned long timeout;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
clkctl = 0; clkctl = 0;
...@@ -1002,8 +1002,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1002,8 +1002,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err); SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: HT Avail request error: %d\n", brcmf_dbg(ERROR, "HT Avail request error: %d\n", err);
__func__, err));
return -EBADE; return -EBADE;
} }
...@@ -1019,8 +1018,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1019,8 +1018,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_FUNC1_CHIPCLKCSR, &err); SBSDIO_FUNC1_CHIPCLKCSR, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: HT Avail read error: %d\n", brcmf_dbg(ERROR, "HT Avail read error: %d\n", err);
__func__, err));
return -EBADE; return -EBADE;
} }
...@@ -1031,15 +1029,15 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1031,15 +1029,15 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
SDIO_FUNC_1, SDIO_FUNC_1,
SBSDIO_DEVICE_CTL, &err); SBSDIO_DEVICE_CTL, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: Devctl error setting CA:" brcmf_dbg(ERROR, "Devctl error setting CA: %d\n",
" %d\n", __func__, err)); err);
return -EBADE; return -EBADE;
} }
devctl |= SBSDIO_DEVCTL_CA_INT_ONLY; devctl |= SBSDIO_DEVCTL_CA_INT_ONLY;
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_DEVICE_CTL, devctl, &err); SBSDIO_DEVICE_CTL, devctl, &err);
BRCMF_INFO(("CLKCTL: set PENDING\n")); brcmf_dbg(INFO, "CLKCTL: set PENDING\n");
bus->clkstate = CLK_PENDING; bus->clkstate = CLK_PENDING;
return 0; return 0;
...@@ -1067,26 +1065,23 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1067,26 +1065,23 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
usleep_range(5000, 10000); usleep_range(5000, 10000);
} }
if (err) { if (err) {
BRCMF_ERROR(("%s: HT Avail request error: %d\n", brcmf_dbg(ERROR, "HT Avail request error: %d\n", err);
__func__, err));
return -EBADE; return -EBADE;
} }
if (!SBSDIO_CLKAV(clkctl, bus->alp_only)) { if (!SBSDIO_CLKAV(clkctl, bus->alp_only)) {
BRCMF_ERROR(("%s: HT Avail timeout (%d): " brcmf_dbg(ERROR, "HT Avail timeout (%d): clkctl 0x%02x\n",
"clkctl 0x%02x\n", __func__, PMU_MAX_TRANSITION_DLY, clkctl);
PMU_MAX_TRANSITION_DLY, clkctl));
return -EBADE; return -EBADE;
} }
/* Mark clock available */ /* Mark clock available */
bus->clkstate = CLK_AVAIL; bus->clkstate = CLK_AVAIL;
BRCMF_INFO(("CLKCTL: turned ON\n")); brcmf_dbg(INFO, "CLKCTL: turned ON\n");
#if defined(BCMDBG) #if defined(BCMDBG)
if (bus->alp_only != true) { if (bus->alp_only != true) {
if (SBSDIO_ALPONLY(clkctl)) if (SBSDIO_ALPONLY(clkctl))
BRCMF_ERROR(("%s: HT Clock should be on.\n", brcmf_dbg(ERROR, "HT Clock should be on\n");
__func__));
} }
#endif /* defined (BCMDBG) */ #endif /* defined (BCMDBG) */
...@@ -1107,10 +1102,10 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1107,10 +1102,10 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
bus->clkstate = CLK_SDONLY; bus->clkstate = CLK_SDONLY;
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err); SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
BRCMF_INFO(("CLKCTL: turned OFF\n")); brcmf_dbg(INFO, "CLKCTL: turned OFF\n");
if (err) { if (err) {
BRCMF_ERROR(("%s: Failed access turning clock off:" brcmf_dbg(ERROR, "Failed access turning clock off: %d\n",
" %d\n", __func__, err)); err);
return -EBADE; return -EBADE;
} }
} }
...@@ -1120,7 +1115,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) ...@@ -1120,7 +1115,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
/* Change idle/active SD state */ /* Change idle/active SD state */
static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on) static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (on) if (on)
bus->clkstate = CLK_SDONLY; bus->clkstate = CLK_SDONLY;
...@@ -1137,7 +1132,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok) ...@@ -1137,7 +1132,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
uint oldstate = bus->clkstate; uint oldstate = bus->clkstate;
#endif /* BCMDBG */ #endif /* BCMDBG */
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Early exit if we're already there */ /* Early exit if we're already there */
if (bus->clkstate == target) { if (bus->clkstate == target) {
...@@ -1166,8 +1161,8 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok) ...@@ -1166,8 +1161,8 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
else if (bus->clkstate == CLK_AVAIL) else if (bus->clkstate == CLK_AVAIL)
brcmf_sdbrcm_htclk(bus, false, false); brcmf_sdbrcm_htclk(bus, false, false);
else else
BRCMF_ERROR(("brcmf_sdbrcm_clkctl: request for %d -> %d" brcmf_dbg(ERROR, "request for %d -> %d\n",
"\n", bus->clkstate, target)); bus->clkstate, target);
brcmf_sdbrcm_wd_timer(bus, brcmf_watchdog_ms); brcmf_sdbrcm_wd_timer(bus, brcmf_watchdog_ms);
break; break;
...@@ -1181,8 +1176,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok) ...@@ -1181,8 +1176,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
break; break;
} }
#ifdef BCMDBG #ifdef BCMDBG
BRCMF_INFO(("brcmf_sdbrcm_clkctl: %d -> %d\n", brcmf_dbg(INFO, "%d -> %d\n", oldstate, bus->clkstate);
oldstate, bus->clkstate));
#endif /* BCMDBG */ #endif /* BCMDBG */
return 0; return 0;
...@@ -1192,9 +1186,9 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep) ...@@ -1192,9 +1186,9 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
{ {
uint retries = 0; uint retries = 0;
BRCMF_INFO(("brcmf_sdbrcm_bussleep: request %s (currently %s)\n", brcmf_dbg(INFO, "request %s (currently %s)\n",
(sleep ? "SLEEP" : "WAKE"), sleep ? "SLEEP" : "WAKE",
(bus->sleeping ? "SLEEP" : "WAKE"))); bus->sleeping ? "SLEEP" : "WAKE");
/* Done if we're already in the requested state */ /* Done if we're already in the requested state */
if (sleep == bus->sleeping) if (sleep == bus->sleeping)
...@@ -1213,8 +1207,7 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep) ...@@ -1213,8 +1207,7 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
w_sdreg32(bus, SMB_USE_OOB, w_sdreg32(bus, SMB_USE_OOB,
offsetof(struct sdpcmd_regs, tosbmailbox), &retries); offsetof(struct sdpcmd_regs, tosbmailbox), &retries);
if (retries > retry_limit) if (retries > retry_limit)
BRCMF_ERROR(("CANNOT SIGNAL CHIP, " brcmf_dbg(ERROR, "CANNOT SIGNAL CHIP, WILL NOT WAKE UP!!\n");
"WILL NOT WAKE UP!!\n"));
/* Turn off our contribution to the HT clock request */ /* Turn off our contribution to the HT clock request */
brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false); brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);
...@@ -1258,7 +1251,7 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep) ...@@ -1258,7 +1251,7 @@ int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
&retries); &retries);
if (retries > retry_limit) if (retries > retry_limit)
BRCMF_ERROR(("CANNOT SIGNAL CHIP TO CLEAR OOB!!\n")); brcmf_dbg(ERROR, "CANNOT SIGNAL CHIP TO CLEAR OOB!!\n");
/* Make sure we have SD bus access */ /* Make sure we have SD bus access */
brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false); brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);
...@@ -1289,7 +1282,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt, ...@@ -1289,7 +1282,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
struct sk_buff *new; struct sk_buff *new;
int i; int i;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr->dongle_reset) { if (bus->drvr->dongle_reset) {
ret = -EPERM; ret = -EPERM;
...@@ -1302,14 +1295,13 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt, ...@@ -1302,14 +1295,13 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
pad = ((unsigned long)frame % BRCMF_SDALIGN); pad = ((unsigned long)frame % BRCMF_SDALIGN);
if (pad) { if (pad) {
if (skb_headroom(pkt) < pad) { if (skb_headroom(pkt) < pad) {
BRCMF_INFO(("%s: insufficient headroom %d for %d pad\n", brcmf_dbg(INFO, "insufficient headroom %d for %d pad\n",
__func__, skb_headroom(pkt), pad)); skb_headroom(pkt), pad);
bus->drvr->tx_realloc++; bus->drvr->tx_realloc++;
new = brcmu_pkt_buf_get_skb(pkt->len + BRCMF_SDALIGN); new = brcmu_pkt_buf_get_skb(pkt->len + BRCMF_SDALIGN);
if (!new) { if (!new) {
BRCMF_ERROR(("%s: couldn't allocate new " brcmf_dbg(ERROR, "couldn't allocate new %d-byte packet\n",
"%d-byte packet\n", __func__, pkt->len + BRCMF_SDALIGN);
pkt->len + BRCMF_SDALIGN));
ret = -ENOMEM; ret = -ENOMEM;
goto done; goto done;
} }
...@@ -1383,8 +1375,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt, ...@@ -1383,8 +1375,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
if (ret < 0) { if (ret < 0) {
/* On failure, abort the command /* On failure, abort the command
and terminate the frame */ and terminate the frame */
BRCMF_INFO(("%s: sdio error %d, abort command and " brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
"terminate frame.\n", __func__, ret)); ret);
bus->tx_sderrs++; bus->tx_sderrs++;
brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2); brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
...@@ -1432,7 +1424,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt) ...@@ -1432,7 +1424,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
int ret = -EBADE; int ret = -EBADE;
uint datalen, prec; uint datalen, prec;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
datalen = pkt->len; datalen = pkt->len;
...@@ -1448,8 +1440,8 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt) ...@@ -1448,8 +1440,8 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
|| bus->dpc_sched || (!DATAOK(bus)) || bus->dpc_sched || (!DATAOK(bus))
|| (bus->flowcontrol & NBITVAL(prec)) || (bus->flowcontrol & NBITVAL(prec))
|| (bus->clkstate != CLK_AVAIL)) { || (bus->clkstate != CLK_AVAIL)) {
BRCMF_TRACE(("%s: deferring pktq len %d\n", __func__, brcmf_dbg(TRACE, "deferring pktq len %d\n",
pktq_len(&bus->txq))); pktq_len(&bus->txq));
bus->fcqueued++; bus->fcqueued++;
/* Priority based enq */ /* Priority based enq */
...@@ -1459,7 +1451,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt) ...@@ -1459,7 +1451,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
skb_pull(pkt, SDPCM_HDRLEN); skb_pull(pkt, SDPCM_HDRLEN);
brcmf_txcomplete(bus->drvr, pkt, false); brcmf_txcomplete(bus->drvr, pkt, false);
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
BRCMF_ERROR(("%s: out of bus->txq !!!\n", __func__)); brcmf_dbg(ERROR, "out of bus->txq !!!\n");
ret = -ENOSR; ret = -ENOSR;
} else { } else {
ret = 0; ret = 0;
...@@ -1487,7 +1479,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt) ...@@ -1487,7 +1479,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
/* Make sure back plane ht clk is on, no pending allowed */ /* Make sure back plane ht clk is on, no pending allowed */
brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, true); brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, true);
BRCMF_TRACE(("%s: calling txpkt\n", __func__)); brcmf_dbg(TRACE, "calling txpkt\n");
ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true); ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
if (ret) if (ret)
bus->drvr->tx_errors++; bus->drvr->tx_errors++;
...@@ -1518,7 +1510,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes) ...@@ -1518,7 +1510,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
struct brcmf_pub *drvr = bus->drvr; struct brcmf_pub *drvr = bus->drvr;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
tx_prec_map = ~bus->flowcontrol; tx_prec_map = ~bus->flowcontrol;
...@@ -1572,7 +1564,7 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1572,7 +1564,7 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
int ret = -1; int ret = -1;
int i; int i;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr->dongle_reset) if (bus->drvr->dongle_reset)
return -EIO; return -EIO;
...@@ -1631,9 +1623,8 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1631,9 +1623,8 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
put_unaligned_le32(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader)); put_unaligned_le32(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
if (!DATAOK(bus)) { if (!DATAOK(bus)) {
BRCMF_INFO(("%s: No bus credit bus->tx_max %d," brcmf_dbg(INFO, "No bus credit bus->tx_max %d, bus->tx_seq %d\n",
" bus->tx_seq %d\n", __func__, bus->tx_max, bus->tx_seq);
bus->tx_max, bus->tx_seq));
bus->ctrl_frame_stat = true; bus->ctrl_frame_stat = true;
/* Send from dpc */ /* Send from dpc */
bus->ctrl_frame_buf = frame; bus->ctrl_frame_buf = frame;
...@@ -1642,11 +1633,10 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1642,11 +1633,10 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat); brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat);
if (bus->ctrl_frame_stat == false) { if (bus->ctrl_frame_stat == false) {
BRCMF_INFO(("%s: ctrl_frame_stat == false\n", brcmf_dbg(INFO, "ctrl_frame_stat == false\n");
__func__));
ret = 0; ret = 0;
} else { } else {
BRCMF_INFO(("%s: ctrl_frame_stat == true\n", __func__)); brcmf_dbg(INFO, "ctrl_frame_stat == true\n");
ret = -1; ret = -1;
} }
} }
...@@ -1674,9 +1664,8 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1674,9 +1664,8 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
if (ret < 0) { if (ret < 0) {
/* On failure, abort the command and /* On failure, abort the command and
terminate the frame */ terminate the frame */
BRCMF_INFO(("%s: sdio error %d, abort command " brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
"and terminate frame.\n", ret);
__func__, ret));
bus->tx_sderrs++; bus->tx_sderrs++;
brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2); brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
...@@ -1732,7 +1721,7 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1732,7 +1721,7 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
uint rxlen = 0; uint rxlen = 0;
bool pending; bool pending;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr->dongle_reset) if (bus->drvr->dongle_reset)
return -EIO; return -EIO;
...@@ -1747,20 +1736,20 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) ...@@ -1747,20 +1736,20 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
brcmf_sdbrcm_sdunlock(bus); brcmf_sdbrcm_sdunlock(bus);
if (rxlen) { if (rxlen) {
BRCMF_CTL(("%s: resumed on rxctl frame, got %d expected %d\n", brcmf_dbg(CTL, "resumed on rxctl frame, got %d expected %d\n",
__func__, rxlen, msglen)); rxlen, msglen);
} else if (timeleft == 0) { } else if (timeleft == 0) {
BRCMF_ERROR(("%s: resumed on timeout\n", __func__)); brcmf_dbg(ERROR, "resumed on timeout\n");
#ifdef BCMDBG #ifdef BCMDBG
brcmf_sdbrcm_sdlock(bus); brcmf_sdbrcm_sdlock(bus);
brcmf_sdbrcm_checkdied(bus, NULL, 0); brcmf_sdbrcm_checkdied(bus, NULL, 0);
brcmf_sdbrcm_sdunlock(bus); brcmf_sdbrcm_sdunlock(bus);
#endif /* BCMDBG */ #endif /* BCMDBG */
} else if (pending == true) { } else if (pending == true) {
BRCMF_CTL(("%s: cancelled\n", __func__)); brcmf_dbg(CTL, "cancelled\n");
return -ERESTARTSYS; return -ERESTARTSYS;
} else { } else {
BRCMF_CTL(("%s: resumed for unknown reason?\n", __func__)); brcmf_dbg(CTL, "resumed for unknown reason?\n");
#ifdef BCMDBG #ifdef BCMDBG
brcmf_sdbrcm_sdlock(bus); brcmf_sdbrcm_sdlock(bus);
brcmf_sdbrcm_checkdied(bus, NULL, 0); brcmf_sdbrcm_checkdied(bus, NULL, 0);
...@@ -1984,20 +1973,19 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data, ...@@ -1984,20 +1973,19 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
/* Set the backplane window to include the start address */ /* Set the backplane window to include the start address */
bcmerror = brcmf_sdbrcm_set_siaddr_window(bus, address); bcmerror = brcmf_sdbrcm_set_siaddr_window(bus, address);
if (bcmerror) { if (bcmerror) {
BRCMF_ERROR(("%s: window change failed\n", __func__)); brcmf_dbg(ERROR, "window change failed\n");
goto xfer_done; goto xfer_done;
} }
/* Do the transfer(s) */ /* Do the transfer(s) */
while (size) { while (size) {
BRCMF_INFO(("%s: %s %d bytes at offset 0x%08x in window" brcmf_dbg(INFO, "%s %d bytes at offset 0x%08x in window 0x%08x\n",
" 0x%08x\n", __func__, (write ? "write" : "read"), write ? "write" : "read", dsize,
dsize, sdaddr, (address & SBSDIO_SBWINDOW_MASK))); sdaddr, address & SBSDIO_SBWINDOW_MASK);
bcmerror = brcmf_sdcard_rwdata(bus->sdiodev, write, bcmerror = brcmf_sdcard_rwdata(bus->sdiodev, write,
sdaddr, data, dsize); sdaddr, data, dsize);
if (bcmerror) { if (bcmerror) {
BRCMF_ERROR(("%s: membytes transfer failed\n", brcmf_dbg(ERROR, "membytes transfer failed\n");
__func__));
break; break;
} }
...@@ -2008,8 +1996,7 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data, ...@@ -2008,8 +1996,7 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
address += dsize; address += dsize;
bcmerror = brcmf_sdbrcm_set_siaddr_window(bus, address); bcmerror = brcmf_sdbrcm_set_siaddr_window(bus, address);
if (bcmerror) { if (bcmerror) {
BRCMF_ERROR(("%s: window change failed\n", brcmf_dbg(ERROR, "window change failed\n");
__func__));
break; break;
} }
sdaddr = 0; sdaddr = 0;
...@@ -2022,8 +2009,8 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data, ...@@ -2022,8 +2009,8 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
if (brcmf_sdbrcm_set_siaddr_window(bus, if (brcmf_sdbrcm_set_siaddr_window(bus,
brcmf_sdcard_cur_sbwad( brcmf_sdcard_cur_sbwad(
bus->sdiodev))) bus->sdiodev)))
BRCMF_ERROR(("%s: FAILED to set window back to 0x%x\n", brcmf_dbg(ERROR, "FAILED to set window back to 0x%x\n",
__func__, brcmf_sdcard_cur_sbwad(bus->sdiodev))); brcmf_sdcard_cur_sbwad(bus->sdiodev));
return bcmerror; return bcmerror;
} }
...@@ -2044,15 +2031,15 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh) ...@@ -2044,15 +2031,15 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh)
addr = le32_to_cpu(addr); addr = le32_to_cpu(addr);
BRCMF_INFO(("sdpcm_shared address 0x%08X\n", addr)); brcmf_dbg(INFO, "sdpcm_shared address 0x%08X\n", addr);
/* /*
* Check if addr is valid. * Check if addr is valid.
* NVRAM length at the end of memory should have been overwritten. * NVRAM length at the end of memory should have been overwritten.
*/ */
if (addr == 0 || ((~addr >> 16) & 0xffff) == (addr & 0xffff)) { if (addr == 0 || ((~addr >> 16) & 0xffff) == (addr & 0xffff)) {
BRCMF_ERROR(("%s: address (0x%08x) of sdpcm_shared invalid\n", brcmf_dbg(ERROR, "address (0x%08x) of sdpcm_shared invalid\n",
__func__, addr)); addr);
return -EBADE; return -EBADE;
} }
...@@ -2072,10 +2059,9 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh) ...@@ -2072,10 +2059,9 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh)
sh->msgtrace_addr = le32_to_cpu(sh->msgtrace_addr); sh->msgtrace_addr = le32_to_cpu(sh->msgtrace_addr);
if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) { if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
BRCMF_ERROR(("%s: sdpcm_shared version %d in brcmf " brcmf_dbg(ERROR, "sdpcm_shared version %d in brcmf is different than sdpcm_shared version %d in dongle\n",
"is different than sdpcm_shared version %d in dongle\n", SDPCM_SHARED_VERSION,
__func__, SDPCM_SHARED_VERSION, sh->flags & SDPCM_SHARED_VERSION_MASK);
sh->flags & SDPCM_SHARED_VERSION_MASK));
return -EBADE; return -EBADE;
} }
...@@ -2093,7 +2079,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) ...@@ -2093,7 +2079,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size)
struct sdpcm_shared sdpcm_shared; struct sdpcm_shared sdpcm_shared;
struct brcmu_strbuf strbuf; struct brcmu_strbuf strbuf;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (data == NULL) { if (data == NULL) {
/* /*
...@@ -2103,8 +2089,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) ...@@ -2103,8 +2089,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size)
size = msize; size = msize;
mbuffer = data = kmalloc(msize, GFP_ATOMIC); mbuffer = data = kmalloc(msize, GFP_ATOMIC);
if (mbuffer == NULL) { if (mbuffer == NULL) {
BRCMF_ERROR(("%s: kmalloc(%d) failed\n", __func__, brcmf_dbg(ERROR, "kmalloc(%d) failed\n", msize);
msize));
bcmerror = -ENOMEM; bcmerror = -ENOMEM;
goto done; goto done;
} }
...@@ -2112,7 +2097,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) ...@@ -2112,7 +2097,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size)
str = kmalloc(maxstrlen, GFP_ATOMIC); str = kmalloc(maxstrlen, GFP_ATOMIC);
if (str == NULL) { if (str == NULL) {
BRCMF_ERROR(("%s: kmalloc(%d) failed\n", __func__, maxstrlen)); brcmf_dbg(ERROR, "kmalloc(%d) failed\n", maxstrlen);
bcmerror = -ENOMEM; bcmerror = -ENOMEM;
goto done; goto done;
} }
...@@ -2194,7 +2179,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) ...@@ -2194,7 +2179,7 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size)
} }
if (sdpcm_shared.flags & (SDPCM_SHARED_ASSERT | SDPCM_SHARED_TRAP)) if (sdpcm_shared.flags & (SDPCM_SHARED_ASSERT | SDPCM_SHARED_TRAP))
BRCMF_ERROR(("%s: %s\n", __func__, strbuf.origbuf)); brcmf_dbg(ERROR, "%s\n", strbuf.origbuf);
#ifdef BCMDBG #ifdef BCMDBG
if (sdpcm_shared.flags & SDPCM_SHARED_TRAP) if (sdpcm_shared.flags & SDPCM_SHARED_TRAP)
...@@ -2222,7 +2207,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus) ...@@ -2222,7 +2207,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus)
size = bus->ramsize; size = bus->ramsize;
buf = kmalloc(size, GFP_ATOMIC); buf = kmalloc(size, GFP_ATOMIC);
if (!buf) { if (!buf) {
BRCMF_ERROR(("%s: Out of memory (%d bytes)\n", __func__, size)); brcmf_dbg(ERROR, "Out of memory (%d bytes)\n", size);
return -1; return -1;
} }
...@@ -2234,7 +2219,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus) ...@@ -2234,7 +2219,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus)
ret = brcmf_sdbrcm_membytes(bus, false, start, databuf, ret = brcmf_sdbrcm_membytes(bus, false, start, databuf,
read_size); read_size);
if (ret) { if (ret) {
BRCMF_ERROR(("%s: Error membytes %d\n", __func__, ret)); brcmf_dbg(ERROR, "Error membytes %d\n", ret);
kfree(buf); kfree(buf);
return -1; return -1;
} }
...@@ -2249,7 +2234,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus) ...@@ -2249,7 +2234,7 @@ static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus)
/* free buf before return !!! */ /* free buf before return !!! */
if (brcmf_write_to_file(bus->drvr, buf, bus->ramsize)) { if (brcmf_write_to_file(bus->drvr, buf, bus->ramsize)) {
BRCMF_ERROR(("%s: Error writing to files\n", __func__)); brcmf_dbg(ERROR, "Error writing to files\n");
return -1; return -1;
} }
...@@ -2340,7 +2325,7 @@ int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len) ...@@ -2340,7 +2325,7 @@ int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len)
{ {
int bcmerror = 0; int bcmerror = 0;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Basic sanity checks */ /* Basic sanity checks */
if (bus->drvr->up) { if (bus->drvr->up) {
...@@ -2378,9 +2363,8 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, ...@@ -2378,9 +2363,8 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus,
s32 int_val = 0; s32 int_val = 0;
bool bool_val = 0; bool bool_val = 0;
BRCMF_TRACE(("%s: Enter, action %d name %s params %p plen %d arg %p " brcmf_dbg(TRACE, "Enter, action %d name %s params %p plen %d arg %p len %d val_size %d\n",
"len %d val_size %d\n", __func__, actionid, name, params, actionid, name, params, plen, arg, len, val_size);
plen, arg, len, val_size));
bcmerror = brcmu_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid)); bcmerror = brcmu_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid));
if (bcmerror != 0) if (bcmerror != 0)
...@@ -2476,25 +2460,22 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, ...@@ -2476,25 +2460,22 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus,
/* Do some validation */ /* Do some validation */
dsize = set ? plen - (2 * sizeof(int)) : len; dsize = set ? plen - (2 * sizeof(int)) : len;
if (dsize < size) { if (dsize < size) {
BRCMF_ERROR(("%s: error on %s membytes, addr " brcmf_dbg(ERROR, "error on %s membytes, addr 0x%08x size %d dsize %d\n",
"0x%08x size %d dsize %d\n", set ? "set" : "get",
__func__, (set ? "set" : "get"), address, size, dsize);
address, size, dsize));
bcmerror = -EINVAL; bcmerror = -EINVAL;
break; break;
} }
BRCMF_INFO(("%s: Request to %s %d bytes at address " brcmf_dbg(INFO, "Request to %s %d bytes at address 0x%08x\n",
"0x%08x\n", __func__, set ? "write" : "read", size, address);
(set ? "write" : "read"), size, address));
/* If we know about SOCRAM, check for a fit */ /* If we know about SOCRAM, check for a fit */
if ((bus->orig_ramsize) && if ((bus->orig_ramsize) &&
((address > bus->orig_ramsize) ((address > bus->orig_ramsize)
|| (address + size > bus->orig_ramsize))) { || (address + size > bus->orig_ramsize))) {
BRCMF_ERROR(("%s: ramsize 0x%08x doesn't have" brcmf_dbg(ERROR, "ramsize 0x%08x doesn't have %d bytes at 0x%08x\n",
" %d bytes at 0x%08x\n", __func__, bus->orig_ramsize, size, address);
bus->orig_ramsize, size, address));
bcmerror = -EINVAL; bcmerror = -EINVAL;
break; break;
} }
...@@ -2721,17 +2702,16 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, ...@@ -2721,17 +2702,16 @@ static int brcmf_sdbrcm_doiovar(struct brcmf_bus *bus,
#endif /* BCMDBG */ #endif /* BCMDBG */
case IOV_SVAL(IOV_DEVRESET): case IOV_SVAL(IOV_DEVRESET):
BRCMF_TRACE(("%s: Called set IOV_DEVRESET=%d dongle_reset=%d " brcmf_dbg(TRACE, "Called set IOV_DEVRESET=%d dongle_reset=%d busstate=%d\n",
"busstate=%d\n", bool_val, bus->drvr->dongle_reset,
__func__, bool_val, bus->drvr->dongle_reset, bus->drvr->busstate);
bus->drvr->busstate));
brcmf_bus_devreset(bus->drvr, (u8) bool_val); brcmf_bus_devreset(bus->drvr, (u8) bool_val);
break; break;
case IOV_GVAL(IOV_DEVRESET): case IOV_GVAL(IOV_DEVRESET):
BRCMF_TRACE(("%s: Called get IOV_DEVRESET\n", __func__)); brcmf_dbg(TRACE, "Called get IOV_DEVRESET\n");
/* Get its status */ /* Get its status */
int_val = (bool) bus->drvr->dongle_reset; int_val = (bool) bus->drvr->dongle_reset;
...@@ -2813,7 +2793,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus) ...@@ -2813,7 +2793,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize); brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize);
#ifdef BCMDBG #ifdef BCMDBG
/* Verify NVRAM bytes */ /* Verify NVRAM bytes */
BRCMF_INFO(("Compare NVRAM dl & ul; varsize=%d\n", varsize)); brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
nvram_ularray = kmalloc(varsize, GFP_ATOMIC); nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
if (!nvram_ularray) if (!nvram_ularray)
return -ENOMEM; return -ENOMEM;
...@@ -2826,17 +2806,14 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus) ...@@ -2826,17 +2806,14 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
brcmf_sdbrcm_membytes(bus, false, varaddr, nvram_ularray, brcmf_sdbrcm_membytes(bus, false, varaddr, nvram_ularray,
varsize); varsize);
if (bcmerror) { if (bcmerror) {
BRCMF_ERROR(("%s: error %d on reading %d nvram bytes" brcmf_dbg(ERROR, "error %d on reading %d nvram bytes at 0x%08x\n",
" at 0x%08x\n", __func__, bcmerror, bcmerror, varsize, varaddr);
varsize, varaddr));
} }
/* Compare the org NVRAM with the one read from RAM */ /* Compare the org NVRAM with the one read from RAM */
if (memcmp(vbuffer, nvram_ularray, varsize)) if (memcmp(vbuffer, nvram_ularray, varsize))
BRCMF_ERROR(("%s: Downloaded NVRAM image is " brcmf_dbg(ERROR, "Downloaded NVRAM image is corrupted\n");
"corrupted.\n", __func__));
else else
BRCMF_ERROR(("%s: Download/Upload/Compare of" brcmf_dbg(ERROR, "Download/Upload/Compare of NVRAM ok\n");
" NVRAM ok.\n", __func__));
kfree(nvram_ularray); kfree(nvram_ularray);
#endif /* BCMDBG */ #endif /* BCMDBG */
...@@ -2845,9 +2822,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus) ...@@ -2845,9 +2822,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
} }
/* adjust to the user specified RAM */ /* adjust to the user specified RAM */
BRCMF_INFO(("Physical memory size: %d, usable memory size: %d\n", brcmf_dbg(INFO, "Physical memory size: %d, usable memory size: %d\n",
bus->orig_ramsize, bus->ramsize)); bus->orig_ramsize, bus->ramsize);
BRCMF_INFO(("Vars are at %d, orig varsize is %d\n", varaddr, varsize)); brcmf_dbg(INFO, "Vars are at %d, orig varsize is %d\n",
varaddr, varsize);
varsize = ((bus->orig_ramsize - 4) - varaddr); varsize = ((bus->orig_ramsize - 4) - varaddr);
/* /*
...@@ -2863,8 +2841,8 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus) ...@@ -2863,8 +2841,8 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
varsizew = cpu_to_le32(varsizew); varsizew = cpu_to_le32(varsizew);
} }
BRCMF_INFO(("New varsize is %d, length token=0x%08x\n", varsize, brcmf_dbg(INFO, "New varsize is %d, length token=0x%08x\n",
varsizew)); varsize, varsizew);
/* Write the length token to the last word */ /* Write the length token to the last word */
bcmerror = brcmf_sdbrcm_membytes(bus, true, (bus->orig_ramsize - 4), bcmerror = brcmf_sdbrcm_membytes(bus, true, (bus->orig_ramsize - 4),
...@@ -2902,15 +2880,14 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter) ...@@ -2902,15 +2880,14 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
regdata &= (SBTML_RESET | SBTML_REJ_MASK | regdata &= (SBTML_RESET | SBTML_REJ_MASK |
(SICF_CLOCK_EN << SBTML_SICF_SHIFT)); (SICF_CLOCK_EN << SBTML_SICF_SHIFT));
if ((SICF_CLOCK_EN << SBTML_SICF_SHIFT) != regdata) { if ((SICF_CLOCK_EN << SBTML_SICF_SHIFT) != regdata) {
BRCMF_ERROR(("%s: SOCRAM core is down after reset?\n", brcmf_dbg(ERROR, "SOCRAM core is down after reset?\n");
__func__));
bcmerror = -EBADE; bcmerror = -EBADE;
goto fail; goto fail;
} }
bcmerror = brcmf_sdbrcm_write_vars(bus); bcmerror = brcmf_sdbrcm_write_vars(bus);
if (bcmerror) { if (bcmerror) {
BRCMF_ERROR(("%s: no vars written to RAM\n", __func__)); brcmf_dbg(ERROR, "no vars written to RAM\n");
bcmerror = 0; bcmerror = 0;
} }
...@@ -2938,7 +2915,7 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name, ...@@ -2938,7 +2915,7 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name,
int val_size; int val_size;
u32 actionid; u32 actionid;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (name == NULL || len < 0) if (name == NULL || len < 0)
return -EINVAL; return -EINVAL;
...@@ -2974,8 +2951,8 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name, ...@@ -2974,8 +2951,8 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name,
goto exit; goto exit;
} }
BRCMF_CTL(("%s: %s %s, len %d plen %d\n", __func__, brcmf_dbg(CTL, "%s %s, len %d plen %d\n",
name, (set ? "set" : "get"), len, plen)); name, set ? "set" : "get", len, plen);
/* set up 'params' pointer in case this is a set command so that /* set up 'params' pointer in case this is a set command so that
* the convenience int and bool code can be common to set and get * the convenience int and bool code can be common to set and get
...@@ -3008,7 +2985,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) ...@@ -3008,7 +2985,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)
uint retries; uint retries;
int err; int err;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (enforce_mutex) if (enforce_mutex)
brcmf_sdbrcm_sdlock(bus); brcmf_sdbrcm_sdlock(bus);
...@@ -3048,11 +3025,10 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) ...@@ -3048,11 +3025,10 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)
(saveclk | SBSDIO_FORCE_HT), &err); (saveclk | SBSDIO_FORCE_HT), &err);
} }
if (err) if (err)
BRCMF_ERROR(("%s: Failed to force clock for F2: err %d\n", brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);
__func__, err));
/* Turn off the bus (F2), free any pending packets */ /* Turn off the bus (F2), free any pending packets */
BRCMF_INTR(("%s: disable SDIO interrupts\n", __func__)); brcmf_dbg(INTR, "disable SDIO interrupts\n");
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
SDIO_FUNC_ENABLE_1, NULL); SDIO_FUNC_ENABLE_1, NULL);
...@@ -3096,7 +3072,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) ...@@ -3096,7 +3072,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
int err, ret = 0; int err, ret = 0;
u8 saveclk; u8 saveclk;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* try to download image and nvram to the dongle */ /* try to download image and nvram to the dongle */
if (drvr->busstate == BRCMF_BUS_DOWN) { if (drvr->busstate == BRCMF_BUS_DOWN) {
...@@ -3129,8 +3105,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) ...@@ -3129,8 +3105,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
(saveclk | SBSDIO_FORCE_HT), &err); (saveclk | SBSDIO_FORCE_HT), &err);
} }
if (err) { if (err) {
BRCMF_ERROR(("%s: Failed to force clock for F2: err %d\n", brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);
__func__, err));
goto exit; goto exit;
} }
...@@ -3154,8 +3129,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) ...@@ -3154,8 +3129,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
msleep_interruptible(20); msleep_interruptible(20);
} }
BRCMF_INFO(("%s: enable 0x%02x, ready 0x%02x\n", brcmf_dbg(INFO, "enable 0x%02x, ready 0x%02x\n", enable, ready);
__func__, enable, ready));
/* If F2 successfully enabled, set core and enable interrupts */ /* If F2 successfully enabled, set core and enable interrupts */
if (ready == enable) { if (ready == enable) {
...@@ -3186,8 +3160,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) ...@@ -3186,8 +3160,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
/* Host registration for OOB interrupt */ /* Host registration for OOB interrupt */
if (brcmf_sdio_register_oob_intr(bus->dhd)) { if (brcmf_sdio_register_oob_intr(bus->dhd)) {
brcmf_sdbrcm_wd_timer(bus, 0); brcmf_sdbrcm_wd_timer(bus, 0);
BRCMF_ERROR(("%s Host failed to resgister for OOB\n", brcmf_dbg(ERROR, "Host failed to resgister for OOB\n");
__func__));
ret = -ENODEV; ret = -ENODEV;
goto exit; goto exit;
} }
...@@ -3214,9 +3187,9 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx) ...@@ -3214,9 +3187,9 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
u8 hi, lo; u8 hi, lo;
int err; int err;
BRCMF_ERROR(("%s: %sterminate frame%s\n", __func__, brcmf_dbg(ERROR, "%sterminate frame%s\n",
(abort ? "abort command, " : ""), abort ? "abort command, " : "",
(rtx ? ", send NAK" : ""))); rtx ? ", send NAK" : "");
if (abort) if (abort)
brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2); brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
...@@ -3238,19 +3211,16 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx) ...@@ -3238,19 +3211,16 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
break; break;
if ((hi > (lastrbc >> 8)) && (lo > (lastrbc & 0x00ff))) { if ((hi > (lastrbc >> 8)) && (lo > (lastrbc & 0x00ff))) {
BRCMF_ERROR(("%s: count growing: last 0x%04x now " brcmf_dbg(ERROR, "count growing: last 0x%04x now 0x%04x\n",
"0x%04x\n", lastrbc, (hi << 8) + lo);
__func__, lastrbc, ((hi << 8) + lo)));
} }
lastrbc = (hi << 8) + lo; lastrbc = (hi << 8) + lo;
} }
if (!retries) if (!retries)
BRCMF_ERROR(("%s: count never zeroed: last 0x%04x\n", brcmf_dbg(ERROR, "count never zeroed: last 0x%04x\n", lastrbc);
__func__, lastrbc));
else else
BRCMF_INFO(("%s: flush took %d iterations\n", __func__, brcmf_dbg(INFO, "flush took %d iterations\n", 0xffff - retries);
(0xffff - retries)));
if (rtx) { if (rtx) {
bus->rxrtx++; bus->rxrtx++;
...@@ -3277,7 +3247,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff) ...@@ -3277,7 +3247,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
int sdret; int sdret;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Set rxctl for frame (w/optional alignment) */ /* Set rxctl for frame (w/optional alignment) */
bus->rxctl = bus->rxbuf; bus->rxctl = bus->rxbuf;
...@@ -3311,17 +3281,16 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff) ...@@ -3311,17 +3281,16 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
/* Drop if the read is too big or it exceeds our maximum */ /* Drop if the read is too big or it exceeds our maximum */
if ((rdlen + firstread) > bus->drvr->maxctl) { if ((rdlen + firstread) > bus->drvr->maxctl) {
BRCMF_ERROR(("%s: %d-byte control read exceeds %d-byte" brcmf_dbg(ERROR, "%d-byte control read exceeds %d-byte buffer\n",
" buffer\n", __func__, rdlen, bus->drvr->maxctl)); rdlen, bus->drvr->maxctl);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
goto done; goto done;
} }
if ((len - doff) > bus->drvr->maxctl) { if ((len - doff) > bus->drvr->maxctl) {
BRCMF_ERROR(("%s: %d-byte ctl frame (%d-byte ctl data) exceeds " brcmf_dbg(ERROR, "%d-byte ctl frame (%d-byte ctl data) exceeds %d-byte limit\n",
"%d-byte limit\n", len, len - doff, bus->drvr->maxctl);
__func__, len, (len - doff), bus->drvr->maxctl));
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
bus->rx_toolong++; bus->rx_toolong++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
...@@ -3338,8 +3307,8 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff) ...@@ -3338,8 +3307,8 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
/* Control frame failures need retransmission */ /* Control frame failures need retransmission */
if (sdret < 0) { if (sdret < 0) {
BRCMF_ERROR(("%s: read %d control bytes failed: %d\n", brcmf_dbg(ERROR, "read %d control bytes failed: %d\n",
__func__, rdlen, sdret)); rdlen, sdret);
bus->rxc_errors++; bus->rxc_errors++;
brcmf_sdbrcm_rxfail(bus, true, true); brcmf_sdbrcm_rxfail(bus, true, true);
goto done; goto done;
...@@ -3381,8 +3350,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3381,8 +3350,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
/* If packets, issue read(s) and send up packet chain */ /* If packets, issue read(s) and send up packet chain */
/* Return sequence numbers consumed? */ /* Return sequence numbers consumed? */
BRCMF_TRACE(("brcmf_sdbrcm_rxglom: start: glomd %p glom %p\n", brcmf_dbg(TRACE, "start: glomd %p glom %p\n", bus->glomd, bus->glom);
bus->glomd, bus->glom));
/* If there's a descriptor, generate the packet chain */ /* If there's a descriptor, generate the packet chain */
if (bus->glomd) { if (bus->glomd) {
...@@ -3390,9 +3358,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3390,9 +3358,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
dlen = (u16) (bus->glomd->len); dlen = (u16) (bus->glomd->len);
dptr = bus->glomd->data; dptr = bus->glomd->data;
if (!dlen || (dlen & 1)) { if (!dlen || (dlen & 1)) {
BRCMF_ERROR(("%s: bad glomd len(%d)," brcmf_dbg(ERROR, "bad glomd len(%d), ignore descriptor\n",
" ignore descriptor\n", dlen);
__func__, dlen));
dlen = 0; dlen = 0;
} }
...@@ -3403,15 +3370,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3403,15 +3370,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
dptr += sizeof(u16); dptr += sizeof(u16);
if ((sublen < SDPCM_HDRLEN) || if ((sublen < SDPCM_HDRLEN) ||
((num == 0) && (sublen < (2 * SDPCM_HDRLEN)))) { ((num == 0) && (sublen < (2 * SDPCM_HDRLEN)))) {
BRCMF_ERROR(("%s: descriptor len %d bad: %d\n", brcmf_dbg(ERROR, "descriptor len %d bad: %d\n",
__func__, num, sublen)); num, sublen);
pnext = NULL; pnext = NULL;
break; break;
} }
if (sublen % BRCMF_SDALIGN) { if (sublen % BRCMF_SDALIGN) {
BRCMF_ERROR(("%s: sublen %d not multiple of" brcmf_dbg(ERROR, "sublen %d not multiple of %d\n",
" %d\n", __func__, sublen, sublen, BRCMF_SDALIGN);
BRCMF_SDALIGN));
usechain = false; usechain = false;
} }
totlen += sublen; totlen += sublen;
...@@ -3427,9 +3393,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3427,9 +3393,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
/* Allocate/chain packet for next subframe */ /* Allocate/chain packet for next subframe */
pnext = brcmu_pkt_buf_get_skb(sublen + BRCMF_SDALIGN); pnext = brcmu_pkt_buf_get_skb(sublen + BRCMF_SDALIGN);
if (pnext == NULL) { if (pnext == NULL) {
BRCMF_ERROR(("%s: bcm_pkt_buf_get_skb failed, " brcmf_dbg(ERROR, "bcm_pkt_buf_get_skb failed, num %d len %d\n",
"num %d len %d\n", __func__, num, sublen);
num, sublen));
break; break;
} }
if (!pfirst) { if (!pfirst) {
...@@ -3446,15 +3411,12 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3446,15 +3411,12 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
/* If all allocations succeeded, save packet chain /* If all allocations succeeded, save packet chain
in bus structure */ in bus structure */
if (pnext) { if (pnext) {
BRCMF_GLOM(("%s: allocated %d-byte packet chain for %d " brcmf_dbg(GLOM, "allocated %d-byte packet chain for %d subframes\n",
"subframes\n", __func__, totlen, num)); totlen, num);
if (BRCMF_GLOM_ON() && bus->nextlen) { if (BRCMF_GLOM_ON() && bus->nextlen) {
if (totlen != bus->nextlen) { if (totlen != bus->nextlen) {
BRCMF_GLOM(("%s: glomdesc mismatch: " brcmf_dbg(GLOM, "glomdesc mismatch: nextlen %d glomdesc %d rxseq %d\n",
"nextlen %d glomdesc %d " bus->nextlen, totlen, rxseq);
"rxseq %d\n", __func__,
bus->nextlen,
totlen, rxseq));
} }
} }
bus->glom = pfirst; bus->glom = pfirst;
...@@ -3476,12 +3438,11 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3476,12 +3438,11 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
or had one from before */ or had one from before */
if (bus->glom) { if (bus->glom) {
if (BRCMF_GLOM_ON()) { if (BRCMF_GLOM_ON()) {
BRCMF_GLOM(("%s: try superframe read, packet chain:\n", brcmf_dbg(GLOM, "try superframe read, packet chain:\n");
__func__));
for (pnext = bus->glom; pnext; pnext = pnext->next) { for (pnext = bus->glom; pnext; pnext = pnext->next) {
BRCMF_GLOM((" %p: %p len 0x%04x (%d)\n", brcmf_dbg(GLOM, " %p: %p len 0x%04x (%d)\n",
pnext, (u8 *) (pnext->data), pnext, (u8 *) (pnext->data),
pnext->len, pnext->len)); pnext->len, pnext->len);
} }
} }
...@@ -3507,23 +3468,22 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3507,23 +3468,22 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
sublen = (u16) brcmu_pktfrombuf(pfirst, 0, dlen, sublen = (u16) brcmu_pktfrombuf(pfirst, 0, dlen,
bus->dataptr); bus->dataptr);
if (sublen != dlen) { if (sublen != dlen) {
BRCMF_ERROR(("%s: FAILED TO COPY, dlen %d " brcmf_dbg(ERROR, "FAILED TO COPY, dlen %d sublen %d\n",
"sublen %d\n", dlen, sublen);
__func__, dlen, sublen));
errcode = -1; errcode = -1;
} }
pnext = NULL; pnext = NULL;
} else { } else {
BRCMF_ERROR(("COULDN'T ALLOC %d-BYTE GLOM, " brcmf_dbg(ERROR, "COULDN'T ALLOC %d-BYTE GLOM, FORCE FAILURE\n",
"FORCE FAILURE\n", dlen)); dlen);
errcode = -1; errcode = -1;
} }
bus->f2rxdata++; bus->f2rxdata++;
/* On failure, kill the superframe, allow a couple retries */ /* On failure, kill the superframe, allow a couple retries */
if (errcode < 0) { if (errcode < 0) {
BRCMF_ERROR(("%s: glom read of %d bytes failed: %d\n", brcmf_dbg(ERROR, "glom read of %d bytes failed: %d\n",
__func__, dlen, errcode)); dlen, errcode);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
if (bus->glomerr++ < 3) { if (bus->glomerr++ < 3) {
...@@ -3554,8 +3514,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3554,8 +3514,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]); seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]);
bus->nextlen = dptr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET]; bus->nextlen = dptr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];
if ((bus->nextlen << 4) > MAX_RX_DATASZ) { if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
BRCMF_INFO(("%s: nextlen too large (%d) seq %d\n", brcmf_dbg(INFO, "nextlen too large (%d) seq %d\n",
__func__, bus->nextlen, seq)); bus->nextlen, seq);
bus->nextlen = 0; bus->nextlen = 0;
} }
doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]); doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
...@@ -3563,48 +3523,42 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3563,48 +3523,42 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
errcode = 0; errcode = 0;
if ((u16)~(sublen ^ check)) { if ((u16)~(sublen ^ check)) {
BRCMF_ERROR(("%s (superframe): HW hdr error: len/check " brcmf_dbg(ERROR, "(superframe): HW hdr error: len/check 0x%04x/0x%04x\n",
"0x%04x/0x%04x\n", __func__, sublen, sublen, check);
check));
errcode = -1; errcode = -1;
} else if (roundup(sublen, bus->blocksize) != dlen) { } else if (roundup(sublen, bus->blocksize) != dlen) {
BRCMF_ERROR(("%s (superframe): len 0x%04x, rounded " brcmf_dbg(ERROR, "(superframe): len 0x%04x, rounded 0x%04x, expect 0x%04x\n",
"0x%04x, expect 0x%04x\n", sublen, roundup(sublen, bus->blocksize),
__func__, sublen, dlen);
roundup(sublen, bus->blocksize), dlen));
errcode = -1; errcode = -1;
} else if (SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]) != } else if (SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]) !=
SDPCM_GLOM_CHANNEL) { SDPCM_GLOM_CHANNEL) {
BRCMF_ERROR(("%s (superframe): bad channel %d\n", brcmf_dbg(ERROR, "(superframe): bad channel %d\n",
__func__, SDPCM_PACKET_CHANNEL(
SDPCM_PACKET_CHANNEL(&dptr &dptr[SDPCM_FRAMETAG_LEN]));
[SDPCM_FRAMETAG_LEN])));
errcode = -1; errcode = -1;
} else if (SDPCM_GLOMDESC(&dptr[SDPCM_FRAMETAG_LEN])) { } else if (SDPCM_GLOMDESC(&dptr[SDPCM_FRAMETAG_LEN])) {
BRCMF_ERROR(("%s (superframe): got 2nd descriptor?\n", brcmf_dbg(ERROR, "(superframe): got 2nd descriptor?\n");
__func__));
errcode = -1; errcode = -1;
} else if ((doff < SDPCM_HDRLEN) || } else if ((doff < SDPCM_HDRLEN) ||
(doff > (pfirst->len - SDPCM_HDRLEN))) { (doff > (pfirst->len - SDPCM_HDRLEN))) {
BRCMF_ERROR(("%s (superframe): Bad data offset %d: " brcmf_dbg(ERROR, "(superframe): Bad data offset %d: HW %d pkt %d min %d\n",
"HW %d pkt %d min %d\n", doff, sublen, pfirst->len, SDPCM_HDRLEN);
__func__, doff, sublen,
pfirst->len, SDPCM_HDRLEN));
errcode = -1; errcode = -1;
} }
/* Check sequence number of superframe SW header */ /* Check sequence number of superframe SW header */
if (rxseq != seq) { if (rxseq != seq) {
BRCMF_INFO(("%s: (superframe) rx_seq %d, expected %d\n", brcmf_dbg(INFO, "(superframe) rx_seq %d, expected %d\n",
__func__, seq, rxseq)); seq, rxseq);
bus->rx_badseq++; bus->rx_badseq++;
rxseq = seq; rxseq = seq;
} }
/* Check window for sanity */ /* Check window for sanity */
if ((u8) (txmax - bus->tx_seq) > 0x40) { if ((u8) (txmax - bus->tx_seq) > 0x40) {
BRCMF_ERROR(("%s: unlikely tx max %d with tx_seq %d\n", brcmf_dbg(ERROR, "unlikely tx max %d with tx_seq %d\n",
__func__, txmax, bus->tx_seq)); txmax, bus->tx_seq);
txmax = bus->tx_seq + 2; txmax = bus->tx_seq + 2;
} }
bus->tx_max = txmax; bus->tx_max = txmax;
...@@ -3631,25 +3585,21 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3631,25 +3585,21 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
#endif #endif
if ((u16)~(sublen ^ check)) { if ((u16)~(sublen ^ check)) {
BRCMF_ERROR(("%s (subframe %d): HW hdr error: " brcmf_dbg(ERROR, "(subframe %d): HW hdr error: len/check 0x%04x/0x%04x\n",
"len/check 0x%04x/0x%04x\n", num, sublen, check);
__func__, num, sublen, check));
errcode = -1; errcode = -1;
} else if ((sublen > dlen) || (sublen < SDPCM_HDRLEN)) { } else if ((sublen > dlen) || (sublen < SDPCM_HDRLEN)) {
BRCMF_ERROR(("%s (subframe %d): length mismatch" brcmf_dbg(ERROR, "(subframe %d): length mismatch: len 0x%04x, expect 0x%04x\n",
": len 0x%04x, expect 0x%04x\n", num, sublen, dlen);
__func__, num, sublen, dlen));
errcode = -1; errcode = -1;
} else if ((chan != SDPCM_DATA_CHANNEL) && } else if ((chan != SDPCM_DATA_CHANNEL) &&
(chan != SDPCM_EVENT_CHANNEL)) { (chan != SDPCM_EVENT_CHANNEL)) {
BRCMF_ERROR(("%s (subframe %d): bad channel" brcmf_dbg(ERROR, "(subframe %d): bad channel %d\n",
" %d\n", __func__, num, chan)); num, chan);
errcode = -1; errcode = -1;
} else if ((doff < SDPCM_HDRLEN) || (doff > sublen)) { } else if ((doff < SDPCM_HDRLEN) || (doff > sublen)) {
BRCMF_ERROR(("%s (subframe %d): Bad data offset" brcmf_dbg(ERROR, "(subframe %d): Bad data offset %d: HW %d min %d\n",
" %d: HW %d min %d\n", num, doff, sublen, SDPCM_HDRLEN);
__func__, num, doff, sublen,
SDPCM_HDRLEN));
errcode = -1; errcode = -1;
} }
} }
...@@ -3687,17 +3637,16 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3687,17 +3637,16 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]); seq = SDPCM_PACKET_SEQUENCE(&dptr[SDPCM_FRAMETAG_LEN]);
doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]); doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
BRCMF_GLOM(("%s: Get subframe %d, %p(%p/%d), sublen %d " brcmf_dbg(GLOM, "Get subframe %d, %p(%p/%d), sublen %d chan %d seq %d\n",
"chan %d seq %d\n", num, pfirst, pfirst->data,
__func__, num, pfirst, pfirst->data, pfirst->len, sublen, chan, seq);
pfirst->len, sublen, chan, seq));
/* precondition: chan == SDPCM_DATA_CHANNEL || /* precondition: chan == SDPCM_DATA_CHANNEL ||
chan == SDPCM_EVENT_CHANNEL */ chan == SDPCM_EVENT_CHANNEL */
if (rxseq != seq) { if (rxseq != seq) {
BRCMF_GLOM(("%s: rx_seq %d, expected %d\n", brcmf_dbg(GLOM, "rx_seq %d, expected %d\n",
__func__, seq, rxseq)); seq, rxseq);
bus->rx_badseq++; bus->rx_badseq++;
rxseq = seq; rxseq = seq;
} }
...@@ -3722,8 +3671,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3722,8 +3671,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
continue; continue;
} else if (brcmf_proto_hdrpull(bus->drvr, &ifidx, } else if (brcmf_proto_hdrpull(bus->drvr, &ifidx,
pfirst) != 0) { pfirst) != 0) {
BRCMF_ERROR(("%s: rx protocol error\n", brcmf_dbg(ERROR, "rx protocol error\n");
__func__));
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
brcmu_pkt_buf_free_skb(pfirst); brcmu_pkt_buf_free_skb(pfirst);
if (plast) if (plast)
...@@ -3742,11 +3690,10 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) ...@@ -3742,11 +3690,10 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
#ifdef BCMDBG #ifdef BCMDBG
if (BRCMF_GLOM_ON()) { if (BRCMF_GLOM_ON()) {
BRCMF_GLOM(("%s subframe %d to stack, %p" brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
"(%p/%d) nxt/lnk %p/%p\n", num, pfirst, pfirst->data,
__func__, num, pfirst, pfirst->data, pfirst->len, pfirst->next,
pfirst->len, pfirst->next, pfirst->prev);
pfirst->prev));
print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
pfirst->data, pfirst->data,
min_t(int, pfirst->len, 32)); min_t(int, pfirst->len, 32));
...@@ -3786,7 +3733,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3786,7 +3733,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
int ifidx = 0; int ifidx = 0;
uint rxcount = 0; /* Total frames read */ uint rxcount = 0; /* Total frames read */
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Not finished unless we encounter no more frames indication */ /* Not finished unless we encounter no more frames indication */
*finished = false; *finished = false;
...@@ -3798,10 +3745,10 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3798,10 +3745,10 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Handle glomming separately */ /* Handle glomming separately */
if (bus->glom || bus->glomd) { if (bus->glom || bus->glomd) {
u8 cnt; u8 cnt;
BRCMF_GLOM(("%s: calling rxglom: glomd %p, glom %p\n", brcmf_dbg(GLOM, "calling rxglom: glomd %p, glom %p\n",
__func__, bus->glomd, bus->glom)); bus->glomd, bus->glom);
cnt = brcmf_sdbrcm_rxglom(bus, rxseq); cnt = brcmf_sdbrcm_rxglom(bus, rxseq);
BRCMF_GLOM(("%s: rxglom returned %d\n", __func__, cnt)); brcmf_dbg(GLOM, "rxglom returned %d\n", cnt);
rxseq += cnt - 1; rxseq += cnt - 1;
rxleft = (rxleft > cnt) ? (rxleft - cnt) : 1; rxleft = (rxleft > cnt) ? (rxleft - cnt) : 1;
continue; continue;
...@@ -3844,12 +3791,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3844,12 +3791,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
pkt = brcmu_pkt_buf_get_skb(rdlen + BRCMF_SDALIGN); pkt = brcmu_pkt_buf_get_skb(rdlen + BRCMF_SDALIGN);
if (!pkt) { if (!pkt) {
/* Give up on data, request rtx of events */ /* Give up on data, request rtx of events */
BRCMF_ERROR(("%s (nextlen): " brcmf_dbg(ERROR, "(nextlen): brcmu_pkt_buf_get_skb failed: len %d rdlen %d expected rxseq %d\n",
"brcmu_pkt_buf_get_skb " len, rdlen, rxseq);
"failed:"
" len %d rdlen %d expected"
" rxseq %d\n", __func__,
len, rdlen, rxseq));
continue; continue;
} else { } else {
PKTALIGN(pkt, rdlen, BRCMF_SDALIGN); PKTALIGN(pkt, rdlen, BRCMF_SDALIGN);
...@@ -3864,9 +3807,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3864,9 +3807,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
bus->f2rxdata++; bus->f2rxdata++;
if (sdret < 0) { if (sdret < 0) {
BRCMF_ERROR(("%s (nextlen): read %d" brcmf_dbg(ERROR, "(nextlen): read %d bytes failed: %d\n",
" bytes failed: %d\n", rdlen, sdret);
__func__, rdlen, sdret));
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
/* Force retry w/normal header read. /* Force retry w/normal header read.
...@@ -3887,18 +3829,15 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3887,18 +3829,15 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* All zeros means readahead info was bad */ /* All zeros means readahead info was bad */
if (!(len | check)) { if (!(len | check)) {
BRCMF_INFO(("%s (nextlen): read zeros in HW " brcmf_dbg(INFO, "(nextlen): read zeros in HW header???\n");
"header???\n", __func__));
brcmf_sdbrcm_pktfree2(bus, pkt); brcmf_sdbrcm_pktfree2(bus, pkt);
continue; continue;
} }
/* Validate check bytes */ /* Validate check bytes */
if ((u16)~(len ^ check)) { if ((u16)~(len ^ check)) {
BRCMF_ERROR(("%s (nextlen): HW hdr error:" brcmf_dbg(ERROR, "(nextlen): HW hdr error: nextlen/len/check 0x%04x/0x%04x/0x%04x\n",
" nextlen/len/check" nextlen, len, check);
" 0x%04x/0x%04x/0x%04x\n",
__func__, nextlen, len, check));
bus->rx_badhdr++; bus->rx_badhdr++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
brcmf_sdbrcm_pktfree2(bus, pkt); brcmf_sdbrcm_pktfree2(bus, pkt);
...@@ -3907,8 +3846,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3907,8 +3846,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Validate frame length */ /* Validate frame length */
if (len < SDPCM_HDRLEN) { if (len < SDPCM_HDRLEN) {
BRCMF_ERROR(("%s (nextlen): HW hdr length " brcmf_dbg(ERROR, "(nextlen): HW hdr length invalid: %d\n",
"invalid: %d\n", __func__, len)); len);
brcmf_sdbrcm_pktfree2(bus, pkt); brcmf_sdbrcm_pktfree2(bus, pkt);
continue; continue;
} }
...@@ -3918,11 +3857,9 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3918,11 +3857,9 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
if (len_consistent) { if (len_consistent) {
/* Mismatch, force retry w/normal /* Mismatch, force retry w/normal
header (may be >4K) */ header (may be >4K) */
BRCMF_ERROR(("%s (nextlen): mismatch, " brcmf_dbg(ERROR, "(nextlen): mismatch, nextlen %d len %d rnd %d; expected rxseq %d\n",
"nextlen %d len %d rnd %d; " nextlen, len, roundup(len, 16),
"expected rxseq %d\n", rxseq);
__func__, nextlen,
len, roundup(len, 16), rxseq));
brcmf_sdbrcm_rxfail(bus, true, true); brcmf_sdbrcm_rxfail(bus, true, true);
brcmf_sdbrcm_pktfree2(bus, pkt); brcmf_sdbrcm_pktfree2(bus, pkt);
continue; continue;
...@@ -3942,9 +3879,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3942,9 +3879,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
bus->rxhdr[SDPCM_FRAMETAG_LEN + bus->rxhdr[SDPCM_FRAMETAG_LEN +
SDPCM_NEXTLEN_OFFSET]; SDPCM_NEXTLEN_OFFSET];
if ((bus->nextlen << 4) > MAX_RX_DATASZ) { if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
BRCMF_INFO(("%s (nextlen): got frame w/nextlen" brcmf_dbg(INFO, "(nextlen): got frame w/nextlen too large (%d), seq %d\n",
" too large (%d), seq %d\n", bus->nextlen, seq);
__func__, bus->nextlen, seq));
bus->nextlen = 0; bus->nextlen = 0;
} }
...@@ -3967,17 +3903,16 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3967,17 +3903,16 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Check and update sequence number */ /* Check and update sequence number */
if (rxseq != seq) { if (rxseq != seq) {
BRCMF_INFO(("%s (nextlen): rx_seq %d, expected " brcmf_dbg(INFO, "(nextlen): rx_seq %d, expected %d\n",
"%d\n", __func__, seq, rxseq)); seq, rxseq);
bus->rx_badseq++; bus->rx_badseq++;
rxseq = seq; rxseq = seq;
} }
/* Check window for sanity */ /* Check window for sanity */
if ((u8) (txmax - bus->tx_seq) > 0x40) { if ((u8) (txmax - bus->tx_seq) > 0x40) {
BRCMF_ERROR(("%s: got unlikely tx max %d with " brcmf_dbg(ERROR, "got unlikely tx max %d with tx_seq %d\n",
"tx_seq %d\n", txmax, bus->tx_seq);
__func__, txmax, bus->tx_seq));
txmax = bus->tx_seq + 2; txmax = bus->tx_seq + 2;
} }
bus->tx_max = txmax; bus->tx_max = txmax;
...@@ -3995,9 +3930,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -3995,9 +3930,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
#endif #endif
if (chan == SDPCM_CONTROL_CHANNEL) { if (chan == SDPCM_CONTROL_CHANNEL) {
BRCMF_ERROR(("%s (nextlen): readahead" brcmf_dbg(ERROR, "(nextlen): readahead on control packet %d?\n",
" on control packet %d?\n", seq);
__func__, seq));
/* Force retry w/normal header read */ /* Force retry w/normal header read */
bus->nextlen = 0; bus->nextlen = 0;
brcmf_sdbrcm_rxfail(bus, false, true); brcmf_sdbrcm_rxfail(bus, false, true);
...@@ -4007,9 +3941,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4007,9 +3941,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Validate data offset */ /* Validate data offset */
if ((doff < SDPCM_HDRLEN) || (doff > len)) { if ((doff < SDPCM_HDRLEN) || (doff > len)) {
BRCMF_ERROR(("%s (nextlen): bad data offset %d:" brcmf_dbg(ERROR, "(nextlen): bad data offset %d: HW len %d min %d\n",
" HW len %d min %d\n", __func__, doff, len, SDPCM_HDRLEN);
doff, len, SDPCM_HDRLEN));
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
brcmf_sdbrcm_pktfree2(bus, pkt); brcmf_sdbrcm_pktfree2(bus, pkt);
continue; continue;
...@@ -4027,8 +3960,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4027,8 +3960,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
bus->f2rxhdrs++; bus->f2rxhdrs++;
if (sdret < 0) { if (sdret < 0) {
BRCMF_ERROR(("%s: RXHEADER FAILED: %d\n", __func__, brcmf_dbg(ERROR, "RXHEADER FAILED: %d\n", sdret);
sdret));
bus->rx_hdrfail++; bus->rx_hdrfail++;
brcmf_sdbrcm_rxfail(bus, true, true); brcmf_sdbrcm_rxfail(bus, true, true);
continue; continue;
...@@ -4053,8 +3985,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4053,8 +3985,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Validate check bytes */ /* Validate check bytes */
if ((u16) ~(len ^ check)) { if ((u16) ~(len ^ check)) {
BRCMF_ERROR(("%s: HW hdr err: len/check " brcmf_dbg(ERROR, "HW hdr err: len/check 0x%04x/0x%04x\n",
"0x%04x/0x%04x\n", __func__, len, check)); len, check);
bus->rx_badhdr++; bus->rx_badhdr++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
continue; continue;
...@@ -4062,8 +3994,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4062,8 +3994,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Validate frame length */ /* Validate frame length */
if (len < SDPCM_HDRLEN) { if (len < SDPCM_HDRLEN) {
BRCMF_ERROR(("%s: HW hdr length invalid: %d\n", brcmf_dbg(ERROR, "HW hdr length invalid: %d\n", len);
__func__, len));
continue; continue;
} }
...@@ -4075,9 +4006,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4075,9 +4006,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Validate data offset */ /* Validate data offset */
if ((doff < SDPCM_HDRLEN) || (doff > len)) { if ((doff < SDPCM_HDRLEN) || (doff > len)) {
BRCMF_ERROR(("%s: Bad data offset %d: HW len %d," brcmf_dbg(ERROR, "Bad data offset %d: HW len %d, min %d seq %d\n",
" min %d seq %d\n", __func__, doff, doff, len, SDPCM_HDRLEN, seq);
len, SDPCM_HDRLEN, seq));
bus->rx_badhdr++; bus->rx_badhdr++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
continue; continue;
...@@ -4087,9 +4017,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4087,9 +4017,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
bus->nextlen = bus->nextlen =
bus->rxhdr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET]; bus->rxhdr[SDPCM_FRAMETAG_LEN + SDPCM_NEXTLEN_OFFSET];
if ((bus->nextlen << 4) > MAX_RX_DATASZ) { if ((bus->nextlen << 4) > MAX_RX_DATASZ) {
BRCMF_INFO(("%s (nextlen): got frame w/nextlen too" brcmf_dbg(INFO, "(nextlen): got frame w/nextlen too large (%d), seq %d\n",
" large (%d), seq %d\n", bus->nextlen, seq);
__func__, bus->nextlen, seq));
bus->nextlen = 0; bus->nextlen = 0;
} }
...@@ -4109,16 +4038,15 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4109,16 +4038,15 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Check and update sequence number */ /* Check and update sequence number */
if (rxseq != seq) { if (rxseq != seq) {
BRCMF_INFO(("%s: rx_seq %d, expected %d\n", __func__, brcmf_dbg(INFO, "rx_seq %d, expected %d\n", seq, rxseq);
seq, rxseq));
bus->rx_badseq++; bus->rx_badseq++;
rxseq = seq; rxseq = seq;
} }
/* Check window for sanity */ /* Check window for sanity */
if ((u8) (txmax - bus->tx_seq) > 0x40) { if ((u8) (txmax - bus->tx_seq) > 0x40) {
BRCMF_ERROR(("%s: unlikely tx max %d with tx_seq %d\n", brcmf_dbg(ERROR, "unlikely tx max %d with tx_seq %d\n",
__func__, txmax, bus->tx_seq)); txmax, bus->tx_seq);
txmax = bus->tx_seq + 2; txmax = bus->tx_seq + 2;
} }
bus->tx_max = txmax; bus->tx_max = txmax;
...@@ -4153,8 +4081,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4153,8 +4081,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
if ((rdlen + firstread) > MAX_RX_DATASZ) { if ((rdlen + firstread) > MAX_RX_DATASZ) {
/* Too long -- skip this frame */ /* Too long -- skip this frame */
BRCMF_ERROR(("%s: too long: len %d rdlen %d\n", brcmf_dbg(ERROR, "too long: len %d rdlen %d\n",
__func__, len, rdlen)); len, rdlen);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
bus->rx_toolong++; bus->rx_toolong++;
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
...@@ -4164,9 +4092,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4164,9 +4092,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
pkt = brcmu_pkt_buf_get_skb(rdlen + firstread + BRCMF_SDALIGN); pkt = brcmu_pkt_buf_get_skb(rdlen + firstread + BRCMF_SDALIGN);
if (!pkt) { if (!pkt) {
/* Give up on data, request rtx of events */ /* Give up on data, request rtx of events */
BRCMF_ERROR(("%s: brcmu_pkt_buf_get_skb failed:" brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: rdlen %d chan %d\n",
" rdlen %d chan %d\n", __func__, rdlen, rdlen, chan);
chan));
bus->drvr->rx_dropped++; bus->drvr->rx_dropped++;
brcmf_sdbrcm_rxfail(bus, false, RETRYCHAN(chan)); brcmf_sdbrcm_rxfail(bus, false, RETRYCHAN(chan));
continue; continue;
...@@ -4184,11 +4111,10 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4184,11 +4111,10 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
bus->f2rxdata++; bus->f2rxdata++;
if (sdret < 0) { if (sdret < 0) {
BRCMF_ERROR(("%s: read %d %s bytes failed: %d\n", brcmf_dbg(ERROR, "read %d %s bytes failed: %d\n", rdlen,
__func__, rdlen, ((chan == SDPCM_EVENT_CHANNEL) ? "event"
((chan == SDPCM_EVENT_CHANNEL) ? "event" : ((chan == SDPCM_DATA_CHANNEL) ? "data"
: ((chan == SDPCM_DATA_CHANNEL) ? "data" : "test")), sdret);
: "test")), sdret));
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
brcmf_sdbrcm_rxfail(bus, true, RETRYCHAN(chan)); brcmf_sdbrcm_rxfail(bus, true, RETRYCHAN(chan));
...@@ -4211,8 +4137,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4211,8 +4137,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
/* Save superframe descriptor and allocate packet frame */ /* Save superframe descriptor and allocate packet frame */
if (chan == SDPCM_GLOM_CHANNEL) { if (chan == SDPCM_GLOM_CHANNEL) {
if (SDPCM_GLOMDESC(&bus->rxhdr[SDPCM_FRAMETAG_LEN])) { if (SDPCM_GLOMDESC(&bus->rxhdr[SDPCM_FRAMETAG_LEN])) {
BRCMF_GLOM(("%s: glom descriptor, %d bytes:\n", brcmf_dbg(GLOM, "glom descriptor, %d bytes:\n",
__func__, len)); len);
#ifdef BCMDBG #ifdef BCMDBG
if (BRCMF_GLOM_ON()) { if (BRCMF_GLOM_ON()) {
printk(KERN_DEBUG "Glom Data:\n"); printk(KERN_DEBUG "Glom Data:\n");
...@@ -4225,8 +4151,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4225,8 +4151,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
skb_pull(pkt, SDPCM_HDRLEN); skb_pull(pkt, SDPCM_HDRLEN);
bus->glomd = pkt; bus->glomd = pkt;
} else { } else {
BRCMF_ERROR(("%s: glom superframe w/o " brcmf_dbg(ERROR, "%s: glom superframe w/o "
"descriptor!\n", __func__)); "descriptor!\n", __func__);
brcmf_sdbrcm_rxfail(bus, false, false); brcmf_sdbrcm_rxfail(bus, false, false);
} }
continue; continue;
...@@ -4240,7 +4166,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4240,7 +4166,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
continue; continue;
} else if (brcmf_proto_hdrpull(bus->drvr, &ifidx, pkt) != 0) { } else if (brcmf_proto_hdrpull(bus->drvr, &ifidx, pkt) != 0) {
BRCMF_ERROR(("%s: rx protocol error\n", __func__)); brcmf_dbg(ERROR, "rx protocol error\n");
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
bus->drvr->rx_errors++; bus->drvr->rx_errors++;
continue; continue;
...@@ -4255,11 +4181,11 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished) ...@@ -4255,11 +4181,11 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
#ifdef BCMDBG #ifdef BCMDBG
/* Message if we hit the limit */ /* Message if we hit the limit */
if (!rxleft) if (!rxleft)
BRCMF_DATA(("%s: hit rx limit of %d frames\n", __func__, brcmf_dbg(DATA, "hit rx limit of %d frames\n",
maxframes)); maxframes);
else else
#endif /* BCMDBG */ #endif /* BCMDBG */
BRCMF_DATA(("%s: processed %d frames\n", __func__, rxcount)); brcmf_dbg(DATA, "processed %d frames\n", rxcount);
/* Back off rxseq if awaiting rtx, update rx_seq */ /* Back off rxseq if awaiting rtx, update rx_seq */
if (bus->rxskip) if (bus->rxskip)
rxseq--; rxseq--;
...@@ -4275,7 +4201,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus) ...@@ -4275,7 +4201,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
u8 fcbits; u8 fcbits;
uint retries = 0; uint retries = 0;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Read mailbox data and ack that we did so */ /* Read mailbox data and ack that we did so */
r_sdreg32(bus, &hmb_data, r_sdreg32(bus, &hmb_data,
...@@ -4288,10 +4214,10 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus) ...@@ -4288,10 +4214,10 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
/* Dongle recomposed rx frames, accept them again */ /* Dongle recomposed rx frames, accept them again */
if (hmb_data & HMB_DATA_NAKHANDLED) { if (hmb_data & HMB_DATA_NAKHANDLED) {
BRCMF_INFO(("Dongle reports NAK handled, expect rtx of %d\n", brcmf_dbg(INFO, "Dongle reports NAK handled, expect rtx of %d\n",
bus->rx_seq)); bus->rx_seq);
if (!bus->rxskip) if (!bus->rxskip)
BRCMF_ERROR(("%s: unexpected NAKHANDLED!\n", __func__)); brcmf_dbg(ERROR, "unexpected NAKHANDLED!\n");
bus->rxskip = false; bus->rxskip = false;
intstatus |= I_HMB_FRAME_IND; intstatus |= I_HMB_FRAME_IND;
...@@ -4305,12 +4231,12 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus) ...@@ -4305,12 +4231,12 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
(hmb_data & HMB_DATA_VERSION_MASK) >> (hmb_data & HMB_DATA_VERSION_MASK) >>
HMB_DATA_VERSION_SHIFT; HMB_DATA_VERSION_SHIFT;
if (bus->sdpcm_ver != SDPCM_PROT_VERSION) if (bus->sdpcm_ver != SDPCM_PROT_VERSION)
BRCMF_ERROR(("Version mismatch, dongle reports %d, " brcmf_dbg(ERROR, "Version mismatch, dongle reports %d, "
"expecting %d\n", "expecting %d\n",
bus->sdpcm_ver, SDPCM_PROT_VERSION)); bus->sdpcm_ver, SDPCM_PROT_VERSION);
else else
BRCMF_INFO(("Dongle ready, protocol version %d\n", brcmf_dbg(INFO, "Dongle ready, protocol version %d\n",
bus->sdpcm_ver)); bus->sdpcm_ver);
} }
/* /*
...@@ -4338,8 +4264,8 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus) ...@@ -4338,8 +4264,8 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
HMB_DATA_FC | HMB_DATA_FC |
HMB_DATA_FWREADY | HMB_DATA_FWREADY |
HMB_DATA_FCDATA_MASK | HMB_DATA_VERSION_MASK)) HMB_DATA_FCDATA_MASK | HMB_DATA_VERSION_MASK))
BRCMF_ERROR(("Unknown mailbox data content: 0x%02x\n", brcmf_dbg(ERROR, "Unknown mailbox data content: 0x%02x\n",
hmb_data)); hmb_data);
return intstatus; return intstatus;
} }
...@@ -4354,7 +4280,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4354,7 +4280,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
bool rxdone = true; /* Flag for no more read data */ bool rxdone = true; /* Flag for no more read data */
bool resched = false; /* Flag indicating resched wanted */ bool resched = false; /* Flag indicating resched wanted */
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Start with leftover status bits */ /* Start with leftover status bits */
intstatus = bus->intstatus; intstatus = bus->intstatus;
...@@ -4371,8 +4297,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4371,8 +4297,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
devctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, devctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_DEVICE_CTL, &err); SBSDIO_DEVICE_CTL, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: error reading DEVCTL: %d\n", brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
__func__, err));
bus->drvr->busstate = BRCMF_BUS_DOWN; bus->drvr->busstate = BRCMF_BUS_DOWN;
} }
#endif /* BCMDBG */ #endif /* BCMDBG */
...@@ -4381,29 +4306,29 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4381,29 +4306,29 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_FUNC1_CHIPCLKCSR, &err); SBSDIO_FUNC1_CHIPCLKCSR, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: error reading CSR: %d\n", __func__, brcmf_dbg(ERROR, "error reading CSR: %d\n",
err)); err);
bus->drvr->busstate = BRCMF_BUS_DOWN; bus->drvr->busstate = BRCMF_BUS_DOWN;
} }
BRCMF_INFO(("DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n", brcmf_dbg(INFO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",
devctl, clkctl)); devctl, clkctl);
if (SBSDIO_HTAV(clkctl)) { if (SBSDIO_HTAV(clkctl)) {
devctl = brcmf_sdcard_cfg_read(bus->sdiodev, devctl = brcmf_sdcard_cfg_read(bus->sdiodev,
SDIO_FUNC_1, SDIO_FUNC_1,
SBSDIO_DEVICE_CTL, &err); SBSDIO_DEVICE_CTL, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: error reading DEVCTL: %d\n", brcmf_dbg(ERROR, "error reading DEVCTL: %d\n",
__func__, err)); err);
bus->drvr->busstate = BRCMF_BUS_DOWN; bus->drvr->busstate = BRCMF_BUS_DOWN;
} }
devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY; devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_DEVICE_CTL, devctl, &err); SBSDIO_DEVICE_CTL, devctl, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: error writing DEVCTL: %d\n", brcmf_dbg(ERROR, "error writing DEVCTL: %d\n",
__func__, err)); err);
bus->drvr->busstate = BRCMF_BUS_DOWN; bus->drvr->busstate = BRCMF_BUS_DOWN;
} }
bus->clkstate = CLK_AVAIL; bus->clkstate = CLK_AVAIL;
...@@ -4466,23 +4391,23 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4466,23 +4391,23 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
/* Generally don't ask for these, can get CRC errors... */ /* Generally don't ask for these, can get CRC errors... */
if (intstatus & I_WR_OOSYNC) { if (intstatus & I_WR_OOSYNC) {
BRCMF_ERROR(("Dongle reports WR_OOSYNC\n")); brcmf_dbg(ERROR, "Dongle reports WR_OOSYNC\n");
intstatus &= ~I_WR_OOSYNC; intstatus &= ~I_WR_OOSYNC;
} }
if (intstatus & I_RD_OOSYNC) { if (intstatus & I_RD_OOSYNC) {
BRCMF_ERROR(("Dongle reports RD_OOSYNC\n")); brcmf_dbg(ERROR, "Dongle reports RD_OOSYNC\n");
intstatus &= ~I_RD_OOSYNC; intstatus &= ~I_RD_OOSYNC;
} }
if (intstatus & I_SBINT) { if (intstatus & I_SBINT) {
BRCMF_ERROR(("Dongle reports SBINT\n")); brcmf_dbg(ERROR, "Dongle reports SBINT\n");
intstatus &= ~I_SBINT; intstatus &= ~I_SBINT;
} }
/* Would be active due to wake-wlan in gSPI */ /* Would be active due to wake-wlan in gSPI */
if (intstatus & I_CHIPACTIVE) { if (intstatus & I_CHIPACTIVE) {
BRCMF_INFO(("Dongle reports CHIPACTIVE\n")); brcmf_dbg(INFO, "Dongle reports CHIPACTIVE\n");
intstatus &= ~I_CHIPACTIVE; intstatus &= ~I_CHIPACTIVE;
} }
...@@ -4514,8 +4439,8 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4514,8 +4439,8 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
if (ret < 0) { if (ret < 0) {
/* On failure, abort the command and /* On failure, abort the command and
terminate the frame */ terminate the frame */
BRCMF_INFO(("%s: sdio error %d, abort command and " brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
"terminate frame.\n", __func__, ret)); ret);
bus->tx_sderrs++; bus->tx_sderrs++;
brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2); brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
...@@ -4544,7 +4469,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4544,7 +4469,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
if (ret == 0) if (ret == 0)
bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP; bus->tx_seq = (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP;
BRCMF_INFO(("Return_dpc value is : %d\n", ret)); brcmf_dbg(INFO, "Return_dpc value is : %d\n", ret);
bus->ctrl_frame_stat = false; bus->ctrl_frame_stat = false;
brcmf_sdbrcm_wait_event_wakeup(bus); brcmf_sdbrcm_wait_event_wakeup(bus);
} }
...@@ -4563,14 +4488,12 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus) ...@@ -4563,14 +4488,12 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
no resched or interrupts */ no resched or interrupts */
if ((bus->drvr->busstate == BRCMF_BUS_DOWN) || if ((bus->drvr->busstate == BRCMF_BUS_DOWN) ||
brcmf_sdcard_regfail(bus->sdiodev)) { brcmf_sdcard_regfail(bus->sdiodev)) {
BRCMF_ERROR(("%s: failed backplane access over SDIO, halting " brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation %d\n",
"operation %d\n", __func__, brcmf_sdcard_regfail(bus->sdiodev));
brcmf_sdcard_regfail(bus->sdiodev)));
bus->drvr->busstate = BRCMF_BUS_DOWN; bus->drvr->busstate = BRCMF_BUS_DOWN;
bus->intstatus = 0; bus->intstatus = 0;
} else if (bus->clkstate == CLK_PENDING) { } else if (bus->clkstate == CLK_PENDING) {
BRCMF_INFO(("%s: rescheduled due to CLK_PENDING awaiting " brcmf_dbg(INFO, "rescheduled due to CLK_PENDING awaiting I_CHIPACTIVE interrupt\n");
"I_CHIPACTIVE interrupt\n", __func__));
resched = true; resched = true;
} else if (bus->intstatus || bus->ipend || } else if (bus->intstatus || bus->ipend ||
(!bus->fcstate && brcmu_pktq_mlen(&bus->txq, ~bus->flowcontrol) (!bus->fcstate && brcmu_pktq_mlen(&bus->txq, ~bus->flowcontrol)
...@@ -4596,16 +4519,15 @@ void brcmf_sdbrcm_isr(void *arg) ...@@ -4596,16 +4519,15 @@ void brcmf_sdbrcm_isr(void *arg)
{ {
struct brcmf_bus *bus = (struct brcmf_bus *) arg; struct brcmf_bus *bus = (struct brcmf_bus *) arg;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (!bus) { if (!bus) {
BRCMF_ERROR(("%s : bus is null pointer , exit\n", __func__)); brcmf_dbg(ERROR, "bus is null pointer, exiting\n");
return; return;
} }
if (bus->drvr->busstate == BRCMF_BUS_DOWN) { if (bus->drvr->busstate == BRCMF_BUS_DOWN) {
BRCMF_ERROR(("%s : bus is down. we have nothing to do\n", brcmf_dbg(ERROR, "bus is down. we have nothing to do\n");
__func__));
return; return;
} }
/* Count the interrupt call */ /* Count the interrupt call */
...@@ -4614,16 +4536,16 @@ void brcmf_sdbrcm_isr(void *arg) ...@@ -4614,16 +4536,16 @@ void brcmf_sdbrcm_isr(void *arg)
/* Shouldn't get this interrupt if we're sleeping? */ /* Shouldn't get this interrupt if we're sleeping? */
if (bus->sleeping) { if (bus->sleeping) {
BRCMF_ERROR(("INTERRUPT WHILE SLEEPING??\n")); brcmf_dbg(ERROR, "INTERRUPT WHILE SLEEPING??\n");
return; return;
} }
/* Disable additional interrupts (is this needed now)? */ /* Disable additional interrupts (is this needed now)? */
if (!bus->intr) if (!bus->intr)
BRCMF_ERROR(("brcmf_sdbrcm_isr() w/o interrupt configured!\n")); brcmf_dbg(ERROR, "isr w/o interrupt configured!\n");
#if defined(SDIO_ISR_THREAD) #if defined(SDIO_ISR_THREAD)
BRCMF_TRACE(("Calling brcmf_sdbrcm_dpc() from %s\n", __func__)); brcmf_dbg(TRACE, "Calling brcmf_sdbrcm_dpc()\n");
while (brcmf_sdbrcm_dpc(bus)) while (brcmf_sdbrcm_dpc(bus))
; ;
#else #else
...@@ -4637,7 +4559,7 @@ extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr) ...@@ -4637,7 +4559,7 @@ extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
{ {
struct brcmf_bus *bus; struct brcmf_bus *bus;
BRCMF_TIMER(("%s: Enter\n", __func__)); brcmf_dbg(TIMER, "Enter\n");
bus = drvr->bus; bus = drvr->bus;
...@@ -4817,7 +4739,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype, ...@@ -4817,7 +4739,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
brcmf_c_init(); brcmf_c_init();
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* We make an assumption about address window mappings: /* We make an assumption about address window mappings:
* regsva == SI_ENUM_BASE*/ * regsva == SI_ENUM_BASE*/
...@@ -4825,8 +4747,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype, ...@@ -4825,8 +4747,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
/* Allocate private bus interface state */ /* Allocate private bus interface state */
bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC); bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
if (!bus) { if (!bus) {
BRCMF_ERROR(("%s: kmalloc of struct dhd_bus failed\n", brcmf_dbg(ERROR, "kmalloc of struct dhd_bus failed\n");
__func__));
goto fail; goto fail;
} }
bus->sdiodev = sdiodev; bus->sdiodev = sdiodev;
...@@ -4837,8 +4758,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype, ...@@ -4837,8 +4758,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
/* attempt to attach to the dongle */ /* attempt to attach to the dongle */
if (!(brcmf_sdbrcm_probe_attach(bus, regsva))) { if (!(brcmf_sdbrcm_probe_attach(bus, regsva))) {
BRCMF_ERROR(("%s: brcmf_sdbrcm_probe_attach failed\n", brcmf_dbg(ERROR, "brcmf_sdbrcm_probe_attach failed\n");
__func__));
goto fail; goto fail;
} }
...@@ -4893,47 +4813,43 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype, ...@@ -4893,47 +4813,43 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
/* Attach to the brcmf/OS/network interface */ /* Attach to the brcmf/OS/network interface */
bus->drvr = brcmf_attach(bus, SDPCM_RESERVE); bus->drvr = brcmf_attach(bus, SDPCM_RESERVE);
if (!bus->drvr) { if (!bus->drvr) {
BRCMF_ERROR(("%s: brcmf_attach failed\n", __func__)); brcmf_dbg(ERROR, "brcmf_attach failed\n");
goto fail; goto fail;
} }
/* Allocate buffers */ /* Allocate buffers */
if (!(brcmf_sdbrcm_probe_malloc(bus))) { if (!(brcmf_sdbrcm_probe_malloc(bus))) {
BRCMF_ERROR(("%s: brcmf_sdbrcm_probe_malloc failed\n", brcmf_dbg(ERROR, "brcmf_sdbrcm_probe_malloc failed\n");
__func__));
goto fail; goto fail;
} }
if (!(brcmf_sdbrcm_probe_init(bus))) { if (!(brcmf_sdbrcm_probe_init(bus))) {
BRCMF_ERROR(("%s: brcmf_sdbrcm_probe_init failed\n", __func__)); brcmf_dbg(ERROR, "brcmf_sdbrcm_probe_init failed\n");
goto fail; goto fail;
} }
/* Register interrupt callback, but mask it (not operational yet). */ /* Register interrupt callback, but mask it (not operational yet). */
BRCMF_INTR(("%s: disable SDIO interrupts (not interested yet)\n", brcmf_dbg(INTR, "disable SDIO interrupts (not interested yet)\n");
__func__));
ret = brcmf_sdcard_intr_reg(bus->sdiodev); ret = brcmf_sdcard_intr_reg(bus->sdiodev);
if (ret != 0) { if (ret != 0) {
BRCMF_ERROR(("%s: FAILED: sdcard_intr_reg returned %d\n", brcmf_dbg(ERROR, "FAILED: sdcard_intr_reg returned %d\n", ret);
__func__, ret));
goto fail; goto fail;
} }
BRCMF_INTR(("%s: registered SDIO interrupt function ok\n", __func__)); brcmf_dbg(INTR, "registered SDIO interrupt function ok\n");
BRCMF_INFO(("%s: completed!!\n", __func__)); brcmf_dbg(INFO, "completed!!\n");
/* if firmware path present try to download and bring up bus */ /* if firmware path present try to download and bring up bus */
ret = brcmf_bus_start(bus->drvr); ret = brcmf_bus_start(bus->drvr);
if (ret != 0) { if (ret != 0) {
if (ret == -ENOLINK) { if (ret == -ENOLINK) {
BRCMF_ERROR(("%s: dongle is not responding\n", brcmf_dbg(ERROR, "dongle is not responding\n");
__func__));
goto fail; goto fail;
} }
} }
/* Ok, have the per-port tell the stack we're open for business */ /* Ok, have the per-port tell the stack we're open for business */
if (brcmf_net_attach(bus->drvr, 0) != 0) { if (brcmf_net_attach(bus->drvr, 0) != 0) {
BRCMF_ERROR(("%s: Net attach failed!!\n", __func__)); brcmf_dbg(ERROR, "Net attach failed!!\n");
goto fail; goto fail;
} }
...@@ -4956,8 +4872,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) ...@@ -4956,8 +4872,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
/* Return the window to backplane enumeration space for core access */ /* Return the window to backplane enumeration space for core access */
if (brcmf_sdbrcm_set_siaddr_window(bus, SI_ENUM_BASE)) if (brcmf_sdbrcm_set_siaddr_window(bus, SI_ENUM_BASE))
BRCMF_ERROR(("%s: FAILED to return to SI_ENUM_BASE\n", brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
__func__));
#ifdef BCMDBG #ifdef BCMDBG
printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n", printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n",
...@@ -4979,21 +4894,18 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) ...@@ -4979,21 +4894,18 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
SBSDIO_FUNC1_CHIPCLKCSR, &err); SBSDIO_FUNC1_CHIPCLKCSR, &err);
if (err || ((clkctl & ~SBSDIO_AVBITS) != BRCMF_INIT_CLKCTL1)) { if (err || ((clkctl & ~SBSDIO_AVBITS) != BRCMF_INIT_CLKCTL1)) {
BRCMF_ERROR(("brcmf_sdbrcm_probe: ChipClkCSR access: err %d" brcmf_dbg(ERROR, "ChipClkCSR access: err %d wrote 0x%02x read 0x%02x\n",
" wrote 0x%02x read 0x%02x\n", err, BRCMF_INIT_CLKCTL1, clkctl);
err, BRCMF_INIT_CLKCTL1, clkctl));
goto fail; goto fail;
} }
if (brcmf_sdbrcm_chip_attach(bus, regsva)) { if (brcmf_sdbrcm_chip_attach(bus, regsva)) {
BRCMF_ERROR(("%s: brcmf_sdbrcm_chip_attach failed!\n", brcmf_dbg(ERROR, "brcmf_sdbrcm_chip_attach failed!\n");
__func__));
goto fail; goto fail;
} }
if (!brcmf_sdbrcm_chipmatch((u16) bus->ci->chip)) { if (!brcmf_sdbrcm_chipmatch((u16) bus->ci->chip)) {
BRCMF_ERROR(("%s: unsupported chip: 0x%04x\n", brcmf_dbg(ERROR, "unsupported chip: 0x%04x\n", bus->ci->chip);
__func__, bus->ci->chip));
goto fail; goto fail;
} }
...@@ -5004,16 +4916,15 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) ...@@ -5004,16 +4916,15 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
CORE_SB(bus->ci->armcorebase, sbidhigh), 4); CORE_SB(bus->ci->armcorebase, sbidhigh), 4);
bus->orig_ramsize = bus->ci->ramsize; bus->orig_ramsize = bus->ci->ramsize;
if (!(bus->orig_ramsize)) { if (!(bus->orig_ramsize)) {
BRCMF_ERROR(("%s: failed to find SOCRAM memory!\n", brcmf_dbg(ERROR, "failed to find SOCRAM memory!\n");
__func__));
goto fail; goto fail;
} }
bus->ramsize = bus->orig_ramsize; bus->ramsize = bus->orig_ramsize;
if (brcmf_dongle_memsize) if (brcmf_dongle_memsize)
brcmf_sdbrcm_setmemsize(bus, brcmf_dongle_memsize); brcmf_sdbrcm_setmemsize(bus, brcmf_dongle_memsize);
BRCMF_ERROR(("DHD: dongle ram size is set to %d(orig %d)\n", brcmf_dbg(ERROR, "DHD: dongle ram size is set to %d(orig %d)\n",
bus->ramsize, bus->orig_ramsize)); bus->ramsize, bus->orig_ramsize);
/* Set core control so an SDIO reset does a backplane reset */ /* Set core control so an SDIO reset does a backplane reset */
reg_addr = bus->ci->buscorebase + reg_addr = bus->ci->buscorebase +
...@@ -5042,7 +4953,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva) ...@@ -5042,7 +4953,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus) static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr->maxctl) { if (bus->drvr->maxctl) {
bus->rxblen = bus->rxblen =
...@@ -5050,8 +4961,8 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus) ...@@ -5050,8 +4961,8 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
ALIGNMENT) + BRCMF_SDALIGN; ALIGNMENT) + BRCMF_SDALIGN;
bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC); bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC);
if (!(bus->rxbuf)) { if (!(bus->rxbuf)) {
BRCMF_ERROR(("%s: kmalloc of %d-byte rxbuf failed\n", brcmf_dbg(ERROR, "kmalloc of %d-byte rxbuf failed\n",
__func__, bus->rxblen)); bus->rxblen);
goto fail; goto fail;
} }
} }
...@@ -5059,8 +4970,8 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus) ...@@ -5059,8 +4970,8 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
/* Allocate buffer to receive glomed packet */ /* Allocate buffer to receive glomed packet */
bus->databuf = kmalloc(MAX_DATA_BUF, GFP_ATOMIC); bus->databuf = kmalloc(MAX_DATA_BUF, GFP_ATOMIC);
if (!(bus->databuf)) { if (!(bus->databuf)) {
BRCMF_ERROR(("%s: kmalloc of %d-byte databuf failed\n", brcmf_dbg(ERROR, "kmalloc of %d-byte databuf failed\n",
__func__, MAX_DATA_BUF)); MAX_DATA_BUF);
/* release rxbuf which was already located as above */ /* release rxbuf which was already located as above */
if (!bus->rxblen) if (!bus->rxblen)
kfree(bus->rxbuf); kfree(bus->rxbuf);
...@@ -5082,7 +4993,7 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus) ...@@ -5082,7 +4993,7 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus) static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Disable F2 to clear any intermediate frame state on the dongle */ /* Disable F2 to clear any intermediate frame state on the dongle */
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
...@@ -5112,9 +5023,8 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus) ...@@ -5112,9 +5023,8 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
false) != 0) false) != 0)
bus->sd_rxchain = false; bus->sd_rxchain = false;
else else
BRCMF_INFO(("%s: bus module (through sdiocard API) %s" brcmf_dbg(INFO, "bus module (through sdiocard API) %s chaining\n",
" chaining\n", __func__, bus->sd_rxchain bus->sd_rxchain ? "supports" : "does not support");
? "supports" : "does not support"));
bus->use_rxchain = (bool) bus->sd_rxchain; bus->use_rxchain = (bool) bus->sd_rxchain;
...@@ -5139,7 +5049,7 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus) ...@@ -5139,7 +5049,7 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
/* Detach and free everything */ /* Detach and free everything */
static void brcmf_sdbrcm_release(struct brcmf_bus *bus) static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus) { if (bus) {
/* De-register interrupt handler */ /* De-register interrupt handler */
...@@ -5156,12 +5066,12 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus) ...@@ -5156,12 +5066,12 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
kfree(bus); kfree(bus);
} }
BRCMF_TRACE(("%s: Disconnected\n", __func__)); brcmf_dbg(TRACE, "Disconnected\n");
} }
static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus) static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr && bus->drvr->dongle_reset) if (bus->drvr && bus->drvr->dongle_reset)
return; return;
...@@ -5176,7 +5086,7 @@ static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus) ...@@ -5176,7 +5086,7 @@ static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus) static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus->drvr && bus->drvr->dongle_reset) if (bus->drvr && bus->drvr->dongle_reset)
return; return;
...@@ -5190,24 +5100,24 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus) ...@@ -5190,24 +5100,24 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
bus->vars = NULL; bus->vars = NULL;
} }
BRCMF_TRACE(("%s: Disconnected\n", __func__)); brcmf_dbg(TRACE, "Disconnected\n");
} }
void brcmf_sdbrcm_disconnect(void *ptr) void brcmf_sdbrcm_disconnect(void *ptr)
{ {
struct brcmf_bus *bus = (struct brcmf_bus *)ptr; struct brcmf_bus *bus = (struct brcmf_bus *)ptr;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
if (bus) if (bus)
brcmf_sdbrcm_release(bus); brcmf_sdbrcm_release(bus);
BRCMF_TRACE(("%s: Disconnected\n", __func__)); brcmf_dbg(TRACE, "Disconnected\n");
} }
int brcmf_bus_register(void) int brcmf_bus_register(void)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* Sanity check on the module parameters */ /* Sanity check on the module parameters */
do { do {
...@@ -5220,7 +5130,7 @@ int brcmf_bus_register(void) ...@@ -5220,7 +5130,7 @@ int brcmf_bus_register(void)
&& brcmf_deferred_tx) && brcmf_deferred_tx)
break; break;
BRCMF_ERROR(("Invalid module parameters.\n")); brcmf_dbg(ERROR, "Invalid module parameters.\n");
return -EINVAL; return -EINVAL;
} while (0); } while (0);
...@@ -5229,7 +5139,7 @@ int brcmf_bus_register(void) ...@@ -5229,7 +5139,7 @@ int brcmf_bus_register(void)
void brcmf_bus_unregister(void) void brcmf_bus_unregister(void)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
brcmf_sdio_unregister(); brcmf_sdio_unregister();
} }
...@@ -5241,22 +5151,21 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus) ...@@ -5241,22 +5151,21 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
u8 *memblock = NULL, *memptr; u8 *memblock = NULL, *memptr;
int ret; int ret;
BRCMF_INFO(("%s: Enter\n", __func__)); brcmf_dbg(INFO, "Enter\n");
bus->fw_name = BCM4329_FW_NAME; bus->fw_name = BCM4329_FW_NAME;
ret = request_firmware(&bus->firmware, bus->fw_name, ret = request_firmware(&bus->firmware, bus->fw_name,
&bus->sdiodev->func[2]->dev); &bus->sdiodev->func[2]->dev);
if (ret) { if (ret) {
BRCMF_ERROR(("%s: Fail to request firmware %d\n", brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
__func__, ret));
return ret; return ret;
} }
bus->fw_ptr = 0; bus->fw_ptr = 0;
memptr = memblock = kmalloc(MEMBLOCK + BRCMF_SDALIGN, GFP_ATOMIC); memptr = memblock = kmalloc(MEMBLOCK + BRCMF_SDALIGN, GFP_ATOMIC);
if (memblock == NULL) { if (memblock == NULL) {
BRCMF_ERROR(("%s: Failed to allocate memory %d bytes\n", brcmf_dbg(ERROR, "Failed to allocate memory %d bytes\n",
__func__, MEMBLOCK)); MEMBLOCK);
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
} }
...@@ -5269,9 +5178,8 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus) ...@@ -5269,9 +5178,8 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
brcmf_sdbrcm_get_image((char *)memptr, MEMBLOCK, bus))) { brcmf_sdbrcm_get_image((char *)memptr, MEMBLOCK, bus))) {
ret = brcmf_sdbrcm_membytes(bus, true, offset, memptr, len); ret = brcmf_sdbrcm_membytes(bus, true, offset, memptr, len);
if (ret) { if (ret) {
BRCMF_ERROR(("%s: error %d on writing %d membytes at " brcmf_dbg(ERROR, "error %d on writing %d membytes at 0x%08x\n",
"0x%08x\n", __func__, ret, MEMBLOCK, ret, MEMBLOCK, offset);
offset));
goto err; goto err;
} }
...@@ -5349,15 +5257,15 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus) ...@@ -5349,15 +5257,15 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
ret = request_firmware(&bus->firmware, bus->nv_name, ret = request_firmware(&bus->firmware, bus->nv_name,
&bus->sdiodev->func[2]->dev); &bus->sdiodev->func[2]->dev);
if (ret) { if (ret) {
BRCMF_ERROR(("%s: Fail to request nvram %d\n", __func__, ret)); brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
return ret; return ret;
} }
bus->fw_ptr = 0; bus->fw_ptr = 0;
memblock = kmalloc(MEMBLOCK, GFP_ATOMIC); memblock = kmalloc(MEMBLOCK, GFP_ATOMIC);
if (memblock == NULL) { if (memblock == NULL) {
BRCMF_ERROR(("%s: Failed to allocate memory %d bytes\n", brcmf_dbg(ERROR, "Failed to allocate memory %d bytes\n",
__func__, MEMBLOCK)); MEMBLOCK);
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
} }
...@@ -5373,11 +5281,9 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus) ...@@ -5373,11 +5281,9 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
if (len) if (len)
ret = brcmf_sdbrcm_downloadvars(bus, memblock, len + 1); ret = brcmf_sdbrcm_downloadvars(bus, memblock, len + 1);
if (ret) if (ret)
BRCMF_ERROR(("%s: error downloading vars: %d\n", brcmf_dbg(ERROR, "error downloading vars: %d\n", ret);
__func__, ret));
} else { } else {
BRCMF_ERROR(("%s: error reading nvram file: %d\n", brcmf_dbg(ERROR, "error reading nvram file: %d\n", len);
__func__, len));
ret = -EIO; ret = -EIO;
} }
...@@ -5396,27 +5302,23 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus) ...@@ -5396,27 +5302,23 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
/* Keep arm in reset */ /* Keep arm in reset */
if (brcmf_sdbrcm_download_state(bus, true)) { if (brcmf_sdbrcm_download_state(bus, true)) {
BRCMF_ERROR(("%s: error placing ARM core in reset\n", brcmf_dbg(ERROR, "error placing ARM core in reset\n");
__func__));
goto err; goto err;
} }
/* External image takes precedence if specified */ /* External image takes precedence if specified */
if (brcmf_sdbrcm_download_code_file(bus)) { if (brcmf_sdbrcm_download_code_file(bus)) {
BRCMF_ERROR(("%s: dongle image file download failed\n", brcmf_dbg(ERROR, "dongle image file download failed\n");
__func__));
goto err; goto err;
} }
/* External nvram takes precedence if specified */ /* External nvram takes precedence if specified */
if (brcmf_sdbrcm_download_nvram(bus)) if (brcmf_sdbrcm_download_nvram(bus))
BRCMF_ERROR(("%s: dongle nvram file download failed\n", brcmf_dbg(ERROR, "dongle nvram file download failed\n");
__func__));
/* Take arm out of reset */ /* Take arm out of reset */
if (brcmf_sdbrcm_download_state(bus, false)) { if (brcmf_sdbrcm_download_state(bus, false)) {
BRCMF_ERROR(("%s: error getting out of ARM core reset\n", brcmf_dbg(ERROR, "error getting out of ARM core reset\n");
__func__));
goto err; goto err;
} }
...@@ -5457,14 +5359,14 @@ int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag) ...@@ -5457,14 +5359,14 @@ int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag)
bus->drvr->dongle_reset = true; bus->drvr->dongle_reset = true;
bus->drvr->up = false; bus->drvr->up = false;
BRCMF_TRACE(("%s: WLAN OFF DONE\n", __func__)); brcmf_dbg(TRACE, "WLAN OFF DONE\n");
/* App can now remove power from device */ /* App can now remove power from device */
} else } else
bcmerror = -EIO; bcmerror = -EIO;
} else { } else {
/* App must have restored power to device before calling */ /* App must have restored power to device before calling */
BRCMF_TRACE(("\n\n%s: == WLAN ON ==\n", __func__)); brcmf_dbg(TRACE, " == WLAN ON ==\n");
if (bus->drvr->dongle_reset) { if (bus->drvr->dongle_reset) {
/* Turn on WLAN */ /* Turn on WLAN */
...@@ -5479,16 +5381,14 @@ int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag) ...@@ -5479,16 +5381,14 @@ int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag)
bus->drvr->dongle_reset = false; bus->drvr->dongle_reset = false;
bus->drvr->up = true; bus->drvr->up = true;
BRCMF_TRACE(("%s: WLAN ON DONE\n", brcmf_dbg(TRACE, "WLAN ON DONE\n");
__func__));
} else } else
bcmerror = -EIO; bcmerror = -EIO;
} else } else
bcmerror = -EIO; bcmerror = -EIO;
} else { } else {
bcmerror = -EISCONN; bcmerror = -EISCONN;
BRCMF_ERROR(("%s: Set DEVRESET=false invoked when" brcmf_dbg(ERROR, "Set DEVRESET=false invoked when device is on\n");
" device is on\n", __func__));
bcmerror = -EIO; bcmerror = -EIO;
} }
brcmf_sdbrcm_wd_timer(bus, brcmf_watchdog_ms); brcmf_sdbrcm_wd_timer(bus, brcmf_watchdog_ms);
...@@ -5514,8 +5414,7 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev, ...@@ -5514,8 +5414,7 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev,
ci->chip = regdata & CID_ID_MASK; ci->chip = regdata & CID_ID_MASK;
ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT; ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT;
BRCMF_INFO(("%s: chipid=0x%x chiprev=%d\n", brcmf_dbg(INFO, "chipid=0x%x chiprev=%d\n", ci->chip, ci->chiprev);
__func__, ci->chip, ci->chiprev));
/* Address of cores for new chips should be added here */ /* Address of cores for new chips should be added here */
switch (ci->chip) { switch (ci->chip) {
...@@ -5526,8 +5425,7 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev, ...@@ -5526,8 +5425,7 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev,
ci->ramsize = BCM4329_RAMSIZE; ci->ramsize = BCM4329_RAMSIZE;
break; break;
default: default:
BRCMF_ERROR(("%s: chipid 0x%x is not supported\n", brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci->chip);
__func__, ci->chip));
return -ENODEV; return -ENODEV;
} }
...@@ -5544,9 +5442,8 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev, ...@@ -5544,9 +5442,8 @@ brcmf_sdbrcm_chip_recognition(struct brcmf_sdio_dev *sdiodev,
ci->buscorerev = SBCOREREV(regdata); ci->buscorerev = SBCOREREV(regdata);
ci->buscoretype = (regdata & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT; ci->buscoretype = (regdata & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT;
BRCMF_INFO(("%s: ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n", brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",
__func__, ci->ccrev, ci->pmurev, ci->ccrev, ci->pmurev, ci->buscorerev, ci->buscoretype);
ci->buscorerev, ci->buscoretype));
/* get chipcommon capabilites */ /* get chipcommon capabilites */
ci->cccaps = brcmf_sdcard_reg_read(sdiodev, ci->cccaps = brcmf_sdcard_reg_read(sdiodev,
...@@ -5587,7 +5484,7 @@ brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_dev *sdiodev, u32 corebase) ...@@ -5587,7 +5484,7 @@ brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_dev *sdiodev, u32 corebase)
regdata = brcmf_sdcard_reg_read(sdiodev, regdata = brcmf_sdcard_reg_read(sdiodev,
CORE_SB(corebase, sbtmstatehigh), 4); CORE_SB(corebase, sbtmstatehigh), 4);
if (regdata & SBTMH_BUSY) if (regdata & SBTMH_BUSY)
BRCMF_ERROR(("%s: ARM core still busy\n", __func__)); brcmf_dbg(ERROR, "ARM core still busy\n");
regdata = brcmf_sdcard_reg_read(sdiodev, regdata = brcmf_sdcard_reg_read(sdiodev,
CORE_SB(corebase, sbidlow), 4); CORE_SB(corebase, sbidlow), 4);
...@@ -5641,12 +5538,12 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) ...@@ -5641,12 +5538,12 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)
int err; int err;
u8 clkval, clkset; u8 clkval, clkset;
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
/* alloc chip_info_t */ /* alloc chip_info_t */
ci = kzalloc(sizeof(struct chip_info), GFP_ATOMIC); ci = kzalloc(sizeof(struct chip_info), GFP_ATOMIC);
if (NULL == ci) { if (NULL == ci) {
BRCMF_ERROR(("%s: malloc failed!\n", __func__)); brcmf_dbg(ERROR, "malloc failed!\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -5656,7 +5553,7 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) ...@@ -5656,7 +5553,7 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)
brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err); SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
if (err) { if (err) {
BRCMF_ERROR(("%s: error writing for HT off\n", __func__)); brcmf_dbg(ERROR, "error writing for HT off\n");
goto fail; goto fail;
} }
...@@ -5672,8 +5569,8 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) ...@@ -5672,8 +5569,8 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)
!SBSDIO_ALPAV(clkval)), !SBSDIO_ALPAV(clkval)),
PMU_MAX_TRANSITION_DLY); PMU_MAX_TRANSITION_DLY);
if (!SBSDIO_ALPAV(clkval)) { if (!SBSDIO_ALPAV(clkval)) {
BRCMF_ERROR(("%s: timeout on ALPAV wait," brcmf_dbg(ERROR, "timeout on ALPAV wait, clkval 0x%02x\n",
" clkval 0x%02x\n", __func__, clkval)); clkval);
err = -EBUSY; err = -EBUSY;
goto fail; goto fail;
} }
...@@ -5684,8 +5581,8 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) ...@@ -5684,8 +5581,8 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)
clkset, &err); clkset, &err);
udelay(65); udelay(65);
} else { } else {
BRCMF_ERROR(("%s: ChipClkCSR access: wrote 0x%02x" brcmf_dbg(ERROR, "ChipClkCSR access: wrote 0x%02x read 0x%02x\n",
" read 0x%02x\n", __func__, clkset, clkval)); clkset, clkval);
err = -EACCES; err = -EACCES;
goto fail; goto fail;
} }
...@@ -5844,10 +5741,9 @@ static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus, ...@@ -5844,10 +5741,9 @@ static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,
str_shift = 11; str_shift = 11;
break; break;
default: default:
BRCMF_ERROR(("No SDIO Drive strength init" brcmf_dbg(ERROR, "No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",
"done for chip %s rev %d pmurev %d\n", brcmu_chipname(bus->ci->chip, chn, 8),
brcmu_chipname(bus->ci->chip, chn, 8), bus->ci->chiprev, bus->ci->pmurev);
bus->ci->chiprev, bus->ci->pmurev));
break; break;
} }
...@@ -5875,15 +5771,15 @@ static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus, ...@@ -5875,15 +5771,15 @@ static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,
CORE_CC_REG(bus->ci->cccorebase, chipcontrol_addr), CORE_CC_REG(bus->ci->cccorebase, chipcontrol_addr),
4, cc_data_temp); 4, cc_data_temp);
BRCMF_INFO(("SDIO: %dmA drive strength selected, " brcmf_dbg(INFO, "SDIO: %dmA drive strength selected, set to 0x%08x\n",
"set to 0x%08x\n", drivestrength, cc_data_temp)); drivestrength, cc_data_temp);
} }
} }
static void static void
brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus) brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus)
{ {
BRCMF_TRACE(("%s: Enter\n", __func__)); brcmf_dbg(TRACE, "Enter\n");
kfree(bus->ci); kfree(bus->ci);
bus->ci = NULL; bus->ci = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7