Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 369147
b: refs/heads/master
c: c320337
h: refs/heads/master
i:
  369145: 9538d85
  369143: e7aba41
v: v3
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Apr 3, 2013
1 parent f92e9e2 commit 19d9f4c
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5cd02c7747596078e6b01f07f978fa8a10f4e9da
refs/heads/master: c3203374bea328af54843bd72f9306e6c7832db4
30 changes: 15 additions & 15 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
u8 data;
unsigned long flags;

brcmf_dbg(TRACE, "Entering: irq %d\n", sdiodev->irq);
brcmf_dbg(SDIO, "Entering: irq %d\n", sdiodev->irq);

ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler,
sdiodev->irq_flags, "brcmf_oob_intr",
Expand Down Expand Up @@ -102,7 +102,7 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)

int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
{
brcmf_dbg(TRACE, "Entering\n");
brcmf_dbg(SDIO, "Entering\n");

sdio_claim_host(sdiodev->func[1]);
brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
Expand Down Expand Up @@ -136,7 +136,7 @@ static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func)

int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
{
brcmf_dbg(TRACE, "Entering\n");
brcmf_dbg(SDIO, "Entering\n");

sdio_claim_host(sdiodev->func[1]);
sdio_claim_irq(sdiodev->func[1], brcmf_sdio_irqhandler);
Expand All @@ -148,7 +148,7 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)

int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
{
brcmf_dbg(TRACE, "Entering\n");
brcmf_dbg(SDIO, "Entering\n");

sdio_claim_host(sdiodev->func[1]);
sdio_release_irq(sdiodev->func[2]);
Expand Down Expand Up @@ -253,9 +253,9 @@ u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
u8 data;
int retval;

brcmf_dbg(INFO, "addr:0x%08x\n", addr);
brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
brcmf_dbg(INFO, "data:0x%02x\n", data);
brcmf_dbg(SDIO, "data:0x%02x\n", data);

if (ret)
*ret = retval;
Expand All @@ -268,9 +268,9 @@ u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
u32 data;
int retval;

brcmf_dbg(INFO, "addr:0x%08x\n", addr);
brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
brcmf_dbg(INFO, "data:0x%08x\n", data);
brcmf_dbg(SDIO, "data:0x%08x\n", data);

if (ret)
*ret = retval;
Expand All @@ -283,7 +283,7 @@ void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,
{
int retval;

brcmf_dbg(INFO, "addr:0x%08x, data:0x%02x\n", addr, data);
brcmf_dbg(SDIO, "addr:0x%08x, data:0x%02x\n", addr, data);
retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);

if (ret)
Expand All @@ -295,7 +295,7 @@ void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
{
int retval;

brcmf_dbg(INFO, "addr:0x%08x, data:0x%08x\n", addr, data);
brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);

if (ret)
Expand Down Expand Up @@ -358,7 +358,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint width;
int err = 0;

brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
fn, addr, pkt->len);

width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
Expand All @@ -381,7 +381,7 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint width;
int err = 0;

brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
fn, addr, pktq->qlen);

width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
Expand Down Expand Up @@ -428,7 +428,7 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;

brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
fn, addr, pkt->len);

/* Async not implemented yet */
Expand Down Expand Up @@ -492,13 +492,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)
{
char t_func = (char)fn;
brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

/* issue abort cmd52 command through F0 */
brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0,
SDIO_CCCR_ABORT, &t_func);

brcmf_dbg(TRACE, "Exit\n");
brcmf_dbg(SDIO, "Exit\n");
return 0;
}

Expand Down
60 changes: 30 additions & 30 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,
{
int err_ret;

brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);
brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);

brcmf_pm_resume_wait(sdiodev, &sdiodev->request_byte_wait);
if (brcmf_pm_resume_error(sdiodev))
Expand Down Expand Up @@ -179,7 +179,7 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
return -EINVAL;
}

brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
rw, func, addr, nbytes);

brcmf_pm_resume_wait(sdiodev, &sdiodev->request_word_wait);
Expand Down Expand Up @@ -252,7 +252,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,

struct sk_buff *pkt;

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait);
if (brcmf_pm_resume_error(sdiodev))
Expand All @@ -270,7 +270,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
write ? "TX" : "RX", pkt, SGCount, addr,
pkt_len, err_ret);
} else {
brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
brcmf_dbg(SDIO, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
write ? "TX" : "RX", pkt, SGCount, addr,
pkt_len);
}
Expand All @@ -280,7 +280,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
SGCount++;
}

brcmf_dbg(TRACE, "Exit\n");
brcmf_dbg(SDIO, "Exit\n");
return err_ret;
}

Expand All @@ -295,7 +295,7 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
uint pkt_len;
bool fifo = (fix_inc == SDIOH_DATA_FIX);

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

if (pkt == NULL)
return -EINVAL;
Expand All @@ -314,7 +314,7 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
brcmf_err("%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
write ? "TX" : "RX", pkt, addr, pkt_len, status);
} else {
brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n",
brcmf_dbg(SDIO, "%s xfr'd %p, addr=0x%05x, len=%d\n",
write ? "TX" : "RX", pkt, addr, pkt_len);
}

Expand Down Expand Up @@ -350,20 +350,20 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)
u32 fbraddr;
u8 func;

brcmf_dbg(TRACE, "\n");
brcmf_dbg(SDIO, "\n");

/* Get the Card's common CIS address */
sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev,
SDIO_CCCR_CIS);
brcmf_dbg(INFO, "Card's Common CIS Ptr = 0x%x\n",
brcmf_dbg(SDIO, "Card's Common CIS Ptr = 0x%x\n",
sdiodev->func_cis_ptr[0]);

/* Get the Card's function CIS (for each function) */
for (fbraddr = SDIO_FBR_BASE(1), func = 1;
func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {
sdiodev->func_cis_ptr[func] =
brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr);
brcmf_dbg(INFO, "Function %d CIS Ptr = 0x%x\n",
brcmf_dbg(SDIO, "Function %d CIS Ptr = 0x%x\n",
func, sdiodev->func_cis_ptr[func]);
}

Expand All @@ -382,7 +382,7 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
{
int err_ret = 0;

brcmf_dbg(TRACE, "\n");
brcmf_dbg(SDIO, "\n");

sdiodev->num_funcs = 2;

Expand All @@ -404,13 +404,13 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)

out:
sdio_release_host(sdiodev->func[1]);
brcmf_dbg(TRACE, "Done\n");
brcmf_dbg(SDIO, "Done\n");
return err_ret;
}

void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)
{
brcmf_dbg(TRACE, "\n");
brcmf_dbg(SDIO, "\n");

/* Disable Function 2 */
sdio_claim_host(sdiodev->func[2]);
Expand Down Expand Up @@ -458,11 +458,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
struct brcmf_sdio_dev *sdiodev;
struct brcmf_bus *bus_if;

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(TRACE, "Class=%x\n", func->class);
brcmf_dbg(TRACE, "sdio vendor ID: 0x%04x\n", func->vendor);
brcmf_dbg(TRACE, "sdio device ID: 0x%04x\n", func->device);
brcmf_dbg(TRACE, "Function#: %d\n", func->num);
brcmf_dbg(SDIO, "Enter\n");
brcmf_dbg(SDIO, "Class=%x\n", func->class);
brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);
brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
brcmf_dbg(SDIO, "Function#: %d\n", func->num);

/* Consume func num 1 but dont do anything with it. */
if (func->num == 1)
Expand Down Expand Up @@ -501,13 +501,13 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
if (err)
goto fail;

brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");
brcmf_dbg(SDIO, "F2 found, calling brcmf_sdio_probe...\n");
err = brcmf_sdio_probe(sdiodev);
if (err) {
brcmf_err("F2 error, probe failed %d...\n", err);
goto fail;
}
brcmf_dbg(TRACE, "F2 init completed...\n");
brcmf_dbg(SDIO, "F2 init completed...\n");
return 0;

fail:
Expand All @@ -523,10 +523,10 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
struct brcmf_bus *bus_if;
struct brcmf_sdio_dev *sdiodev;

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(TRACE, "sdio vendor ID: 0x%04x\n", func->vendor);
brcmf_dbg(TRACE, "sdio device ID: 0x%04x\n", func->device);
brcmf_dbg(TRACE, "Function: %d\n", func->num);
brcmf_dbg(SDIO, "Enter\n");
brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);
brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
brcmf_dbg(SDIO, "Function: %d\n", func->num);

if (func->num != 1 && func->num != 2)
return;
Expand All @@ -543,7 +543,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
kfree(sdiodev);
}

brcmf_dbg(TRACE, "Exit\n");
brcmf_dbg(SDIO, "Exit\n");
}

#ifdef CONFIG_PM_SLEEP
Expand All @@ -554,7 +554,7 @@ static int brcmf_sdio_suspend(struct device *dev)
struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
int ret = 0;

brcmf_dbg(TRACE, "\n");
brcmf_dbg(SDIO, "\n");

atomic_set(&sdiodev->suspend, true);

Expand Down Expand Up @@ -645,7 +645,7 @@ static struct platform_driver brcmf_sdio_pd = {

void brcmf_sdio_exit(void)
{
brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

sdio_unregister_driver(&brcmf_sdmmc_driver);

Expand All @@ -656,7 +656,7 @@ void brcmf_sdio_init(void)
{
int ret;

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

ret = platform_driver_register(&brcmf_sdio_pd);

Expand All @@ -666,7 +666,7 @@ void brcmf_sdio_init(void)
#else
void brcmf_sdio_exit(void)
{
brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

sdio_unregister_driver(&brcmf_sdmmc_driver);
}
Expand All @@ -675,7 +675,7 @@ void brcmf_sdio_init(void)
{
int ret;

brcmf_dbg(TRACE, "Enter\n");
brcmf_dbg(SDIO, "Enter\n");

ret = sdio_register_driver(&brcmf_sdmmc_driver);

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define BRCMF_SCAN_VAL 0x00004000
#define BRCMF_CONN_VAL 0x00008000
#define BRCMF_CDC_VAL 0x00010000
#define BRCMF_SDIO_VAL 0x00020000

/* set default print format */
#undef pr_fmt
Expand Down
Loading

0 comments on commit 19d9f4c

Please sign in to comment.