brcmfmac: sdio rework and msgbuf protocol changes
cover brcmfmac: sdio rework and msgbuf protocol changes
This series consists mostly of cleanup in SDIO driver code. Other changes are preparing to new firmware protocol called msgbuf, which is intended for PCIe fullmac devices.
Arend van Spriel (14):
brcmfmac: add missing curly braces in brcmf_fws_txstatus_suppressed()
brcmfmac: combine bcmsdh source files into one
brcmfmac: remove unnecessary function prototypes
brcmfmac: remove unused struct brcmf_sdio_dev::func_cis_ptr attribute
brcmfmac: use sdio functions to enable/disable F2
brcmfmac: remove brcmf_sdio_regrw_helper() from header file
brcmfmac: remove regs parameter from sdio probe functions
brcmfmac: get rid of some void pointer parameters
brcmfmac: remove brcmf_sdio_wdtimer_enable() function
brcmfmac: use consistent function names in bcmsdh.c
brcmfmac: reduce function parameters in sdio send/receive calls
brcmfmac: use consistent function names in dhd_sdio.c
brcmfmac: remove brcmf_sdio_disconnect() function
brcmfmac: clarify struct brcmf_sdio_dev::func[0] reference
Hante Meuleman (4):
brcmfmac: Move common BCDC code in single function.
brcmfmac: Fix hex dump for FWIL.
brcmfmac: Add definition of new protocol layer msgbuf.
brcmfmac: Combine protocol push hdr and bus txdata.
drivers/net/wireless/brcm80211/brcmfmac/Makefile | 1 - drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 79 +-- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 629 ++++++++++++++--- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 552 --------------- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 8 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 740 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 12 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 41 +- drivers/net/wireless/brcm80211/brcmfmac/proto.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/proto.h | 14 +- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 296 ++++---- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 2 +- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 82 +-- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1 + 14 files changed, 1109 insertions(+), 1350 deletions(-) delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
Signature · 1 line
1.7.10.4
PATCH 1/18 brcmfmac: add missing curly braces in brcmf_fws_txstatus_suppressed()
The 0-day testing from Fenguang Wu issued the following warning:
tree: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git master head: 4b074b07625f603d40d4d04937f8874a00415dc4 commit: 1e86d69662d7d86360624f74bbe1b5fa1b8ffb13
[33/59] brcmfmac: Update fwsignal to fix out of order tx.
Quoted 1 line
Quoted 1 line
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c:1393:2-56:
code aligned with following code on line 1394
vim +1393 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
84bcc0c3 1387 }
84bcc0c3 1388
84bcc0c3 1389 entry->generation = genbit;
84bcc0c3 1390
2747e5f7 1391 ret = brcmf_proto_hdrpull(fws->drvr, false, &ifidx, skb);
2747e5f7 1392 if (ret == 0)
1e86d696 @1393 brcmf_skb_htod_tag_set_field(skb, GENERATION, ..
1e86d696 @1394 brcmf_skbcb(skb)->htod_seq = seq;
1e86d696 1395 if (brcmf_skb_htod_seq_get_field(skb, FROMFW)) {
1e86d696 1396 brcmf_skb_htod_seq_set_field(skb, ..
1e86d696 1397 brcmf_skb_htod_seq_set_field(skb, ..This warning is valid and the if statement needs curly braces here.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +3 -1
@@ -1393,7 +1393,7 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo, entry->generation = genbit; ret =brcmf_proto_hdrpull (fws->drvr, false, &ifidx, skb); -if (ret ==0 ) +if (ret ==0 ) {brcmf_skb_htod_tag_set_field (skb,GENERATION , genbit);brcmf_skbcb (skb)->htod_seq = seq;if (brcmf_skb_htod_seq_get_field (skb,FROMFW )) {
@@ -1404,6 +1404,8 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo, } ret =brcmf_fws_enq (fws,BRCMF_FWS_SKBSTATE_SUPPRESSED , fifo, skb); + } +if (ret !=0 ) {/* suppress q is full or hdrpull failed, drop this packet */ brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
Signature · 1 line
1.7.10.4
PATCH 2/18 brcmfmac: combine bcmsdh source files into one
In reply to Arend van SprielThe driver has four files specific to SDIO host interface handling. This commit reduces that by merging two closely related source files.
--- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 1 - drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 522 ++++++++++++++++++ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 552 -------------------- 3 files changed, 522 insertions(+), 553 deletions(-) delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/net/wireless/brcm80211/brcmfmac/Makefile +0 -1
@@ -36,7 +36,6 @@ brcmfmac-objs += \ brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ dhd_sdio.o \ bcmsdh.o \ - bcmsdh_sdmmc.o \ sdio_chip.o brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ usb.o
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +522 -0
540 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c deleted +0 -552
552 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/18 brcmfmac: remove unnecessary function prototypes
In reply to Arend van SprielWith the merge of bcmsdh.c and bcmsdh_mmc.c several function prototypes are no longer necessary and can be removed. Consequence is reordering some of the functions.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 467 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 27 -- 2 files changed, 231 insertions(+), 263 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +231 -236
@@ -47,6 +47,12 @@#define SDIOH_API_ACCESS_RETRY_LIMIT 2 +#define SDIO_VENDOR_ID_BROADCOM 0x02d0 + +#define DMA_ALIGN_MASK 0x03 + +#define SDIO_FUNC1_BLOCKSIZE 64 +#define SDIO_FUNC2_BLOCKSIZE 512static irqreturn_t brcmf_sdio_oob_irqhandler (int irq,void *dev_id) {
@@ -83,6 +89,25 @@ static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func) { } +static bool brcmf_pm_resume_error (struct brcmf_sdio_dev *sdiodev) +{ +bool is_err = false; +#ifdef CONFIG_PM_SLEEP + is_err =atomic_read (&sdiodev->suspend); +#endif +return is_err; +} + +static void brcmf_pm_resume_wait (struct brcmf_sdio_dev *sdiodev, +wait_queue_head_t *wq) +{ +#ifdef CONFIG_PM_SLEEP +int retry =0 ; +while (atomic_read (&sdiodev->suspend) && retry++ !=30 ) +wait_event_timeout (*wq, false,HZ /100 ); +#endif +} +int brcmf_sdio_intr_register (struct brcmf_sdio_dev *sdiodev) {int ret =0 ;
@@ -169,6 +194,144 @@ int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)return 0 ; } +static inline int brcmf_sdioh_f0_write_byte (struct brcmf_sdio_dev *sdiodev, +uint regaddr,u8 *byte) +{ +struct sdio_func *sdfunc = sdiodev->func[0 ]; +int err_ret; + +/* +* Can only directly write to some F0 registers. +* Handle F2 enable/disable and Abort command +* as a special case. +*/ +if (regaddr == SDIO_CCCR_IOEx) { + sdfunc = sdiodev->func[2 ]; +if (sdfunc) { +if (*byte &SDIO_FUNC_ENABLE_2 ) { +/* Enable Function 2 */ + err_ret =sdio_enable_func (sdfunc); +if (err_ret) +brcmf_err ("enable F2 failed:%d\n" , + err_ret); + }else { +/* Disable Function 2 */ + err_ret =sdio_disable_func (sdfunc); +if (err_ret) +brcmf_err ("Disable F2 failed:%d\n" , + err_ret); + } + }else { + err_ret = -ENOENT ; + } + }else if ((regaddr ==SDIO_CCCR_ABORT ) || + (regaddr == SDIO_CCCR_IENx)) { + sdfunc =kmemdup (sdiodev->func[0 ],sizeof (struct sdio_func ), +GFP_KERNEL ); +if (!sdfunc) +return -ENOMEM ; + sdfunc->num =0 ; +sdio_writeb (sdfunc, *byte, regaddr, &err_ret); +kfree (sdfunc); + }else if (regaddr <0xF0 ) { +brcmf_err ("F0 Wr:0x%02x: write disallowed\n" , regaddr); + err_ret = -EPERM ; + }else { +sdio_f0_writeb (sdfunc, *byte, regaddr, &err_ret); + } + +return err_ret; +} + +static int brcmf_sdioh_request_byte (struct brcmf_sdio_dev *sdiodev,uint rw, +uint func,uint regaddr,u8 *byte) +{ +int err_ret; + +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)) +return -EIO ; + +if (rw && func ==0 ) { +/* handle F0 separately */ + err_ret =brcmf_sdioh_f0_write_byte (sdiodev, regaddr, byte); + }else { +if (rw)/* CMD52 Write */ +sdio_writeb (sdiodev->func[func], *byte, regaddr, + &err_ret); +else if (func ==0 ) { + *byte =sdio_f0_readb (sdiodev->func[func], regaddr, + &err_ret); + }else { + *byte =sdio_readb (sdiodev->func[func], regaddr, + &err_ret); + } + } + +if (err_ret) { +/* +* SleepCSR register access can fail when +* waking up the device so reduce this noise +* in the logs. +*/ +if (regaddr !=SBSDIO_FUNC1_SLEEPCSR ) +brcmf_err ("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , + rw ?"write" :"read" , func, regaddr, *byte, + err_ret); +else +brcmf_dbg (SDIO ,"Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , + rw ?"write" :"read" , func, regaddr, *byte, + err_ret); + } +return err_ret; +} + +static int brcmf_sdioh_request_word (struct brcmf_sdio_dev *sdiodev,uint rw, +uint func,uint addr,u32 *word, +uint nbytes) +{ +int err_ret = -EIO ; + +if (func ==0 ) { +brcmf_err ("Only CMD52 allowed to F0\n" ); +return -EINVAL ; + } + +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); +if (brcmf_pm_resume_error (sdiodev)) +return -EIO ; + +if (rw) {/* CMD52 Write */ +if (nbytes ==4 ) +sdio_writel (sdiodev->func[func], *word, addr, + &err_ret); +else if (nbytes ==2 ) +sdio_writew (sdiodev->func[func], (*word &0xFFFF ), + addr, &err_ret); +else +brcmf_err ("Invalid nbytes: %d\n" , nbytes); + }else {/* CMD52 Read */ +if (nbytes ==4 ) + *word =sdio_readl (sdiodev->func[func], addr, &err_ret); +else if (nbytes ==2 ) + *word =sdio_readw (sdiodev->func[func], addr, + &err_ret) &0xFFFF ; +else +brcmf_err ("Invalid nbytes: %d\n" , nbytes); + } + +if (err_ret) +brcmf_err ("Failed to %s word, Err: 0x%08x\n" , + rw ?"write" :"read" , err_ret); + +return err_ret; +} +static int brcmf_sdcard_set_sbaddr_window (struct brcmf_sdio_dev *sdiodev,u32 address) {
@@ -757,237 +920,6 @@ int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)return 0 ; } -int brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev) -{ -u32 regs =0 ; -int ret =0 ; - - ret =brcmf_sdioh_attach (sdiodev); -if (ret) - goto out; - - regs =SI_ENUM_BASE ; - -/* try to attach to the target device */ - sdiodev->bus =brcmf_sdbrcm_probe (regs, sdiodev); -if (!sdiodev->bus) { -brcmf_err ("device attach failed\n" ); - ret = -ENODEV ; - goto out; - } - -out: -if (ret) -brcmf_sdio_remove (sdiodev); - -return ret; -} - -int brcmf_sdio_remove (struct brcmf_sdio_dev *sdiodev) -{ - sdiodev->bus_if->state =BRCMF_BUS_DOWN ; - -if (sdiodev->bus) { -brcmf_sdbrcm_disconnect (sdiodev->bus); - sdiodev->bus =NULL ; - } - -brcmf_sdioh_detach (sdiodev); - - sdiodev->sbwad =0 ; - -return 0 ; -} - -void brcmf_sdio_wdtmr_enable (struct brcmf_sdio_dev *sdiodev,bool enable) -{ -if (enable) -brcmf_sdbrcm_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS ); -else -brcmf_sdbrcm_wd_timer (sdiodev->bus,0 ); -} - -#define SDIO_VENDOR_ID_BROADCOM 0x02d0 - -#define DMA_ALIGN_MASK 0x03 - -#define SDIO_FUNC1_BLOCKSIZE 64 -#define SDIO_FUNC2_BLOCKSIZE 512 - -/* devices we support, null terminated */ -static const struct sdio_device_id brcmf_sdmmc_ids[] = { - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_43143 )}, - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_43241 )}, - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4329 )}, - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4330 )}, - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4334 )}, - {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM , -SDIO_DEVICE_ID_BROADCOM_4335_4339 )}, - {/* end: all zeroes */ }, -}; -MODULE_DEVICE_TABLE (sdio, brcmf_sdmmc_ids); - -static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata; - - -bool -brcmf_pm_resume_error (struct brcmf_sdio_dev *sdiodev) -{ -bool is_err = false; -#ifdef CONFIG_PM_SLEEP - is_err =atomic_read (&sdiodev->suspend); -#endif -return is_err; -} - -void -brcmf_pm_resume_wait (struct brcmf_sdio_dev *sdiodev,wait_queue_head_t *wq) -{ -#ifdef CONFIG_PM_SLEEP -int retry =0 ; -while (atomic_read (&sdiodev->suspend) && retry++ !=30 ) -wait_event_timeout (*wq, false,HZ /100 ); -#endif -} - -static inline int brcmf_sdioh_f0_write_byte (struct brcmf_sdio_dev *sdiodev, -uint regaddr,u8 *byte) -{ -struct sdio_func *sdfunc = sdiodev->func[0 ]; -int err_ret; - -/* -* Can only directly write to some F0 registers. -* Handle F2 enable/disable and Abort command -* as a special case. -*/ -if (regaddr == SDIO_CCCR_IOEx) { - sdfunc = sdiodev->func[2 ]; -if (sdfunc) { -if (*byte &SDIO_FUNC_ENABLE_2 ) { -/* Enable Function 2 */ - err_ret =sdio_enable_func (sdfunc); -if (err_ret) -brcmf_err ("enable F2 failed:%d\n" , - err_ret); - }else { -/* Disable Function 2 */ - err_ret =sdio_disable_func (sdfunc); -if (err_ret) -brcmf_err ("Disable F2 failed:%d\n" , - err_ret); - } - }else { - err_ret = -ENOENT ; - } - }else if ((regaddr ==SDIO_CCCR_ABORT ) || - (regaddr == SDIO_CCCR_IENx)) { - sdfunc =kmemdup (sdiodev->func[0 ],sizeof (struct sdio_func ), -GFP_KERNEL ); -if (!sdfunc) -return -ENOMEM ; - sdfunc->num =0 ; -sdio_writeb (sdfunc, *byte, regaddr, &err_ret); -kfree (sdfunc); - }else if (regaddr <0xF0 ) { -brcmf_err ("F0 Wr:0x%02x: write disallowed\n" , regaddr); - err_ret = -EPERM ; - }else { -sdio_f0_writeb (sdfunc, *byte, regaddr, &err_ret); - } - -return err_ret; -} - -int brcmf_sdioh_request_byte (struct brcmf_sdio_dev *sdiodev,uint rw,uint func, -uint regaddr,u8 *byte) -{ -int err_ret; - -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)) -return -EIO ; - -if (rw && func ==0 ) { -/* handle F0 separately */ - err_ret =brcmf_sdioh_f0_write_byte (sdiodev, regaddr, byte); - }else { -if (rw)/* CMD52 Write */ -sdio_writeb (sdiodev->func[func], *byte, regaddr, - &err_ret); -else if (func ==0 ) { - *byte =sdio_f0_readb (sdiodev->func[func], regaddr, - &err_ret); - }else { - *byte =sdio_readb (sdiodev->func[func], regaddr, - &err_ret); - } - } - -if (err_ret) { -/* -* SleepCSR register access can fail when -* waking up the device so reduce this noise -* in the logs. -*/ -if (regaddr !=SBSDIO_FUNC1_SLEEPCSR ) -brcmf_err ("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , - rw ?"write" :"read" , func, regaddr, *byte, - err_ret); -else -brcmf_dbg (SDIO ,"Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , - rw ?"write" :"read" , func, regaddr, *byte, - err_ret); - } -return err_ret; -} - -int brcmf_sdioh_request_word (struct brcmf_sdio_dev *sdiodev, -uint rw,uint func,uint addr,u32 *word, -uint nbytes) -{ -int err_ret = -EIO ; - -if (func ==0 ) { -brcmf_err ("Only CMD52 allowed to F0\n" ); -return -EINVAL ; - } - -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); -if (brcmf_pm_resume_error (sdiodev)) -return -EIO ; - -if (rw) {/* CMD52 Write */ -if (nbytes ==4 ) -sdio_writel (sdiodev->func[func], *word, addr, - &err_ret); -else if (nbytes ==2 ) -sdio_writew (sdiodev->func[func], (*word &0xFFFF ), - addr, &err_ret); -else -brcmf_err ("Invalid nbytes: %d\n" , nbytes); - }else {/* CMD52 Read */ -if (nbytes ==4 ) - *word =sdio_readl (sdiodev->func[func], addr, &err_ret); -else if (nbytes ==2 ) - *word =sdio_readw (sdiodev->func[func], addr, - &err_ret) &0xFFFF ; -else -brcmf_err ("Invalid nbytes: %d\n" , nbytes); - } - -if (err_ret) -brcmf_err ("Failed to %s word, Err: 0x%08x\n" , - rw ?"write" :"read" , err_ret); - -return err_ret; -} -static int brcmf_sdioh_get_cisaddr (struct brcmf_sdio_dev *sdiodev,u32 regaddr) {/* read 24 bits and return valid 17 bit addr */
@@ -1042,10 +974,7 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)return false; } -/* -* Public entry points & extern's -*/ -int brcmf_sdioh_attach (struct brcmf_sdio_dev *sdiodev) +static int brcmf_sdioh_attach (struct brcmf_sdio_dev *sdiodev) {int err_ret =0 ;struct mmc_host *host;
@@ -1092,7 +1021,7 @@ out:return err_ret; } -void brcmf_sdioh_detach (struct brcmf_sdio_dev *sdiodev) +static void brcmf_sdioh_detach (struct brcmf_sdio_dev *sdiodev) {brcmf_dbg (SDIO ,"\n" );
@@ -1108,6 +1037,64 @@ void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev) } +static int brcmf_sdio_remove (struct brcmf_sdio_dev *sdiodev) +{ + sdiodev->bus_if->state =BRCMF_BUS_DOWN ; + +if (sdiodev->bus) { +brcmf_sdbrcm_disconnect (sdiodev->bus); + sdiodev->bus =NULL ; + } + +brcmf_sdioh_detach (sdiodev); + + sdiodev->sbwad =0 ; + +return 0 ; +} + +static int brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev) +{ +u32 regs =0 ; +int ret =0 ; + + ret =brcmf_sdioh_attach (sdiodev); +if (ret) + goto out; + + regs =SI_ENUM_BASE ; + +/* try to attach to the target device */ + sdiodev->bus =brcmf_sdbrcm_probe (regs, sdiodev); +if (!sdiodev->bus) { +brcmf_err ("device attach failed\n" ); + ret = -ENODEV ; + goto out; + } + +out: +if (ret) +brcmf_sdio_remove (sdiodev); + +return ret; +} + +/* devices we support, null terminated */ +static const struct sdio_device_id brcmf_sdmmc_ids[] = { + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_43143 )}, + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_43241 )}, + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4329 )}, + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4330 )}, + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM ,SDIO_DEVICE_ID_BROADCOM_4334 )}, + {SDIO_DEVICE (SDIO_VENDOR_ID_BROADCOM , +SDIO_DEVICE_ID_BROADCOM_4335_4339 )}, + {/* end: all zeroes */ }, +}; +MODULE_DEVICE_TABLE (sdio, brcmf_sdmmc_ids); + +static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata; + +static int brcmf_ops_sdio_probe (struct sdio_func *func,const struct sdio_device_id *id) {
@@ -1201,6 +1188,14 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) }#ifdef CONFIG_PM_SLEEP +static void brcmf_sdio_wdtmr_enable (struct brcmf_sdio_dev *sdiodev,bool enable) +{ +if (enable) +brcmf_sdbrcm_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS ); +else +brcmf_sdbrcm_wd_timer (sdiodev->bus,0 ); +} +static int brcmf_sdio_suspend (struct device *dev) {mmc_pm_flag_t sdio_flags;
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +0 -27
@@ -236,43 +236,16 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,* nbytes: number of bytes to transfer to/from buf * Returns 0 or error code. */ -int brcmf_sdcard_rwdata (struct brcmf_sdio_dev *sdiodev,uint rw,u32 addr, -u8 *buf,uint nbytes);int brcmf_sdio_ramrw (struct brcmf_sdio_dev *sdiodev,bool write,u32 address,u8 *data,uint size);/* Issue an abort to the specified function */ int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn); -/* platform specific/high level functions */ -int brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev); -int brcmf_sdio_remove (struct brcmf_sdio_dev *sdiodev); - -/* attach, return handler on success, NULL if failed. -* The handler shall be provided by all subsequent calls. No local cache -* cfghdl points to the starting address of pci device mapped memory -*/ -int brcmf_sdioh_attach (struct brcmf_sdio_dev *sdiodev); -void brcmf_sdioh_detach (struct brcmf_sdio_dev *sdiodev); - -/* read or write one byte using cmd52 */ -int brcmf_sdioh_request_byte (struct brcmf_sdio_dev *sdiodev,uint rw,uint fnc, -uint addr,u8 *byte); - -/* read or write 2/4 bytes using cmd53 */ -int brcmf_sdioh_request_word (struct brcmf_sdio_dev *sdiodev,uint rw,uint fnc, -uint addr,u32 *word,uint nbyte); - -/* Watchdog timer interface for pm ops */ -void brcmf_sdio_wdtmr_enable (struct brcmf_sdio_dev *sdiodev,bool enable); -void *brcmf_sdbrcm_probe (u32 regsva,struct brcmf_sdio_dev *sdiodev);void brcmf_sdbrcm_disconnect (void *ptr);void brcmf_sdbrcm_isr (void *arg);void brcmf_sdbrcm_wd_timer (struct brcmf_sdio *bus,uint wdtick); -void brcmf_pm_resume_wait (struct brcmf_sdio_dev *sdiodev, -wait_queue_head_t *wq); -bool brcmf_pm_resume_error (struct brcmf_sdio_dev *sdiodev);#endif /* _BRCM_SDH_H_ */
Signature · 1 line
1.7.10.4
PATCH 4/18 brcmfmac: remove unused struct brcmf_sdio_dev::func_cis_ptr attribute
In reply to Arend van SprielDuring the SDIO probe the func_cis_ptr attribute in struct brcmf_sdio_dev is being determined, but it is never used after that. Removing it also obsoletes two functions in bcmsdh.c.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 61 ++------------------ .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 1 - 2 files changed, 6 insertions(+), 56 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +6 -55
@@ -920,60 +920,6 @@ int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)return 0 ; } -static int brcmf_sdioh_get_cisaddr (struct brcmf_sdio_dev *sdiodev,u32 regaddr) -{ -/* read 24 bits and return valid 17 bit addr */ -int i, ret; -u32 scratch, regdata; -__le32 scratch_le; -u8 *ptr = (u8 *)&scratch_le; - -for (i =0 ; i <3 ; i++) { - regdata =brcmf_sdio_regrl (sdiodev, regaddr, &ret); -if (ret !=0 ) -brcmf_err ("Can't read!\n" ); - - *ptr++ = (u8 ) regdata; - regaddr++; - } - -/* Only the lower 17-bits are valid */ - scratch =le32_to_cpu (scratch_le); - scratch &=0x0001FFFF ; -return scratch; -} - -static int brcmf_sdioh_enablefuncs (struct brcmf_sdio_dev *sdiodev) -{ -int err_ret; -u32 fbraddr; -u8 func; - -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 (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 (SDIO ,"Function %d CIS Ptr = 0x%x\n" , - func, sdiodev->func_cis_ptr[func]); - } - -/* Enable Function 1 */ - err_ret =sdio_enable_func (sdiodev->func[1 ]); -if (err_ret) -brcmf_err ("Failed to enable F1 Err: 0x%08x\n" , err_ret); - -return false; -} -static int brcmf_sdioh_attach (struct brcmf_sdio_dev *sdiodev) {int err_ret =0 ;
@@ -999,7 +945,12 @@ static int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) goto out; } -brcmf_sdioh_enablefuncs (sdiodev); +/* Enable Function 1 */ + err_ret =sdio_enable_func (sdiodev->func[1 ]); +if (err_ret) { +brcmf_err ("Failed to enable F1 Err: 0x%08x\n" , err_ret); + goto out; + }/* * determine host related variables after brcmf_sdio_probe()
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +0 -1
@@ -164,7 +164,6 @@ struct brcmf_sdio;struct brcmf_sdio_dev {struct sdio_func *func[SDIO_MAX_FUNCS ];u8 num_funcs;/* Supported funcs on client */ -u32 func_cis_ptr[SDIOD_MAX_IOFUNCS ];u32 sbwad;/* Save backplane window address */ void *bus;atomic_t suspend;/* suspend flag */
Signature · 1 line
1.7.10.4
PATCH 5/18 brcmfmac: use sdio functions to enable/disable F2
In reply to Arend van SprielInstead of catching CCCR_IOEx register in F0 write access to determine whether F2 state needs to change do it with direct call to sdio_[enable/disable]_func().
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 29 +++++------------ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 33 ++++---------------- 2 files changed, 14 insertions(+), 48 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +8 -21
@@ -53,6 +53,9 @@#define SDIO_FUNC1_BLOCKSIZE 64#define SDIO_FUNC2_BLOCKSIZE 512 +/* Maximum milliseconds to wait for F2 to come up */ +#define SDIO_WAIT_F2RDY 3000 +static irqreturn_t brcmf_sdio_oob_irqhandler (int irq,void *dev_id) {
@@ -205,27 +208,8 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev,* Handle F2 enable/disable and Abort command * as a special case. */ -if (regaddr == SDIO_CCCR_IOEx) { - sdfunc = sdiodev->func[2 ]; -if (sdfunc) { -if (*byte &SDIO_FUNC_ENABLE_2 ) { -/* Enable Function 2 */ - err_ret =sdio_enable_func (sdfunc); -if (err_ret) -brcmf_err ("enable F2 failed:%d\n" , - err_ret); - }else { -/* Disable Function 2 */ - err_ret =sdio_disable_func (sdfunc); -if (err_ret) -brcmf_err ("Disable F2 failed:%d\n" , - err_ret); - } - }else { - err_ret = -ENOENT ; - } - }else if ((regaddr ==SDIO_CCCR_ABORT ) || - (regaddr == SDIO_CCCR_IENx)) { +if ((regaddr ==SDIO_CCCR_ABORT ) || + (regaddr == SDIO_CCCR_IENx)) { sdfunc =kmemdup (sdiodev->func[0 ],sizeof (struct sdio_func ),GFP_KERNEL );if (!sdfunc)
@@ -945,6 +929,9 @@ static int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) goto out; } +/* increase F2 timeout */ + sdiodev->func[2 ]->enable_timeout =SDIO_WAIT_F2RDY ; +/* Enable Function 1 */ err_ret =sdio_enable_func (sdiodev->func[1 ]);if (err_ret) {
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +6 -27
@@ -260,9 +260,6 @@ struct rte_console {#define MAX_HDR_READ (1 << 6)#define MAX_RX_DATASZ 2048 -/* Maximum milliseconds to wait for F2 to come up */ -#define BRCMF_WAIT_F2RDY 3000 -/* Bump up limit on waiting for HT to account for first startup; * if the image is doing a CRC calculation before programming the PMU * for HT availability, it could take a couple hundred ms more, so
@@ -2265,8 +2262,7 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev)/* Turn off the bus (F2), free any pending packets */ brcmf_dbg (INTR ,"disable SDIO interrupts\n" ); -brcmf_sdio_regwb (bus->sdiodev, SDIO_CCCR_IOEx,SDIO_FUNC_ENABLE_1 , -NULL ); +sdio_disable_func (bus->sdiodev->func[SDIO_FUNC_2 ]);/* Clear any pending interrupts now that F2 is disabled */ w_sdreg32(bus, local_hostintmask,
@@ -3570,8 +3566,6 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;struct brcmf_sdio *bus = sdiodev->bus; -unsigned long timeout; -u8 ready, enable;int err, ret =0 ;u8 saveclk;
@@ -3612,26 +3606,13 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)/* Enable function 2 (frame transfers) */ w_sdreg32 (bus,SDPCM_PROT_VERSION <<SMB_DATA_VERSION_SHIFT , offsetof(struct sdpcmd_regs , tosbmailboxdata)); - enable = (SDIO_FUNC_ENABLE_1 |SDIO_FUNC_ENABLE_2 ); - -brcmf_sdio_regwb (bus->sdiodev, SDIO_CCCR_IOEx, enable,NULL ); + err =sdio_enable_func (bus->sdiodev->func[SDIO_FUNC_2 ]); - timeout = jiffies +msecs_to_jiffies (BRCMF_WAIT_F2RDY ); - ready =0 ; -while (enable != ready) { - ready =brcmf_sdio_regrb (bus->sdiodev, - SDIO_CCCR_IORx,NULL ); -if (time_after (jiffies, timeout)) -break ; -else if (time_after (jiffies, timeout -BRCMF_WAIT_F2RDY +50 )) -/* prevent busy waiting if it takes too long */ -msleep_interruptible (20 ); - } -brcmf_dbg (INFO ,"enable 0x%02x, ready 0x%02x\n" , enable, ready); +brcmf_dbg (INFO ,"enable F2: err=%d\n" , err);/* If F2 successfully enabled, set core and enable interrupts */ -if (ready == enable) { +if (!err) {/* Set up the interrupt mask and enable interrupts */ bus->hostintmask =HOSTINTMASK ; w_sdreg32(bus, bus->hostintmask,
@@ -3640,8 +3621,7 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)brcmf_sdio_regwb (bus->sdiodev,SBSDIO_WATERMARK ,8 , &err); }else {/* Disable F2 again */ - enable =SDIO_FUNC_ENABLE_1 ; -brcmf_sdio_regwb (bus->sdiodev, SDIO_CCCR_IOEx, enable,NULL ); +sdio_disable_func (bus->sdiodev->func[SDIO_FUNC_2 ]); ret = -ENODEV ; }
@@ -3942,8 +3922,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus)sdio_claim_host (bus->sdiodev->func[1 ]);/* Disable F2 to clear any intermediate frame state on the dongle */ -brcmf_sdio_regwb (bus->sdiodev, SDIO_CCCR_IOEx, -SDIO_FUNC_ENABLE_1 ,NULL ); +sdio_disable_func (bus->sdiodev->func[SDIO_FUNC_2 ]); bus->sdiodev->bus_if->state =BRCMF_BUS_DOWN ; bus->rxflow = false;
Signature · 1 line
1.7.10.4
PATCH 6/18 brcmfmac: remove brcmf_sdio_regrw_helper() from header file
In reply to Arend van SprielMake brcmf_sdio_regrw_helper() static removing its use outside of the bcmsdh.c source file.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 5 ++--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 ++-- drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +2 -3
@@ -369,9 +369,8 @@ brcmf_sdio_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)return 0 ; } -int -brcmf_sdio_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr, -void *data,bool write) +static int brcmf_sdio_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr, +void *data,bool write) {u8 func_num, reg_size;s32 retry =0 ;
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -2
@@ -2316,7 +2316,7 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus) addr = bus->ci->c_inf[idx].base + offsetof(struct sdpcmd_regs , intstatus); - ret =brcmf_sdio_regrw_helper (bus->sdiodev, addr, &val, false); + val =brcmf_sdio_regrl (bus->sdiodev, addr, &ret); bus->sdcnt.f1regdata++;if (ret !=0 ) val =0 ;
@@ -2326,7 +2326,7 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)/* Clear interrupts */ if (val) { - ret =brcmf_sdio_regrw_helper (bus->sdiodev, addr, &val, true); +brcmf_sdio_regwl (bus->sdiodev, addr, val, &ret); bus->sdcnt.f1regdata++; }
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +0 -2
@@ -194,8 +194,6 @@ void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr, u8 data, int *ret);void brcmf_sdio_regwl (struct brcmf_sdio_dev *sdiodev,u32 addr,u32 data,int *ret); -int brcmf_sdio_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr, -void *data,bool write);/* Buffer transfer to/from device (client) core via cmd53. * fn: function number
Signature · 1 line
1.7.10.4
PATCH 7/18 brcmfmac: remove regs parameter from sdio probe functions
In reply to Arend van SprielThe chip recognition requires a base address that was provided to it during the probe. However, the address is a fixed define value so it is unnecessary to pass through the probe functions.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 5 +---- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 11 ++++------- drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 8 ++++---- drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 +- 5 files changed, 11 insertions(+), 17 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +1 -4
@@ -992,17 +992,14 @@ static int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev)static int brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev) { -u32 regs =0 ;int ret =0 ; ret =brcmf_sdioh_attach (sdiodev);if (ret) goto out; - regs =SI_ENUM_BASE ; -/* try to attach to the target device */ - sdiodev->bus =brcmf_sdbrcm_probe (regs, sdiodev); + sdiodev->bus =brcmf_sdbrcm_probe (sdiodev);if (!sdiodev->bus) {brcmf_err ("device attach failed\n" ); ret = -ENODEV ;
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +4 -7
@@ -3803,7 +3803,7 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_sdio *bus) }static bool -brcmf_sdbrcm_probe_attach (struct brcmf_sdio *bus,u32 regsva) +brcmf_sdbrcm_probe_attach (struct brcmf_sdio *bus) {u8 clkctl =0 ;int err =0 ;
@@ -3835,7 +3835,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) goto fail; } -if (brcmf_sdio_chip_attach (bus->sdiodev, &bus->ci, regsva)) { +if (brcmf_sdio_chip_attach (bus->sdiodev, &bus->ci)) {brcmf_err ("brcmf_sdio_chip_attach failed!\n" ); goto fail; }
@@ -4037,16 +4037,13 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = { .gettxq = brcmf_sdbrcm_bus_gettxq, }; -void *brcmf_sdbrcm_probe (u32 regsva,struct brcmf_sdio_dev *sdiodev) +void *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev) {int ret;struct brcmf_sdio *bus;brcmf_dbg (TRACE ,"Enter\n" ); -/* We make an assumption about address window mappings: -* regsva == SI_ENUM_BASE*/ -/* Allocate private bus interface state */ bus =kzalloc (sizeof (struct brcmf_sdio ),GFP_ATOMIC );if (!bus)
@@ -4080,7 +4077,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev) }/* attempt to attach to the dongle */ -if (!(brcmf_sdbrcm_probe_attach (bus, regsva))) { +if (!(brcmf_sdbrcm_probe_attach (bus))) {brcmf_err ("brcmf_sdbrcm_probe_attach failed\n" ); goto fail; }
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +4 -4
@@ -438,7 +438,7 @@ static inline int brcmf_sdio_chip_cichk(struct chip_info *ci)#endif static int brcmf_sdio_chip_recognition (struct brcmf_sdio_dev *sdiodev, -struct chip_info *ci,u32 regs) +struct chip_info *ci) {u32 regdata;int ret;
@@ -449,7 +449,7 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,* other ways of recognition should be added here. */ ci->c_inf[0 ].id =BCMA_CORE_CHIPCOMMON ; - ci->c_inf[0 ].base = regs; + ci->c_inf[0 ].base =SI_ENUM_BASE ; regdata =brcmf_sdio_regrl (sdiodev,CORE_CC_REG (ci->c_inf[0 ].base, chipid),NULL );
@@ -681,7 +681,7 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev, }int brcmf_sdio_chip_attach (struct brcmf_sdio_dev *sdiodev, -struct chip_info **ci_ptr,u32 regs) +struct chip_info **ci_ptr) {int ret;struct chip_info *ci;
@@ -697,7 +697,7 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,if (ret !=0 ) goto err; - ret =brcmf_sdio_chip_recognition (sdiodev, ci, regs); + ret =brcmf_sdio_chip_recognition (sdiodev, ci);if (ret !=0 ) goto err;
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +1 -1
@@ -224,7 +224,7 @@ struct sdpcmd_regs { };int brcmf_sdio_chip_attach (struct brcmf_sdio_dev *sdiodev, -struct chip_info **ci_ptr,u32 regs); +struct chip_info **ci_ptr);void brcmf_sdio_chip_detach (struct chip_info **ci_ptr);void brcmf_sdio_chip_drivestrengthinit (struct brcmf_sdio_dev *sdiodev,struct chip_info *ci,u32 drivestrength);
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +1 -1
@@ -239,7 +239,7 @@ int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,/* Issue an abort to the specified function */ int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn); -void *brcmf_sdbrcm_probe (u32 regsva,struct brcmf_sdio_dev *sdiodev); +void *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev);void brcmf_sdbrcm_disconnect (void *ptr);void brcmf_sdbrcm_isr (void *arg);
Signature · 1 line
1.7.10.4
PATCH 8/18 brcmfmac: get rid of some void pointer parameters
In reply to Arend van SprielIn sdio code a couple of functions use a void pointer as argument type although it should be struct brcmf_sdio. Changing the functions to have proper type checking.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 13 ++++--------- drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | 9 ++++----- 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +4 -9
@@ -3649,10 +3649,8 @@ exit:return ret; } -void brcmf_sdbrcm_isr (void *arg) +void brcmf_sdbrcm_isr (struct brcmf_sdio *bus) { -struct brcmf_sdio *bus = (struct brcmf_sdio *) arg; -brcmf_dbg (TRACE ,"Enter\n" );if (!bus) {
@@ -4037,7 +4035,7 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = { .gettxq = brcmf_sdbrcm_bus_gettxq, }; -void *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev) +struct brcmf_sdio *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev) {int ret;struct brcmf_sdio *bus;
@@ -4147,14 +4145,11 @@ fail:return NULL ; } -void brcmf_sdbrcm_disconnect (void *ptr) +void brcmf_sdbrcm_disconnect (struct brcmf_sdio *bus) { -struct brcmf_sdio *bus = (struct brcmf_sdio *)ptr; -brcmf_dbg (TRACE ,"Enter\n" ); -if (bus) -brcmf_sdbrcm_release (bus); +brcmf_sdbrcm_release (bus);brcmf_dbg (TRACE ,"Disconnected\n" ); }
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +4 -5
@@ -165,7 +165,7 @@ struct brcmf_sdio_dev {struct sdio_func *func[SDIO_MAX_FUNCS ];u8 num_funcs;/* Supported funcs on client */ u32 sbwad;/* Save backplane window address */ -void *bus; +struct brcmf_sdio *bus;atomic_t suspend;/* suspend flag */ wait_queue_head_t request_byte_wait;wait_queue_head_t request_word_wait;
@@ -239,10 +239,9 @@ int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,/* Issue an abort to the specified function */ int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn); -void *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev); -void brcmf_sdbrcm_disconnect (void *ptr); -void brcmf_sdbrcm_isr (void *arg); - +struct brcmf_sdio *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev); +void brcmf_sdbrcm_disconnect (struct brcmf_sdio *bus); +void brcmf_sdbrcm_isr (struct brcmf_sdio *bus);void brcmf_sdbrcm_wd_timer (struct brcmf_sdio *bus,uint wdtick);#endif /* _BRCM_SDH_H_ */
Signature · 1 line
1.7.10.4
PATCH 9/18 brcmfmac: remove brcmf_sdio_wdtimer_enable() function
In reply to Arend van SprielInstead of using the brcmf_sdio_wdtimer_enable() function call brcmf_sdbrcm_wd_timer() directly.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +2 -10
@@ -1122,14 +1122,6 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) }#ifdef CONFIG_PM_SLEEP -static void brcmf_sdio_wdtmr_enable (struct brcmf_sdio_dev *sdiodev,bool enable) -{ -if (enable) -brcmf_sdbrcm_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS ); -else -brcmf_sdbrcm_wd_timer (sdiodev->bus,0 ); -} -static int brcmf_sdio_suspend (struct device *dev) {mmc_pm_flag_t sdio_flags;
@@ -1153,7 +1145,7 @@ static int brcmf_sdio_suspend(struct device *dev)return ret; } -brcmf_sdio_wdtmr_enable (sdiodev, false); +brcmf_sdbrcm_wd_timer (sdiodev->bus,0 );return ret; }
@@ -1163,7 +1155,7 @@ static int brcmf_sdio_resume(struct device *dev)struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; -brcmf_sdio_wdtmr_enable (sdiodev, true); +brcmf_sdbrcm_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS );atomic_set (&sdiodev->suspend, false);return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 10/18 brcmfmac: use consistent function names in bcmsdh.c
In reply to Arend van SprielFunctions in bcmsdh.c that are called with struct brcmf_sdio_dev instance are renamed consistently with brcmf_sdiod_ prefix. Also removing brcmf_sdioh_attach/detach() functions and merge it with brcmf_sdiod_probe/remove().
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 274 ++++++++--------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 324 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 288 ++++++++--------- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 44 +-- 4 files changed, 452 insertions(+), 478 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +126 -148
@@ -57,7 +57,7 @@#define SDIO_WAIT_F2RDY 3000 -static irqreturn_t brcmf_sdio_oob_irqhandler (int irq,void *dev_id) +static irqreturn_t brcmf_sdiod_oob_irqhandler (int irq,void *dev_id) {struct brcmf_bus *bus_if =dev_get_drvdata (dev_id);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
@@ -77,7 +77,7 @@ static irqreturn_t brcmf_sdio_oob_irqhandler(int irq, void *dev_id)return IRQ_HANDLED ; } -static void brcmf_sdio_ib_irqhandler (struct sdio_func *func) +static void brcmf_sdiod_ib_irqhandler (struct sdio_func *func) {struct brcmf_bus *bus_if =dev_get_drvdata (&func->dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
@@ -88,11 +88,11 @@ static void brcmf_sdio_ib_irqhandler(struct sdio_func *func) }/* dummy handler for SDIO function 2 interrupt */ -static void brcmf_sdio_dummy_irqhandler (struct sdio_func *func) +static void brcmf_sdiod_dummy_irqhandler (struct sdio_func *func) { } -static bool brcmf_pm_resume_error (struct brcmf_sdio_dev *sdiodev) +static bool brcmf_sdiod_pm_resume_error (struct brcmf_sdio_dev *sdiodev) {bool is_err = false;#ifdef CONFIG_PM_SLEEP
@@ -101,8 +101,8 @@ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)return is_err; } -static void brcmf_pm_resume_wait (struct brcmf_sdio_dev *sdiodev, -wait_queue_head_t *wq) +static void brcmf_sdiod_pm_resume_wait (struct brcmf_sdio_dev *sdiodev, +wait_queue_head_t *wq) {#ifdef CONFIG_PM_SLEEP int retry =0 ;
@@ -111,7 +111,7 @@ static void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev,#endif } -int brcmf_sdio_intr_register (struct brcmf_sdio_dev *sdiodev) +int brcmf_sdiod_intr_register (struct brcmf_sdio_dev *sdiodev) {int ret =0 ;u8 data;
@@ -121,7 +121,7 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)brcmf_dbg (SDIO ,"Enter, register OOB IRQ %d\n" , sdiodev->pdata->oob_irq_nr); ret =request_irq (sdiodev->pdata->oob_irq_nr, - brcmf_sdio_oob_irqhandler, + brcmf_sdiod_oob_irqhandler, sdiodev->pdata->oob_irq_flags,"brcmf_oob_intr" , &sdiodev->func[1 ]->dev);
@@ -145,36 +145,36 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)sdio_claim_host (sdiodev->func[1 ]);/* must configure SDIO_CCCR_IENx to enable irq */ - data =brcmf_sdio_regrb (sdiodev, SDIO_CCCR_IENx, &ret); + data =brcmf_sdiod_regrb (sdiodev, SDIO_CCCR_IENx, &ret); data |=1 <<SDIO_FUNC_1 |1 <<SDIO_FUNC_2 |1 ; -brcmf_sdio_regwb (sdiodev, SDIO_CCCR_IENx, data, &ret); +brcmf_sdiod_regwb (sdiodev, SDIO_CCCR_IENx, data, &ret);/* redirect, configure and enable io for interrupt signal */ data =SDIO_SEPINT_MASK |SDIO_SEPINT_OE ;if (sdiodev->pdata->oob_irq_flags &IRQF_TRIGGER_HIGH ) data |=SDIO_SEPINT_ACT_HI ; -brcmf_sdio_regwb (sdiodev,SDIO_CCCR_BRCM_SEPINT , data, &ret); +brcmf_sdiod_regwb (sdiodev,SDIO_CCCR_BRCM_SEPINT , data, &ret);sdio_release_host (sdiodev->func[1 ]); }else {brcmf_dbg (SDIO ,"Entering\n" );sdio_claim_host (sdiodev->func[1 ]); -sdio_claim_irq (sdiodev->func[1 ], brcmf_sdio_ib_irqhandler); -sdio_claim_irq (sdiodev->func[2 ], brcmf_sdio_dummy_irqhandler); +sdio_claim_irq (sdiodev->func[1 ], brcmf_sdiod_ib_irqhandler); +sdio_claim_irq (sdiodev->func[2 ], brcmf_sdiod_dummy_irqhandler);sdio_release_host (sdiodev->func[1 ]); }return 0 ; } -int brcmf_sdio_intr_unregister (struct brcmf_sdio_dev *sdiodev) +int brcmf_sdiod_intr_unregister (struct brcmf_sdio_dev *sdiodev) {brcmf_dbg (SDIO ,"Entering\n" );if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {sdio_claim_host (sdiodev->func[1 ]); -brcmf_sdio_regwb (sdiodev,SDIO_CCCR_BRCM_SEPINT ,0 ,NULL ); -brcmf_sdio_regwb (sdiodev, SDIO_CCCR_IENx,0 ,NULL ); +brcmf_sdiod_regwb (sdiodev,SDIO_CCCR_BRCM_SEPINT ,0 ,NULL ); +brcmf_sdiod_regwb (sdiodev, SDIO_CCCR_IENx,0 ,NULL );sdio_release_host (sdiodev->func[1 ]);if (sdiodev->oob_irq_requested) {
@@ -197,7 +197,7 @@ int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)return 0 ; } -static inline int brcmf_sdioh_f0_write_byte (struct brcmf_sdio_dev *sdiodev, +static inline int brcmf_sdiod_f0_write_byte (struct brcmf_sdio_dev *sdiodev,uint regaddr,u8 *byte) {struct sdio_func *sdfunc = sdiodev->func[0 ];
@@ -227,20 +227,20 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev,return err_ret; } -static int brcmf_sdioh_request_byte (struct brcmf_sdio_dev *sdiodev,uint rw, +static int brcmf_sdiod_request_byte (struct brcmf_sdio_dev *sdiodev,uint rw,uint func,uint regaddr,u8 *byte) {int err_ret;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)) +brcmf_sdiod_pm_resume_wait (sdiodev, &sdiodev->request_byte_wait); +if (brcmf_sdiod_pm_resume_error (sdiodev))return -EIO ;if (rw && func ==0 ) {/* handle F0 separately */ - err_ret =brcmf_sdioh_f0_write_byte (sdiodev, regaddr, byte); + err_ret =brcmf_sdiod_f0_write_byte (sdiodev, regaddr, byte); }else {if (rw)/* CMD52 Write */ sdio_writeb(sdiodev->func[func], *byte, regaddr,
@@ -272,7 +272,7 @@ static int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw,return err_ret; } -static int brcmf_sdioh_request_word (struct brcmf_sdio_dev *sdiodev,uint rw, +static int brcmf_sdiod_request_word (struct brcmf_sdio_dev *sdiodev,uint rw,uint func,uint addr,u32 *word,uint nbytes) {
@@ -286,8 +286,8 @@ static int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint rw,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); -if (brcmf_pm_resume_error (sdiodev)) +brcmf_sdiod_pm_resume_wait (sdiodev, &sdiodev->request_word_wait); +if (brcmf_sdiod_pm_resume_error (sdiodev))return -EIO ;if (rw) {/* CMD52 Write */
@@ -317,7 +317,7 @@ static int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint rw, }static int -brcmf_sdcard_set_sbaddr_window (struct brcmf_sdio_dev *sdiodev,u32 address) +brcmf_sdiod_set_sbaddr_window (struct brcmf_sdio_dev *sdiodev,u32 address) {int err =0 , i;u8 addr[3 ];
@@ -332,7 +332,7 @@ brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)do {if (retry)usleep_range (1000 ,2000 ); - err =brcmf_sdioh_request_byte (sdiodev,SDIOH_WRITE , + err =brcmf_sdiod_request_byte (sdiodev,SDIOH_WRITE ,SDIO_FUNC_1 ,SBSDIO_FUNC1_SBADDRLOW + i, &addr[i]); }while (err !=0 && retry++ <SDIOH_API_ACCESS_RETRY_LIMIT );
@@ -348,13 +348,13 @@ brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address) }static int -brcmf_sdio_addrprep (struct brcmf_sdio_dev *sdiodev,uint width,u32 *addr) +brcmf_sdiod_addrprep (struct brcmf_sdio_dev *sdiodev,uint width,u32 *addr) {uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK ;int err =0 ;if (bar0 != sdiodev->sbwad) { - err =brcmf_sdcard_set_sbaddr_window (sdiodev, bar0); + err =brcmf_sdiod_set_sbaddr_window (sdiodev, bar0);if (err)return err;
@@ -369,8 +369,8 @@ brcmf_sdio_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)return 0 ; } -static int brcmf_sdio_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr, -void *data,bool write) +static int brcmf_sdiod_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr, +void *data,bool write) {u8 func_num, reg_size;s32 retry =0 ;
@@ -392,7 +392,7 @@ static int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr, func_num =SDIO_FUNC_1 ; reg_size =4 ; - ret =brcmf_sdio_addrprep (sdiodev, reg_size, &addr); + ret =brcmf_sdiod_addrprep (sdiodev, reg_size, &addr);if (ret) goto done; }
@@ -403,10 +403,10 @@ static int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,if (retry)/* wait for 1 ms till bus get settled down */ usleep_range (1000 ,2000 );if (reg_size ==1 ) - ret =brcmf_sdioh_request_byte (sdiodev, write, + ret =brcmf_sdiod_request_byte (sdiodev, write, func_num, addr, data);else - ret =brcmf_sdioh_request_word (sdiodev, write, + ret =brcmf_sdiod_request_word (sdiodev, write, func_num, addr, data,4 ); }while (ret !=0 && retry++ <SDIOH_API_ACCESS_RETRY_LIMIT );
@@ -417,13 +417,13 @@ done:return ret; } -u8 brcmf_sdio_regrb (struct brcmf_sdio_dev *sdiodev,u32 addr,int *ret) +u8 brcmf_sdiod_regrb (struct brcmf_sdio_dev *sdiodev,u32 addr,int *ret) {u8 data;int retval;brcmf_dbg (SDIO ,"addr:0x%08x\n" , addr); - retval =brcmf_sdio_regrw_helper (sdiodev, addr, &data, false); + retval =brcmf_sdiod_regrw_helper (sdiodev, addr, &data, false);brcmf_dbg (SDIO ,"data:0x%02x\n" , data);if (ret)
@@ -432,13 +432,13 @@ u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)return data; } -u32 brcmf_sdio_regrl (struct brcmf_sdio_dev *sdiodev,u32 addr,int *ret) +u32 brcmf_sdiod_regrl (struct brcmf_sdio_dev *sdiodev,u32 addr,int *ret) {u32 data;int retval;brcmf_dbg (SDIO ,"addr:0x%08x\n" , addr); - retval =brcmf_sdio_regrw_helper (sdiodev, addr, &data, false); + retval =brcmf_sdiod_regrw_helper (sdiodev, addr, &data, false);brcmf_dbg (SDIO ,"data:0x%08x\n" , data);if (ret)
@@ -447,37 +447,37 @@ u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)return data; } -void brcmf_sdio_regwb (struct brcmf_sdio_dev *sdiodev,u32 addr, +void brcmf_sdiod_regwb (struct brcmf_sdio_dev *sdiodev,u32 addr,u8 data,int *ret) {int retval;brcmf_dbg (SDIO ,"addr:0x%08x, data:0x%02x\n" , addr, data); - retval =brcmf_sdio_regrw_helper (sdiodev, addr, &data, true); + retval =brcmf_sdiod_regrw_helper (sdiodev, addr, &data, true);if (ret) *ret = retval; } -void brcmf_sdio_regwl (struct brcmf_sdio_dev *sdiodev,u32 addr, +void brcmf_sdiod_regwl (struct brcmf_sdio_dev *sdiodev,u32 addr,u32 data,int *ret) {int retval;brcmf_dbg (SDIO ,"addr:0x%08x, data:0x%08x\n" , addr, data); - retval =brcmf_sdio_regrw_helper (sdiodev, addr, &data, true); + retval =brcmf_sdiod_regrw_helper (sdiodev, addr, &data, true);if (ret) *ret = retval; } -static int brcmf_sdio_buffrw (struct brcmf_sdio_dev *sdiodev,uint fn, +static int brcmf_sdiod_buffrw (struct brcmf_sdio_dev *sdiodev,uint fn,bool write,u32 addr,struct sk_buff *pkt) {unsigned int req_sz; -brcmf_pm_resume_wait (sdiodev, &sdiodev->request_buffer_wait); -if (brcmf_pm_resume_error (sdiodev)) +brcmf_sdiod_pm_resume_wait (sdiodev, &sdiodev->request_buffer_wait); +if (brcmf_sdiod_pm_resume_error (sdiodev))return -EIO ;/* Single skb use the standard mmc interface */
@@ -500,7 +500,7 @@ static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, }/** -* brcmf_sdio_sglist_rw - SDIO interface function for block data access +* brcmf_sdiod_sglist_rw - SDIO interface function for block data access * @sdiodev: brcmfmac sdio device * @fn: SDIO function number * @write: direction flag
@@ -511,9 +511,9 @@ static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn,* stack for block data access. It assumes that the skb passed down by the * caller has already been padded and aligned. */ -static int brcmf_sdio_sglist_rw (struct brcmf_sdio_dev *sdiodev,uint fn, -bool write,u32 addr, -struct sk_buff_head *pktlist) +static int brcmf_sdiod_sglist_rw (struct brcmf_sdio_dev *sdiodev,uint fn, +bool write,u32 addr, +struct sk_buff_head *pktlist) {unsigned int req_sz, func_blk_sz, sg_cnt, sg_data_sz, pkt_offset;unsigned int max_req_sz, orig_offset, dst_offset;
@@ -531,8 +531,8 @@ static int brcmf_sdio_sglist_rw(struct brcmf_sdio_dev *sdiodev, uint fn,if (!pktlist->qlen)return -EINVAL ; -brcmf_pm_resume_wait (sdiodev, &sdiodev->request_buffer_wait); -if (brcmf_pm_resume_error (sdiodev)) +brcmf_sdiod_pm_resume_wait (sdiodev, &sdiodev->request_buffer_wait); +if (brcmf_sdiod_pm_resume_error (sdiodev))return -EIO ; target_list = pktlist;
@@ -680,8 +680,8 @@ exit: }int -brcmf_sdcard_recv_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes) +brcmf_sdiod_recv_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, +uint flags,u8 *buf,uint nbytes) {struct sk_buff *mypkt;int err;
@@ -693,7 +693,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,return -EIO ; } - err =brcmf_sdcard_recv_pkt (sdiodev, addr, fn, flags, mypkt); + err =brcmf_sdiod_recv_pkt (sdiodev, addr, fn, flags, mypkt);if (!err)memcpy (buf, mypkt->data, nbytes);
@@ -702,8 +702,8 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, }int -brcmf_sdcard_recv_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff *pkt) +brcmf_sdiod_recv_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, +uint flags,struct sk_buff *pkt) {uint width;int err =0 ;
@@ -712,18 +712,18 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, fn, addr, pkt->len); width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdio_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev, width, &addr);if (err) goto done; - err =brcmf_sdio_buffrw (sdiodev, fn, false, addr, pkt); + err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, pkt); done:return err; } -int brcmf_sdcard_recv_chain (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq,uint totlen) +int brcmf_sdiod_recv_chain (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, +uint flags,struct sk_buff_head *pktq,uint totlen) {struct sk_buff *glom_skb;struct sk_buff *skb;
@@ -734,17 +734,17 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, fn, addr, pktq->qlen); width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdio_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev, width, &addr);if (err) goto done;if (pktq->qlen ==1 ) - err =brcmf_sdio_buffrw (sdiodev, fn, false, addr, pktq->next); + err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, pktq->next);else if (!sdiodev->sg_support) { glom_skb =brcmu_pkt_buf_get_skb (totlen);if (!glom_skb)return -ENOMEM ; - err =brcmf_sdio_buffrw (sdiodev, fn, false, addr, glom_skb); + err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, glom_skb);if (err) goto done;
@@ -753,15 +753,15 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,skb_pull (glom_skb, skb->len); } }else - err =brcmf_sdio_sglist_rw (sdiodev, fn, false, addr, pktq); + err =brcmf_sdiod_sglist_rw (sdiodev, fn, false, addr, pktq); done:return err; }int -brcmf_sdcard_send_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes) +brcmf_sdiod_send_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, +uint flags,u8 *buf,uint nbytes) {struct sk_buff *mypkt;uint width;
@@ -777,10 +777,10 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,memcpy (mypkt->data, buf, nbytes); width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdio_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev, width, &addr);if (!err) - err =brcmf_sdio_buffrw (sdiodev, fn, true, addr, mypkt); + err =brcmf_sdiod_buffrw (sdiodev, fn, true, addr, mypkt);brcmu_pkt_buf_free_skb (mypkt);return err;
@@ -788,8 +788,8 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, }int -brcmf_sdcard_send_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq) +brcmf_sdiod_send_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, +uint flags,struct sk_buff_head *pktq) {struct sk_buff *skb;uint width;
@@ -799,25 +799,25 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, fn, addr, pktq->qlen); width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdio_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev, width, &addr);if (err)return err;if (pktq->qlen ==1 || !sdiodev->sg_support) skb_queue_walk(pktq, skb) { - err =brcmf_sdio_buffrw (sdiodev, fn, true, addr, skb); + err =brcmf_sdiod_buffrw (sdiodev, fn, true, addr, skb);if (err)break ; } else - err =brcmf_sdio_sglist_rw (sdiodev, fn, true, addr, pktq); + err =brcmf_sdiod_sglist_rw (sdiodev, fn, true, addr, pktq);return err; }int -brcmf_sdio_ramrw (struct brcmf_sdio_dev *sdiodev,bool write,u32 address, -u8 *data,uint size) +brcmf_sdiod_ramrw (struct brcmf_sdio_dev *sdiodev,bool write,u32 address, +u8 *data,uint size) {int bcmerror =0 ;struct sk_buff *pkt;
@@ -844,7 +844,7 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,/* Do the transfer(s) */ while (size) {/* Set the backplane window to include the start address */ - bcmerror =brcmf_sdcard_set_sbaddr_window (sdiodev, address); + bcmerror =brcmf_sdiod_set_sbaddr_window (sdiodev, address);if (bcmerror)break ;
@@ -858,8 +858,8 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,skb_put (pkt, dsize);if (write)memcpy (pkt->data, data, dsize); - bcmerror =brcmf_sdio_buffrw (sdiodev,SDIO_FUNC_1 , write, - sdaddr, pkt); + bcmerror =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_1 , write, + sdaddr, pkt);if (bcmerror) {brcmf_err ("membytes transfer failed\n" );break ;
@@ -881,7 +881,7 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,dev_kfree_skb (pkt);/* Return the window to backplane enumeration space for core access */ -if (brcmf_sdcard_set_sbaddr_window (sdiodev, sdiodev->sbwad)) +if (brcmf_sdiod_set_sbaddr_window (sdiodev, sdiodev->sbwad))brcmf_err ("FAILED to set window back to 0x%x\n" , sdiodev->sbwad);
@@ -890,41 +890,64 @@ brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,return bcmerror; } -int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn) +int brcmf_sdiod_abort (struct brcmf_sdio_dev *sdiodev,uint fn) {char t_func = (char )fn;brcmf_dbg (SDIO ,"Enter\n" );/* issue abort cmd52 command through F0 */ -brcmf_sdioh_request_byte (sdiodev,SDIOH_WRITE ,SDIO_FUNC_0 , +brcmf_sdiod_request_byte (sdiodev,SDIOH_WRITE ,SDIO_FUNC_0 ,SDIO_CCCR_ABORT , &t_func);brcmf_dbg (SDIO ,"Exit\n" );return 0 ; } -static int brcmf_sdioh_attach (struct brcmf_sdio_dev *sdiodev) +static int brcmf_sdiod_remove (struct brcmf_sdio_dev *sdiodev) +{ + sdiodev->bus_if->state =BRCMF_BUS_DOWN ; + +if (sdiodev->bus) { +brcmf_sdbrcm_disconnect (sdiodev->bus); + sdiodev->bus =NULL ; + } + +/* Disable Function 2 */ +sdio_claim_host (sdiodev->func[2 ]); +sdio_disable_func (sdiodev->func[2 ]); +sdio_release_host (sdiodev->func[2 ]); + +/* Disable Function 1 */ +sdio_claim_host (sdiodev->func[1 ]); +sdio_disable_func (sdiodev->func[1 ]); +sdio_release_host (sdiodev->func[1 ]); + + sdiodev->sbwad =0 ; + +return 0 ; +} + +static int brcmf_sdiod_probe (struct brcmf_sdio_dev *sdiodev) { -int err_ret =0 ; -struct mmc_host *host;struct sdio_func *func; +struct mmc_host *host;uint max_blocks; - -brcmf_dbg (SDIO ,"\n" ); +int ret =0 ; sdiodev->num_funcs =2 ;sdio_claim_host (sdiodev->func[1 ]); - err_ret =sdio_set_block_size (sdiodev->func[1 ],SDIO_FUNC1_BLOCKSIZE ); -if (err_ret) { + ret =sdio_set_block_size (sdiodev->func[1 ],SDIO_FUNC1_BLOCKSIZE ); +if (ret) {brcmf_err ("Failed to set F1 blocksize\n" ); +sdio_release_host (sdiodev->func[1 ]); goto out; } - - err_ret =sdio_set_block_size (sdiodev->func[2 ],SDIO_FUNC2_BLOCKSIZE ); -if (err_ret) { + ret =sdio_set_block_size (sdiodev->func[2 ],SDIO_FUNC2_BLOCKSIZE ); +if (ret) {brcmf_err ("Failed to set F2 blocksize\n" ); +sdio_release_host (sdiodev->func[1 ]); goto out; }
@@ -932,14 +955,15 @@ static int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) sdiodev->func[2 ]->enable_timeout =SDIO_WAIT_F2RDY ;/* Enable Function 1 */ - err_ret =sdio_enable_func (sdiodev->func[1 ]); -if (err_ret) { -brcmf_err ("Failed to enable F1 Err: 0x%08x\n" , err_ret); + ret =sdio_enable_func (sdiodev->func[1 ]); +sdio_release_host (sdiodev->func[1 ]); +if (ret) { +brcmf_err ("Failed to enable F1: err=%d\n" , ret); goto out; }/* -* determine host related variables after brcmf_sdio_probe() +* determine host related variables after brcmf_sdiod_probe() * as func->cur_blksize is properly set and F2 init has been * completed successfully. */
@@ -952,63 +976,17 @@ static int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) sdiodev->max_segment_count =min_t (uint, host->max_segs,SG_MAX_SINGLE_ALLOC ); sdiodev->max_segment_size = host->max_seg_size; -out: -sdio_release_host (sdiodev->func[1 ]); -brcmf_dbg (SDIO ,"Done\n" ); -return err_ret; -} - -static void brcmf_sdioh_detach (struct brcmf_sdio_dev *sdiodev) -{ -brcmf_dbg (SDIO ,"\n" ); - -/* Disable Function 2 */ -sdio_claim_host (sdiodev->func[2 ]); -sdio_disable_func (sdiodev->func[2 ]); -sdio_release_host (sdiodev->func[2 ]); - -/* Disable Function 1 */ -sdio_claim_host (sdiodev->func[1 ]); -sdio_disable_func (sdiodev->func[1 ]); -sdio_release_host (sdiodev->func[1 ]); - -} - -static int brcmf_sdio_remove (struct brcmf_sdio_dev *sdiodev) -{ - sdiodev->bus_if->state =BRCMF_BUS_DOWN ; - -if (sdiodev->bus) { -brcmf_sdbrcm_disconnect (sdiodev->bus); - sdiodev->bus =NULL ; - } - -brcmf_sdioh_detach (sdiodev); - - sdiodev->sbwad =0 ; - -return 0 ; -} - -static int brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev) -{ -int ret =0 ; - - ret =brcmf_sdioh_attach (sdiodev); -if (ret) - goto out;/* try to attach to the target device */ sdiodev->bus =brcmf_sdbrcm_probe (sdiodev);if (!sdiodev->bus) { -brcmf_err ("device attach failed\n" ); ret = -ENODEV ; goto out; } out:if (ret) -brcmf_sdio_remove (sdiodev); +brcmf_sdiod_remove (sdiodev);return ret; }
@@ -1075,8 +1053,8 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,init_waitqueue_head (&sdiodev->request_word_wait);init_waitqueue_head (&sdiodev->request_buffer_wait); -brcmf_dbg (SDIO ,"F2 found, calling brcmf_sdio_probe...\n" ); - err =brcmf_sdio_probe (sdiodev); +brcmf_dbg (SDIO ,"F2 found, calling brcmf_sdiod_probe...\n" ); + err =brcmf_sdiod_probe (sdiodev);if (err) {brcmf_err ("F2 error, probe failed %d...\n" , err); goto fail;
@@ -1109,7 +1087,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) bus_if =dev_get_drvdata (&func->dev);if (bus_if) { sdiodev = bus_if->bus_priv.sdio; -brcmf_sdio_remove (sdiodev); +brcmf_sdiod_remove (sdiodev);dev_set_drvdata (&sdiodev->func[1 ]->dev,NULL );dev_set_drvdata (&sdiodev->func[2 ]->dev,NULL );
@@ -1122,7 +1100,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) }#ifdef CONFIG_PM_SLEEP -static int brcmf_sdio_suspend (struct device *dev) +static int brcmf_ops_sdio_suspend (struct device *dev) {mmc_pm_flag_t sdio_flags;struct brcmf_bus *bus_if =dev_get_drvdata (dev);
@@ -1150,7 +1128,7 @@ static int brcmf_sdio_suspend(struct device *dev)return ret; } -static int brcmf_sdio_resume (struct device *dev) +static int brcmf_ops_sdio_resume (struct device *dev) {struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
@@ -1161,8 +1139,8 @@ static int brcmf_sdio_resume(struct device *dev) }static const struct dev_pm_ops brcmf_sdio_pm_ops = { - .suspend = brcmf_sdio_suspend, - .resume = brcmf_sdio_resume, + .suspend = brcmf_ops_sdio_suspend, + .resume = brcmf_ops_sdio_resume, };#endif /* CONFIG_PM_SLEEP */
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +160 -164
713 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +144 -144
484 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +22 -22
66 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 11/18 brcmfmac: reduce function parameters in sdio send/receive calls
In reply to Arend van SprielThe SDIO send and receive functions in bcmsdh.c are always called with the same parameters. For the driver there is no use-case to call them otherwise so remove those parameters from function prototypes.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 73 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 20 ++---- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 20 +++--- 3 files changed, 46 insertions(+), 67 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +33 -40
@@ -679,9 +679,7 @@ exit:return ret; } -int -brcmf_sdiod_recv_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes) +int brcmf_sdiod_recv_buf (struct brcmf_sdio_dev *sdiodev,u8 *buf,uint nbytes) {struct sk_buff *mypkt;int err;
@@ -693,7 +691,7 @@ brcmf_sdiod_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,return -EIO ; } - err =brcmf_sdiod_recv_pkt (sdiodev, addr, fn, flags, mypkt); + err =brcmf_sdiod_recv_pkt (sdiodev, mypkt);if (!err)memcpy (buf, mypkt->data, nbytes);
@@ -701,50 +699,47 @@ brcmf_sdiod_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,return err; } -int -brcmf_sdiod_recv_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff *pkt) +int brcmf_sdiod_recv_pkt (struct brcmf_sdio_dev *sdiodev,struct sk_buff *pkt) { -uint width; +u32 addr = sdiodev->sbwad;int err =0 ; -brcmf_dbg (SDIO ,"fun = %d, addr = 0x%x, size = %d\n" , - fn, addr, pkt->len); +brcmf_dbg (SDIO ,"addr = 0x%x, size = %d\n" , addr, pkt->len); - width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdiod_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev,4 , &addr);if (err) goto done; - err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, pkt); + err =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_2 , false, addr, pkt); done:return err; } -int brcmf_sdiod_recv_chain (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq,uint totlen) +int brcmf_sdiod_recv_chain (struct brcmf_sdio_dev *sdiodev, +struct sk_buff_head *pktq,uint totlen) {struct sk_buff *glom_skb;struct sk_buff *skb; -uint width; +u32 addr = sdiodev->sbwad;int err =0 ; -brcmf_dbg (SDIO ,"fun = %d, addr = 0x%x, size = %d\n" , - fn, addr, pktq->qlen); +brcmf_dbg (SDIO ,"addr = 0x%x, size = %d\n" , + addr, pktq->qlen); - width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdiod_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev,4 , &addr);if (err) goto done;if (pktq->qlen ==1 ) - err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, pktq->next); + err =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_2 , false, addr, + pktq->next);else if (!sdiodev->sg_support) { glom_skb =brcmu_pkt_buf_get_skb (totlen);if (!glom_skb)return -ENOMEM ; - err =brcmf_sdiod_buffrw (sdiodev, fn, false, addr, glom_skb); + err =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_2 , false, addr, + glom_skb);if (err) goto done;
@@ -753,18 +748,17 @@ int brcmf_sdiod_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,skb_pull (glom_skb, skb->len); } }else - err =brcmf_sdiod_sglist_rw (sdiodev, fn, false, addr, pktq); + err =brcmf_sdiod_sglist_rw (sdiodev,SDIO_FUNC_2 , false, addr, + pktq); done:return err; } -int -brcmf_sdiod_send_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes) +int brcmf_sdiod_send_buf (struct brcmf_sdio_dev *sdiodev,u8 *buf,uint nbytes) {struct sk_buff *mypkt; -uint width; +u32 addr = sdiodev->sbwad;int err; mypkt =brcmu_pkt_buf_get_skb (nbytes);
@@ -776,41 +770,40 @@ brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,memcpy (mypkt->data, buf, nbytes); - width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdiod_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev,4 , &addr);if (!err) - err =brcmf_sdiod_buffrw (sdiodev, fn, true, addr, mypkt); + err =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_2 , true, addr, + mypkt);brcmu_pkt_buf_free_skb (mypkt);return err; } -int -brcmf_sdiod_send_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq) +int brcmf_sdiod_send_pkt (struct brcmf_sdio_dev *sdiodev, +struct sk_buff_head *pktq) {struct sk_buff *skb; -uint width; +u32 addr = sdiodev->sbwad;int err; -brcmf_dbg (SDIO ,"fun = %d, addr = 0x%x, size = %d\n" , - fn, addr, pktq->qlen); +brcmf_dbg (SDIO ,"addr = 0x%x, size = %d\n" , addr, pktq->qlen); - width = (flags &SDIO_REQ_4BYTE ) ?4 :2 ; - err =brcmf_sdiod_addrprep (sdiodev, width, &addr); + err =brcmf_sdiod_addrprep (sdiodev,4 , &addr);if (err)return err;if (pktq->qlen ==1 || !sdiodev->sg_support) skb_queue_walk(pktq, skb) { - err =brcmf_sdiod_buffrw (sdiodev, fn, true, addr, skb); + err =brcmf_sdiod_buffrw (sdiodev,SDIO_FUNC_2 , true, + addr, skb);if (err)break ; } else - err =brcmf_sdiod_sglist_rw (sdiodev, fn, true, addr, pktq); + err =brcmf_sdiod_sglist_rw (sdiodev,SDIO_FUNC_2 , true, addr, + pktq);return err; }
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +5 -15
@@ -1419,8 +1419,6 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)*/ sdio_claim_host (bus->sdiodev->func[1 ]); errcode =brcmf_sdiod_recv_chain (bus->sdiodev, - bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , &bus->glom, dlen);sdio_release_host (bus->sdiodev->func[1 ]); bus->sdcnt.f2rxdata++;
@@ -1615,8 +1613,7 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff) }/* Read remain of frame body */ - sdret =brcmf_sdiod_recv_buf (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , rbuf, rdlen); + sdret =brcmf_sdiod_recv_buf (bus->sdiodev, rbuf, rdlen); bus->sdcnt.f2rxdata++;/* Control frame failures need retransmission */
@@ -1702,8 +1699,6 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)sdio_claim_host (bus->sdiodev->func[1 ]);if (!rd->len) { ret =brcmf_sdiod_recv_buf (bus->sdiodev, - bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , bus->rxhdr,BRCMF_FIRSTREAD ); bus->sdcnt.f2rxhdrs++;if (ret <0 ) {
@@ -1760,8 +1755,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)skb_pull (pkt, head_read);pkt_align (pkt, rd->len_left, bus->head_align); - ret =brcmf_sdiod_recv_pkt (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , pkt); + ret =brcmf_sdiod_recv_pkt (bus->sdiodev, pkt); bus->sdcnt.f2rxdata++;sdio_release_host (bus->sdiodev->func[1 ]);
@@ -2116,8 +2110,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff_head *pktq, goto done;sdio_claim_host (bus->sdiodev->func[1 ]); - ret =brcmf_sdiod_send_pkt (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , pktq); + ret =brcmf_sdiod_send_pkt (bus->sdiodev, pktq); bus->sdcnt.f2txdata++;if (ret <0 ) {
@@ -2481,9 +2474,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)int i;sdio_claim_host (bus->sdiodev->func[1 ]); - err =brcmf_sdiod_send_buf (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , - bus->ctrl_frame_buf, + err =brcmf_sdiod_send_buf (bus->sdiodev, bus->ctrl_frame_buf, (u32 )bus->ctrl_frame_len);if (err <0 ) {
@@ -2700,8 +2691,7 @@ static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)int ret; bus->ctrl_frame_stat = false; - ret =brcmf_sdiod_send_buf (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , frame, len); + ret =brcmf_sdiod_send_buf (bus->sdiodev, frame, len);if (ret <0 ) {/* On failure, abort the command and terminate the frame */
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +8 -12
@@ -197,7 +197,6 @@ void brcmf_sdiod_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, u32 data,/* Buffer transfer to/from device (client) core via cmd53. * fn: function number -* addr: backplane address (i.e. >= regsva from attach) * flags: backplane width, address increment, sync/async * buf: pointer to memory data buffer * nbytes: number of bytes to transfer to/from buf
@@ -207,17 +206,14 @@ void brcmf_sdiod_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, u32 data,* Returns 0 or error code. * NOTE: Async operation is not currently supported. */ -int brcmf_sdiod_send_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq); -int brcmf_sdiod_send_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes); - -int brcmf_sdiod_recv_pkt (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff *pkt); -int brcmf_sdiod_recv_buf (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,u8 *buf,uint nbytes); -int brcmf_sdiod_recv_chain (struct brcmf_sdio_dev *sdiodev,u32 addr,uint fn, -uint flags,struct sk_buff_head *pktq,uint totlen); +int brcmf_sdiod_send_pkt (struct brcmf_sdio_dev *sdiodev, +struct sk_buff_head *pktq); +int brcmf_sdiod_send_buf (struct brcmf_sdio_dev *sdiodev,u8 *buf,uint nbytes); + +int brcmf_sdiod_recv_pkt (struct brcmf_sdio_dev *sdiodev,struct sk_buff *pkt); +int brcmf_sdiod_recv_buf (struct brcmf_sdio_dev *sdiodev,u8 *buf,uint nbytes); +int brcmf_sdiod_recv_chain (struct brcmf_sdio_dev *sdiodev, +struct sk_buff_head *pktq,uint totlen);/* Flags bits */
Signature · 1 line
1.7.10.4
PATCH 12/18 brcmfmac: Move common BCDC code in single function.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
The BCDC functions query_dcmd and set_dcmd both create a msgbuf to be sent to dongle this code is very similar and for optimisation best put in a function.
--- drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 68 +++++++++--------------- 1 file changed, 25 insertions(+), 43 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcdc.c +25 -43
@@ -101,35 +101,41 @@ struct brcmf_proto_bcdc_header {* plus any space that might be needed * for bus alignment padding. */ -#define ROUND_UP_MARGIN 2048/* Biggest bus block size possible for -* round off at the end of buffer -* Currently is SDIO -*/ -struct brcmf_bcdc {u16 reqid;u8 bus_header[BUS_HEADER_LEN ];struct brcmf_proto_bcdc_dcmd msg; -unsigned char buf[BRCMF_DCMD_MAXLEN +ROUND_UP_MARGIN ]; +unsigned char buf[BRCMF_DCMD_MAXLEN ]; }; -static int brcmf_proto_bcdc_msg (struct brcmf_pub *drvr) + +static int +brcmf_proto_bcdc_msg (struct brcmf_pub *drvr,int ifidx,uint cmd,void *buf, +uint len,bool set) {struct brcmf_bcdc *bcdc = (struct brcmf_bcdc *)drvr->proto->pd; -int len =le32_to_cpu (bcdc->msg.len) + -sizeof (struct brcmf_proto_bcdc_dcmd ); +struct brcmf_proto_bcdc_dcmd *msg = &bcdc->msg; +u32 flags;brcmf_dbg (BCDC ,"Enter\n" ); -/* NOTE : bcdc->msg.len holds the desired length of the buffer to be -* returned. Only up to BCDC_MAX_MSG_SIZE of this buffer area -* is actually sent to the dongle -*/ -if (len >BCDC_MAX_MSG_SIZE ) - len =BCDC_MAX_MSG_SIZE ; +memset (msg,0 ,sizeof (struct brcmf_proto_bcdc_dcmd )); + + msg->cmd =cpu_to_le32 (cmd); + msg->len =cpu_to_le32 (len); + flags = (++bcdc->reqid <<BCDC_DCMD_ID_SHIFT ); +if (set) + flags |=BCDC_DCMD_SET ; + flags = (flags & ~BCDC_DCMD_IF_MASK ) | + (ifidx <<BCDC_DCMD_IF_SHIFT ); + msg->flags =cpu_to_le32 (flags); + +if (buf) +memcpy (bcdc->buf, buf, len);/* Send request */ -return brcmf_bus_txctl (drvr->bus_if, (unsigned char *)&bcdc->msg, len); +return brcmf_bus_txctl (drvr->bus_if, (unsigned char *)&bcdc->msg, + len +sizeof (struct brcmf_proto_bcdc_dcmd )); }static int brcmf_proto_bcdc_cmplt (struct brcmf_pub *drvr,u32 id,u32 len)
@@ -161,19 +167,7 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,brcmf_dbg (BCDC ,"Enter, cmd %d len %d\n" , cmd, len); -memset (msg,0 ,sizeof (struct brcmf_proto_bcdc_dcmd )); - - msg->cmd =cpu_to_le32 (cmd); - msg->len =cpu_to_le32 (len); - flags = (++bcdc->reqid <<BCDC_DCMD_ID_SHIFT ); - flags = (flags & ~BCDC_DCMD_IF_MASK ) | - (ifidx <<BCDC_DCMD_IF_SHIFT ); - msg->flags =cpu_to_le32 (flags); - -if (buf) -memcpy (bcdc->buf, buf, len); - - ret =brcmf_proto_bcdc_msg (drvr); + ret =brcmf_proto_bcdc_msg (drvr, ifidx, cmd, buf, len, false);if (ret <0 ) {brcmf_err ("brcmf_proto_bcdc_msg failed w/status %d\n" , ret);
@@ -227,19 +221,7 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,brcmf_dbg (BCDC ,"Enter, cmd %d len %d\n" , cmd, len); -memset (msg,0 ,sizeof (struct brcmf_proto_bcdc_dcmd )); - - msg->cmd =cpu_to_le32 (cmd); - msg->len =cpu_to_le32 (len); - flags = (++bcdc->reqid <<BCDC_DCMD_ID_SHIFT ) |BCDC_DCMD_SET ; - flags = (flags & ~BCDC_DCMD_IF_MASK ) | - (ifidx <<BCDC_DCMD_IF_SHIFT ); - msg->flags =cpu_to_le32 (flags); - -if (buf) -memcpy (bcdc->buf, buf, len); - - ret =brcmf_proto_bcdc_msg (drvr); + ret =brcmf_proto_bcdc_msg (drvr, ifidx, cmd, buf, len, true);if (ret <0 ) goto done;
@@ -369,7 +351,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) drvr->hdrlen +=BCDC_HEADER_LEN +BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES ; drvr->bus_if->maxctl =BRCMF_DCMD_MAXLEN + -sizeof (struct brcmf_proto_bcdc_dcmd ) +ROUND_UP_MARGIN ; +sizeof (struct brcmf_proto_bcdc_dcmd );return 0 ; fail:
Signature · 1 line
1.7.10.4
PATCH 13/18 brcmfmac: Fix hex dump for FWIL.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
The debug function brcmf_dbg_hex_dump API got changed and the information string should preferably contain a \n at the end of the string. Update the FWIL so debug output looks better.
--- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwil.c +6 -6
@@ -68,7 +68,7 @@ brcmf_fil_cmd_data_set(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)brcmf_dbg (FIL ,"cmd=%d, len=%d\n" , cmd, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" ); err =brcmf_fil_cmd_data (ifp, cmd, data, len, true);mutex_unlock (&ifp->drvr->proto_block);
@@ -86,7 +86,7 @@ brcmf_fil_cmd_data_get(struct brcmf_if *ifp, u32 cmd, void *data, u32 len)brcmf_dbg (FIL ,"cmd=%d, len=%d\n" , cmd, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" );mutex_unlock (&ifp->drvr->proto_block);
@@ -155,7 +155,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if *ifp, char *name, void *data,brcmf_dbg (FIL ,"name=%s, len=%d\n" , name, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" ); buflen =brcmf_create_iovar (name, data, len, drvr->proto_buf,sizeof (drvr->proto_buf));
@@ -195,7 +195,7 @@ brcmf_fil_iovar_data_get(struct brcmf_if *ifp, char *name, void *data,brcmf_dbg (FIL ,"name=%s, len=%d\n" , name, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" );mutex_unlock (&drvr->proto_block);return err;
@@ -278,7 +278,7 @@ brcmf_fil_bsscfg_data_set(struct brcmf_if *ifp, char *name,brcmf_dbg (FIL ,"bssidx=%d, name=%s, len=%d\n" , ifp->bssidx, name, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" ); buflen =brcmf_create_bsscfg (ifp->bssidx, name, data, len, drvr->proto_buf,sizeof (drvr->proto_buf));
@@ -317,7 +317,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_if *ifp, char *name, }brcmf_dbg (FIL ,"bssidx=%d, name=%s, len=%d\n" , ifp->bssidx, name, len);brcmf_dbg_hex_dump (BRCMF_FIL_ON (), data, -min_t (uint, len,MAX_HEX_DUMP_LEN ),"data" ); +min_t (uint, len,MAX_HEX_DUMP_LEN ),"data\n" );mutex_unlock (&drvr->proto_block);return err;
Signature · 1 line
1.7.10.4
PATCH 14/18 brcmfmac: Add definition of new protocol layer msgbuf.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
A new protocol layer msgbuf will be added in the future. This change makes it possible to select the desired layer by the bus driver. USB and SDIO will select BCDC. At the moment nothing is being done with this information.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 8 ++++++++ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1 + 3 files changed, 10 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +1 -0
@@ -1036,6 +1036,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, sdiodev->bus_if = bus_if; bus_if->bus_priv.sdio = sdiodev; + bus_if->proto_type =BRCMF_PROTO_BCDC ;dev_set_drvdata (&func->dev, bus_if);dev_set_drvdata (&sdiodev->func[1 ]->dev, bus_if); sdiodev->dev = &sdiodev->func[1 ]->dev;
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +8 -0
@@ -24,6 +24,12 @@ enum brcmf_bus_state {BRCMF_BUS_DATA /* Ready for frame transfers */ }; +/* The level of bus communication with the dongle */ +enum brcmf_bus_protocol_type { +BRCMF_PROTO_BCDC , +BRCMF_PROTO_MSGBUF +}; +struct brcmf_bus_dcmd {char *name;char *param;
@@ -65,6 +71,7 @@ struct brcmf_bus_ops {* struct brcmf_bus - interface structure between common and bus layer * * @bus_priv: pointer to private bus device. +* @proto_type: protocol type, bcdc or msgbuf * @dev: device pointer of bus device. * @drvr: public driver information. * @state: operational state of the bus interface.
@@ -80,6 +87,7 @@ struct brcmf_bus {struct brcmf_sdio_dev *sdio;struct brcmf_usbdev *usb; } bus_priv; +enum brcmf_bus_protocol_type proto_type;struct device *dev;struct brcmf_pub *drvr;enum brcmf_bus_state state;
drivers/net/wireless/brcm80211/brcmfmac/usb.c +1 -0
@@ -1253,6 +1253,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) bus->ops = &brcmf_usb_bus_ops; bus->chip = bus_pub->devid; bus->chiprev = bus_pub->chiprev; + bus->proto_type =BRCMF_PROTO_BCDC ;/* Attach to the common driver interface */ ret =brcmf_attach (dev);
Signature · 1 line
1.7.10.4
PATCH 15/18 brcmfmac: Combine protocol push hdr and bus txdata.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
For the transmission of data a protocol push hdr is performed followed by a bus txdata call. For the new protocol msgbuf this is not workable. Since they are already "loosely" coupled for bcdc protocol they are combined. This means that txdata will go "through" the protocol layer and a seperate protocol push hdr will not be needed anymore.
--- drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 11 +++++- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 37 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/proto.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/proto.h | 14 ++++---- 4 files changed, 35 insertions(+), 29 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcdc.c +10 -1
@@ -329,6 +329,15 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws, u8 *ifidx,return 0 ; } +static int +brcmf_proto_bcdc_txdata (struct brcmf_pub *drvr,int ifidx,u8 offset, +struct sk_buff *pktbuf) +{ +brcmf_proto_bcdc_hdrpush (drvr, ifidx, offset, pktbuf); +return brcmf_bus_txdata (drvr->bus_if, pktbuf); +} + +int brcmf_proto_bcdc_attach (struct brcmf_pub *drvr) {struct brcmf_bcdc *bcdc;
@@ -343,10 +352,10 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) goto fail; } - drvr->proto->hdrpush = brcmf_proto_bcdc_hdrpush; drvr->proto->hdrpull = brcmf_proto_bcdc_hdrpull; drvr->proto->query_dcmd = brcmf_proto_bcdc_query_dcmd; drvr->proto->set_dcmd = brcmf_proto_bcdc_set_dcmd; + drvr->proto->txdata = brcmf_proto_bcdc_txdata; drvr->proto->pd = bcdc; drvr->hdrlen +=BCDC_HEADER_LEN +BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES ;
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +17 -20
@@ -838,7 +838,7 @@ static void brcmf_fws_cleanup(struct brcmf_fws_info *fws, int ifidx)brcmf_fws_hanger_cleanup (fws, matchfn, ifidx); } -static int brcmf_fws_hdrpush (struct brcmf_fws_info *fws,struct sk_buff *skb) +static u8 brcmf_fws_hdrpush (struct brcmf_fws_info *fws,struct sk_buff *skb) {struct brcmf_fws_mac_descriptor *entry =brcmf_skbcb (skb)->mac;u8 *wlh;
@@ -887,9 +887,7 @@ static int brcmf_fws_hdrpush(struct brcmf_fws_info *fws, struct sk_buff *skb)if (fillers)memset (wlh,BRCMF_FWS_TYPE_FILLER , fillers); -brcmf_proto_hdrpush (fws->drvr,brcmf_skb_if_flags_get_field (skb,INDEX ), - data_offset >>2 , skb); -return 0 ; +return (u8)(data_offset >>2 ); } static bool brcmf_fws_tim_update(struct brcmf_fws_info *fws,
@@ -897,10 +895,11 @@ static bool brcmf_fws_tim_update(struct brcmf_fws_info *fws, int fifo, bool send_immediately) {struct sk_buff *skb; -struct brcmf_bus *bus;struct brcmf_skbuff_cb *skcb;s32 err;u32 len; +u8 data_offset; +int ifidx;/* check delayedQ and suppressQ in one call using bitmap */ if (brcmu_pktq_mlen (&entry->psq,3 << (fifo *2 )) ==0 )
@@ -928,13 +927,11 @@ static bool brcmf_fws_tim_update(struct brcmf_fws_info *fws, skcb->state =BRCMF_FWS_SKBSTATE_TIM ; skcb->htod =0 ; skcb->htod_seq =0 ; - bus = fws->drvr->bus_if; - err =brcmf_fws_hdrpush (fws, skb); -if (err ==0 ) { -brcmf_fws_unlock (fws); - err =brcmf_bus_txdata (bus, skb); -brcmf_fws_lock (fws); - } + data_offset =brcmf_fws_hdrpush (fws, skb); + ifidx =brcmf_skb_if_flags_get_field (skb,INDEX ); +brcmf_fws_unlock (fws); + err =brcmf_proto_txdata (fws->drvr, ifidx, data_offset, skb); +brcmf_fws_lock (fws);if (err)brcmu_pkt_buf_free_skb (skb);return true;
@@ -1719,7 +1716,7 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,return 0 ; } -static void brcmf_fws_precommit_skb (struct brcmf_fws_info *fws,int fifo, +static u8 brcmf_fws_precommit_skb (struct brcmf_fws_info *fws,int fifo,struct sk_buff *p) {struct brcmf_skbuff_cb *skcb =brcmf_skbcb (p);
@@ -1737,7 +1734,7 @@ static void brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo, flags |=BRCMF_FWS_HTOD_FLAG_PKT_REQUESTED ; }brcmf_skb_htod_tag_set_field (p,FLAGS , flags); -brcmf_fws_hdrpush (fws, p); +return brcmf_fws_hdrpush (fws, p); } static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws,
@@ -1805,20 +1802,21 @@ static int brcmf_fws_commit_skb(struct brcmf_fws_info *fws, int fifo, {struct brcmf_skbuff_cb *skcb =brcmf_skbcb (skb);struct brcmf_fws_mac_descriptor *entry; -struct brcmf_bus *bus = fws->drvr->bus_if;int rc;u8 ifidx; +u8 data_offset; entry = skcb->mac;if (IS_ERR (entry))return PTR_ERR (entry); -brcmf_fws_precommit_skb (fws, fifo, skb); + data_offset =brcmf_fws_precommit_skb (fws, fifo, skb); entry->transit_count++;if (entry->suppressed) entry->suppr_transit_count++; + ifidx =brcmf_skb_if_flags_get_field (skb,INDEX );brcmf_fws_unlock (fws); - rc =brcmf_bus_txdata (bus, skb); + rc =brcmf_proto_txdata (fws->drvr, ifidx, data_offset, skb);brcmf_fws_lock (fws);brcmf_dbg (DATA ,"%s flags %X htod %X bus_tx %d\n" , entry->name, skcb->if_flags, skcb->htod, rc);
@@ -1979,10 +1977,9 @@ static void brcmf_fws_dequeue_worker(struct work_struct *worker) &skb, true); ifidx =brcmf_skb_if_flags_get_field (skb,INDEX ); -brcmf_proto_hdrpush (drvr, ifidx,0 , skb); -/* Use bus module to send data frame */ +/* Use proto layer to send data frame */ brcmf_fws_unlock (fws); - ret =brcmf_bus_txdata (drvr->bus_if, skb); + ret =brcmf_proto_txdata (drvr, ifidx,0 , skb);brcmf_fws_lock (fws);if (ret <0 )brcmf_txfinalize (drvr, skb, false);
drivers/net/wireless/brcm80211/brcmfmac/proto.c +1 -1
@@ -39,7 +39,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)if (brcmf_proto_bcdc_attach (drvr)) goto fail; -if ((proto->hdrpush ==NULL ) || (proto->hdrpull ==NULL ) || +if ((proto->txdata ==NULL ) || (proto->hdrpull ==NULL ) || (proto->query_dcmd ==NULL ) || (proto->set_dcmd ==NULL )) {brcmf_err ("Not all proto handlers have been installed\n" ); goto fail;
drivers/net/wireless/brcm80211/brcmfmac/proto.h +7 -7
@@ -17,14 +17,14 @@#define BRCMFMAC_PROTO_H struct brcmf_proto { -void (*hdrpush)(struct brcmf_pub *drvr,int ifidx,u8 offset, -struct sk_buff *skb);int (*hdrpull)(struct brcmf_pub *drvr,bool do_fws,u8 *ifidx,struct sk_buff *skb);int (*query_dcmd)(struct brcmf_pub *drvr,int ifidx,uint cmd,void *buf,uint len);int (*set_dcmd)(struct brcmf_pub *drvr,int ifidx,uint cmd,void *buf,uint len); +int (*txdata)(struct brcmf_pub *drvr,int ifidx,u8 offset, +struct sk_buff *skb);void *pd; };
@@ -32,11 +32,6 @@ struct brcmf_proto {int brcmf_proto_attach (struct brcmf_pub *drvr);void brcmf_proto_detach (struct brcmf_pub *drvr); -static inline void brcmf_proto_hdrpush (struct brcmf_pub *drvr,int ifidx, -u8 offset,struct sk_buff *skb) -{ - drvr->proto->hdrpush (drvr, ifidx, offset, skb); -}static inline int brcmf_proto_hdrpull (struct brcmf_pub *drvr,bool do_fws,u8 *ifidx,struct sk_buff *skb) {
@@ -52,6 +47,11 @@ static inline int brcmf_proto_set_dcmd(struct brcmf_pub *drvr, int ifidx, {return drvr->proto->set_dcmd (drvr, ifidx, cmd, buf, len); } +static inline int brcmf_proto_txdata (struct brcmf_pub *drvr,int ifidx, +u8 offset,struct sk_buff *skb) +{ +return drvr->proto->txdata (drvr, ifidx, offset, skb); +}#endif /* BRCMFMAC_PROTO_H */
Signature · 1 line
1.7.10.4
PATCH 16/18 brcmfmac: use consistent function names in dhd_sdio.c
In reply to Arend van SprielFunctions in dhd_sdio.c that are called with struct brcmf_sdio instance are renamed consistently with brcmf_sdio_ prefix.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 12 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 346 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 9 +- 3 files changed, 178 insertions(+), 189 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +6 -6
@@ -72,7 +72,7 @@ static irqreturn_t brcmf_sdiod_oob_irqhandler(int irq, void *dev_id) sdiodev->irq_en = false; } -brcmf_sdbrcm_isr (sdiodev->bus); +brcmf_sdio_isr (sdiodev->bus);return IRQ_HANDLED ; }
@@ -84,7 +84,7 @@ static void brcmf_sdiod_ib_irqhandler(struct sdio_func *func)brcmf_dbg (INTR ,"IB intr triggered\n" ); -brcmf_sdbrcm_isr (sdiodev->bus); +brcmf_sdio_isr (sdiodev->bus); }/* dummy handler for SDIO function 2 interrupt */
@@ -901,7 +901,7 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev) sdiodev->bus_if->state =BRCMF_BUS_DOWN ;if (sdiodev->bus) { -brcmf_sdbrcm_disconnect (sdiodev->bus); +brcmf_sdio_disconnect (sdiodev->bus); sdiodev->bus =NULL ; }
@@ -971,7 +971,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) sdiodev->max_segment_size = host->max_seg_size;/* try to attach to the target device */ - sdiodev->bus =brcmf_sdbrcm_probe (sdiodev); + sdiodev->bus =brcmf_sdio_probe (sdiodev);if (!sdiodev->bus) { ret = -ENODEV ; goto out;
@@ -1117,7 +1117,7 @@ static int brcmf_ops_sdio_suspend(struct device *dev)return ret; } -brcmf_sdbrcm_wd_timer (sdiodev->bus,0 ); +brcmf_sdio_wd_timer (sdiodev->bus,0 );return ret; }
@@ -1127,7 +1127,7 @@ static int brcmf_ops_sdio_resume(struct device *dev)struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; -brcmf_sdbrcm_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS ); +brcmf_sdio_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS );atomic_set (&sdiodev->suspend, false);return 0 ; }
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +167 -179
1,078 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +5 -4
@@ -235,9 +235,10 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,/* Issue an abort to the specified function */ int brcmf_sdiod_abort (struct brcmf_sdio_dev *sdiodev,uint fn); -struct brcmf_sdio *brcmf_sdbrcm_probe (struct brcmf_sdio_dev *sdiodev); -void brcmf_sdbrcm_disconnect (struct brcmf_sdio *bus); -void brcmf_sdbrcm_isr (struct brcmf_sdio *bus); -void brcmf_sdbrcm_wd_timer (struct brcmf_sdio *bus,uint wdtick); +struct brcmf_sdio *brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev); +void brcmf_sdio_disconnect (struct brcmf_sdio *bus); +void brcmf_sdio_isr (struct brcmf_sdio *bus); + +void brcmf_sdio_wd_timer (struct brcmf_sdio *bus,uint wdtick);#endif /* _BRCM_SDH_H_ */
Signature · 1 line
1.7.10.4
PATCH 17/18 brcmfmac: remove brcmf_sdio_disconnect() function
In reply to Arend van SprielInstead of calling brcmf_sdio_disconnect() expose brcmf_sdio_remove() and call it directly.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 51 ++++++++------------ .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 +- 3 files changed, 23 insertions(+), 32 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +1 -1
@@ -901,7 +901,7 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev) sdiodev->bus_if->state =BRCMF_BUS_DOWN ;if (sdiodev->bus) { -brcmf_sdio_disconnect (sdiodev->bus); +brcmf_sdio_remove (sdiodev->bus); sdiodev->bus =NULL ; }
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +21 -30
69 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +1 -1
@@ -236,7 +236,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,int brcmf_sdiod_abort (struct brcmf_sdio_dev *sdiodev,uint fn);struct brcmf_sdio *brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev); -void brcmf_sdio_disconnect (struct brcmf_sdio *bus); +void brcmf_sdio_remove (struct brcmf_sdio *bus);void brcmf_sdio_isr (struct brcmf_sdio *bus);void brcmf_sdio_wd_timer (struct brcmf_sdio *bus,uint wdtick);
Signature · 1 line
1.7.10.4
PATCH 18/18 brcmfmac: clarify struct brcmf_sdio_dev::func[0] reference
In reply to Arend van SprielThe struct brcmf_sdio_dev contains array of sdio functions that are used in the driver. However, during probe func[0] entry was assigned to the function 1 reference. This was corrected upon doing the actual I/O access. This patch makes it more clear by creating the func[0] entry properly and use it as is during I/O access.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 36 ++++++++++------------ 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +16 -20
@@ -197,32 +197,21 @@ int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)return 0 ; } -static inline int brcmf_sdiod_f0_write_byte (struct brcmf_sdio_dev *sdiodev, -uint regaddr,u8 *byte) +static inline int brcmf_sdiod_f0_writeb (struct sdio_func *func, +uint regaddr,u8 byte) { -struct sdio_func *sdfunc = sdiodev->func[0 ];int err_ret;/* * Can only directly write to some F0 registers. -* Handle F2 enable/disable and Abort command +* Handle CCCR_IENx and CCCR_ABORT command * as a special case. */ if ((regaddr ==SDIO_CCCR_ABORT ) || - (regaddr == SDIO_CCCR_IENx)) { - sdfunc =kmemdup (sdiodev->func[0 ],sizeof (struct sdio_func ), -GFP_KERNEL ); -if (!sdfunc) -return -ENOMEM ; - sdfunc->num =0 ; -sdio_writeb (sdfunc, *byte, regaddr, &err_ret); -kfree (sdfunc); - }else if (regaddr <0xF0 ) { -brcmf_err ("F0 Wr:0x%02x: write disallowed\n" , regaddr); - err_ret = -EPERM ; - }else { -sdio_f0_writeb (sdfunc, *byte, regaddr, &err_ret); - } + (regaddr == SDIO_CCCR_IENx)) +sdio_writeb (func, byte, regaddr, &err_ret); +else +sdio_f0_writeb (func, byte, regaddr, &err_ret);return err_ret; }
@@ -240,7 +229,8 @@ static int brcmf_sdiod_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw,if (rw && func ==0 ) {/* handle F0 separately */ - err_ret =brcmf_sdiod_f0_write_byte (sdiodev, regaddr, byte); + err_ret =brcmf_sdiod_f0_writeb (sdiodev->func[func], + regaddr, *byte); }else {if (rw)/* CMD52 Write */ sdio_writeb(sdiodev->func[func], *byte, regaddr,
@@ -1030,7 +1020,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,return -ENOMEM ; } - sdiodev->func[0 ] = func->card->sdio_func[0 ]; +/* store refs to functions used. mmc_card does +* not hold the F0 function pointer. +*/ + sdiodev->func[0 ] =kmemdup (func,sizeof (*func),GFP_KERNEL ); + sdiodev->func[0 ]->num =0 ; sdiodev->func[1 ] = func->card->sdio_func[0 ]; sdiodev->func[2 ] = func;
@@ -1060,6 +1054,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, fail:dev_set_drvdata (&func->dev,NULL );dev_set_drvdata (&sdiodev->func[1 ]->dev,NULL ); +kfree (sdiodev->func[0 ]);kfree (sdiodev);kfree (bus_if);return err;
@@ -1087,6 +1082,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)dev_set_drvdata (&sdiodev->func[2 ]->dev,NULL );kfree (bus_if); +kfree (sdiodev->func[0 ]);kfree (sdiodev); }
Signature · 1 line
1.7.10.4
Quoted 3 lines · Arend van Spriel
This series consists mostly of cleanup in SDIO driver code. Other changes are preparing to new firmware protocol called msgbuf, which is intended for PCIe fullmac devices.
Probably needless to say, but saying it anyway ;-). This patch series is intended fro 3.14. It applies to the master branch of the wireless-next repository.
Regards,
Arend