brcmfmac: cleanup and new device support
cover brcmfmac: cleanup and new device support
This series has a few cleanup patches fixing a sparse error, cleaning up the rx path and also changing the firmware filename approach after getting feedback on this by Stephen Warren. The remaining patches are adding support for the BCM4339 SDIO chipset.
This series is intended for v3.13 kernel and applies to the master branch of the wireless-next repository.
Arend van Spriel (2):
brcmfmac: fix sparse error 'bad constant expression'
brcmfmac: rework rx path bus interface
Franky Lin (4):
brcmfmac: sync firmware event list
brcmfmac: add BCM4339 SDIO interface support
brcmfmac: add valid core index check in related functions
brcmfmac: reserve memory for bus layer in sk_buff::cb
Hante Meuleman (1):
brcmfmac: Use fw filename and nvram based of devid for sdio.
.../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 11 +- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 - drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 38 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 234 ++++++++++++-------- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 28 +++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 8 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 11 files changed, 211 insertions(+), 125 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/7 brcmfmac: sync firmware event list
From: Franky Lin <[email protected]>
Update event list to keep sync with firmware development. Use calculated event mask length instead of hard-coded value.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 -- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +0 -2
@@ -97,8 +97,6 @@#define WLC_PHY_TYPE_LCN 8#define WLC_PHY_TYPE_NULL 0xf -#define BRCMF_EVENTING_MASK_LEN 16 -#define TOE_TX_CSUM_OL 0x00000001#define TOE_RX_CSUM_OL 0x00000002
drivers/net/wireless/brcm80211/brcmfmac/fweh.h +4 -1
@@ -102,7 +102,8 @@ struct brcmf_event; BRCMF_ENUM_DEF(DCS_REQUEST, 73) \ BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) \ BRCMF_ENUM_DEF(ACTION_FRAME_RX, 75) \ - BRCMF_ENUM_DEF(BCMC_CREDIT_SUPPORT, 127) + BRCMF_ENUM_DEF(BCMC_CREDIT_SUPPORT, 127) \ + BRCMF_ENUM_DEF(PSTA_PRIMARY_INTF_IND, 128)#define BRCMF_ENUM_DEF (id, val) \ BRCMF_E_##id = (val),
@@ -114,6 +115,8 @@ enum brcmf_fweh_event_code { };#undef BRCMF_ENUM_DEF +#define BRCMF_EVENTING_MASK_LEN (roundup(BRCMF_E_LAST, 8)/8) +/* flags field values in struct brcmf_event_msg */ #define BRCMF_EVENT_MSG_LINK 0x01#define BRCMF_EVENT_MSG_FLUSHTXQ 0x02
Signature · 1 line
1.7.10.4
PATCH 2/7 brcmfmac: add BCM4339 SDIO interface support
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
BCM4339 is an a/b/g/n/ac 1x1 WiFi chip. This patch adds support for it through SDIO interface.
--- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 11 +++-------- drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 18 ++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h | 8 ++++++++ drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 30 insertions(+), 8 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +3 -8
@@ -34,6 +34,7 @@#include <brcmu_utils.h> #include <brcmu_wifi.h> #include "sdio_host.h" +#include "sdio_chip.h" #include "dhd_dbg.h" #include "dhd_bus.h"
@@ -41,13 +42,6 @@#define DMA_ALIGN_MASK 0x03 -#define SDIO_DEVICE_ID_BROADCOM_43143 43143 -#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 -#define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 -#define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 -#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 -#define SDIO_DEVICE_ID_BROADCOM_4335 0x4335 -#define SDIO_FUNC1_BLOCKSIZE 64#define SDIO_FUNC2_BLOCKSIZE 512
@@ -58,7 +52,8 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { {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)}, + {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, + SDIO_DEVICE_ID_BROADCOM_4335_4339)}, { /* end: all zeroes */ }, };MODULE_DEVICE_TABLE (sdio, brcmf_sdmmc_ids);
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +18 -0
@@ -18,6 +18,7 @@#include <linux/types.h> #include <linux/netdevice.h> #include <linux/mmc/card.h> +#include <linux/mmc/sdio_func.h> #include <linux/ssb/ssb_regs.h> #include <linux/bcma/bcma.h>
@@ -444,6 +445,9 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, NULL); ci->chip = regdata &CID_ID_MASK ; ci->chiprev = (regdata &CID_REV_MASK ) >>CID_REV_SHIFT ; +if (sdiodev->func[0 ]->device ==SDIO_DEVICE_ID_BROADCOM_4335_4339 && + ci->chiprev >=2 ) + ci->chip =BCM4339_CHIP_ID ; ci->socitype = (regdata &CID_TYPE_MASK ) >>CID_TYPE_SHIFT ;brcmf_dbg (INFO ,"chipid=0x%x chiprev=%d\n" , ci->chip, ci->chiprev);
@@ -541,6 +545,20 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, ci->ramsize =0xc0000 ; ci->rambase =0x180000 ;break ; +case BCM4339_CHIP_ID : + ci->c_inf[0 ].wrapbase =0x18100000 ; + ci->c_inf[0 ].cib =0x2e084411 ; + ci->c_inf[1 ].id =BCMA_CORE_SDIO_DEV ; + ci->c_inf[1 ].base =0x18005000 ; + ci->c_inf[1 ].wrapbase =0x18105000 ; + ci->c_inf[1 ].cib =0x15004211 ; + ci->c_inf[2 ].id =BCMA_CORE_ARM_CR4 ; + ci->c_inf[2 ].base =0x18002000 ; + ci->c_inf[2 ].wrapbase =0x18102000 ; + ci->c_inf[2 ].cib =0x04084411 ; + ci->ramsize =0xc0000 ; + ci->rambase =0x180000 ; +break ;default :brcmf_err ("chipid 0x%x is not supported\n" , ci->chip);return -ENODEV ;
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +8 -0
@@ -54,6 +54,14 @@#define BRCMF_MAX_CORENUM 6 +/* SDIO device ID */ +#define SDIO_DEVICE_ID_BROADCOM_43143 43143 +#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 +#define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 +#define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 +#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 +#define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 +struct chip_core_info {u16 id;u16 rev;
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +1 -0
@@ -41,5 +41,6 @@#define BCM4331_CHIP_ID 0x4331#define BCM4334_CHIP_ID 0x4334#define BCM4335_CHIP_ID 0x4335 +#define BCM4339_CHIP_ID 0x4339#endif /* _BRCM_HW_IDS_H_ */
Signature · 1 line
1.7.10.4
PATCH 3/7 brcmfmac: add valid core index check in related functions
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Perform a valid check for core index to avoid illegal address access.
--- drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +10 -0
@@ -137,6 +137,8 @@ brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,u8 idx; idx =brcmf_sdio_chip_getinfidx (ci, coreid); +if (idx ==BRCMF_MAX_CORENUM ) +return false; regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
@@ -155,6 +157,8 @@ brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev,bool ret; idx =brcmf_sdio_chip_getinfidx (ci, coreid); +if (idx ==BRCMF_MAX_CORENUM ) +return false; regdata =brcmf_sdio_regrl (sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL ,NULL );
@@ -262,6 +266,8 @@ brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,u32 regdata; idx =brcmf_sdio_chip_getinfidx (ci, coreid); +if (idx ==BRCMF_MAX_CORENUM ) +return ;/* if core is already in reset, just return */ regdata = brcmf_sdio_regrl(sdiodev,
@@ -305,6 +311,8 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,u8 idx; idx =brcmf_sdio_chip_getinfidx (ci, coreid); +if (idx ==BRCMF_MAX_CORENUM ) +return ;/* * Must do the disable sequence first to work for
@@ -369,6 +377,8 @@ brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,u32 regdata; idx =brcmf_sdio_chip_getinfidx (ci, coreid); +if (idx ==BRCMF_MAX_CORENUM ) +return ;/* must disable first to work for arbitrary current core state */ brcmf_sdio_ai_coredisable (sdiodev, ci, coreid, core_bits);
Signature · 1 line
1.7.10.4
PATCH 4/7 brcmfmac: reserve memory for bus layer in sk_buff::cb
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Bus layer need to share sk_buff::cb with firmware signal feature. Reserve necessary memory so they won't overwrite each other.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 15 ++++++++++----- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +10 -5
@@ -1786,10 +1786,15 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)return ; } +/** +* struct brcmf_skbuff_cb reserves first two bytes in sk_buff::cb for +* bus layer usage. +*/ /* flag marking a dummy skb added for DMA alignment requirement */ -#define DUMMY_SKB_FLAG 0x10000 +#define ALIGN_SKB_FLAG 0x8000/* bit mask of data length chopped from the previous packet */ -#define DUMMY_SKB_CHOP_LEN_MASK 0xffff +#define ALIGN_SKB_CHOP_LEN_MASK 0x7fff +/** * brcmf_sdio_txpkt_prep - packet preparation for transmit * @bus: brcmf_sdio structure pointer
@@ -1854,7 +1859,7 @@ brcmf_sdio_txpkt_prep(struct brcmf_sdio *bus, struct sk_buff_head *pktq,memcpy (pkt_new->data, pkt_next->data + pkt_next->len - tail_chop, tail_chop); - *(u32 *)(pkt_new->cb) =DUMMY_SKB_FLAG + tail_chop; + *(u32 *)(pkt_new->cb) =ALIGN_SKB_FLAG + tail_chop;skb_trim (pkt_next, pkt_next->len - tail_chop);__skb_queue_after (pktq, pkt_next, pkt_new); }else {
@@ -1908,8 +1913,8 @@ brcmf_sdio_txpkt_postp(struct brcmf_sdio *bus, struct sk_buff_head *pktq) skb_queue_walk_safe(pktq, pkt_next, tmp) { dummy_flags = *(u32 *)(pkt_next->cb); -if (dummy_flags &DUMMY_SKB_FLAG ) { - chop_len = dummy_flags &DUMMY_SKB_CHOP_LEN_MASK ; +if (dummy_flags &ALIGN_SKB_FLAG ) { + chop_len = dummy_flags &ALIGN_SKB_CHOP_LEN_MASK ;if (chop_len) { pkt_prev = pkt_next->prev; memcpy(pkt_prev->data + pkt_prev->len,
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +2 -0
@@ -168,6 +168,7 @@ enum brcmf_fws_skb_state {/** * struct brcmf_skbuff_cb - control buffer associated with skbuff. * +* @bus_flags: 2 bytes reserved for bus specific parameters * @if_flags: holds interface index and packet related flags. * @htod: host to device packet identifier (used in PKTTAG tlv). * @state: transmit state of the packet.
@@ -177,6 +178,7 @@ enum brcmf_fws_skb_state {* provides 48 bytes of storage so this structure should not exceed that. */ struct brcmf_skbuff_cb { +u16 bus_flags;u16 if_flags;u32 htod;enum brcmf_fws_skb_state state;
Signature · 1 line
1.7.10.4
PATCH 5/7 brcmfmac: fix sparse error 'bad constant expression'
In reply to Arend van SprielThe definition of BRCMF_EVENTING_MASK_LEN results in a sparse error message
.../fweh.c:331:22: error: bad constant expression .../fweh.c:388:22: error: bad constant expression .../dhd_common.c:256:22: error: bad constant expression
This is caused by the use of roundup() in BRCMF_EVENTING_MASK_LEN and it is used to allocate an array variable on the stack. Better use DIV_ROUND_UP() macro.
--- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/fweh.h +1 -1
@@ -115,7 +115,7 @@ enum brcmf_fweh_event_code { };#undef BRCMF_ENUM_DEF -#define BRCMF_EVENTING_MASK_LEN (roundup(BRCMF_E_LAST, 8)/8) +#define BRCMF_EVENTING_MASK_LEN DIV_ROUND_UP(BRCMF_E_LAST, 8)/* flags field values in struct brcmf_event_msg */ #define BRCMF_EVENT_MSG_LINK 0x01
Signature · 1 line
1.7.10.4
PATCH 6/7 brcmfmac: Use fw filename and nvram based of devid for sdio.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
SDIO firmware download routines uses one name for firmware file and nvram file for all sdio devices. This is not user friendly. Use fw filename and nvram filename based upon chip id and revision.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 207 +++++++++++++------- 1 file changed, 133 insertions(+), 74 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +133 -74
@@ -275,11 +275,6 @@ struct rte_console {/* Flags for SDH calls */ #define F2SYNC (SDIO_REQ_4BYTE | SDIO_REQ_FIXED) -#define BRCMF_SDIO_FW_NAME "brcm/brcmfmac-sdio.bin" -#define BRCMF_SDIO_NV_NAME "brcm/brcmfmac-sdio.txt" -MODULE_FIRMWARE (BRCMF_SDIO_FW_NAME ); -MODULE_FIRMWARE (BRCMF_SDIO_NV_NAME ); -#define BRCMF_IDLE_IMMEDIATE (-1)/* Enter idle immediately */ #define BRCMF_IDLE_ACTIVE 0/* Do not request any SD clock change * when idle
@@ -454,9 +449,6 @@ struct brcmf_sdio {struct work_struct datawork;atomic_t dpc_tskcnt; -const struct firmware *firmware; -u32 fw_ptr; -bool txoff;/* Transmit flow-controlled */ struct brcmf_sdio_count sdcnt;bool sr_enabled;/* SaveRestore enabled */
@@ -493,6 +485,100 @@ enum brcmf_sdio_frmtype { BRCMF_SDIO_FT_SUB, }; +#define BCM43143_FIRMWARE_NAME "brcm/brcmfmac43143-sdio.bin" +#define BCM43143_NVRAM_NAME "brcm/brcmfmac43143-sdio.txt" +#define BCM43241B0_FIRMWARE_NAME "brcm/brcmfmac43241b0-sdio.bin" +#define BCM43241B0_NVRAM_NAME "brcm/brcmfmac43241b0-sdio.txt" +#define BCM43241B4_FIRMWARE_NAME "brcm/brcmfmac43241b4-sdio.bin" +#define BCM43241B4_NVRAM_NAME "brcm/brcmfmac43241b4-sdio.txt" +#define BCM4329_FIRMWARE_NAME "brcm/brcmfmac4329-sdio.bin" +#define BCM4329_NVRAM_NAME "brcm/brcmfmac4329-sdio.txt" +#define BCM4330_FIRMWARE_NAME "brcm/brcmfmac4330-sdio.bin" +#define BCM4330_NVRAM_NAME "brcm/brcmfmac4330-sdio.txt" +#define BCM4334_FIRMWARE_NAME "brcm/brcmfmac4334-sdio.bin" +#define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt" +#define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin" +#define BCM4335_NVRAM_NAME "brcm/brcmfmac4335-sdio.txt" + +MODULE_FIRMWARE (BCM43143_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM43143_NVRAM_NAME ); +MODULE_FIRMWARE (BCM43241B0_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM43241B0_NVRAM_NAME ); +MODULE_FIRMWARE (BCM43241B4_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM43241B4_NVRAM_NAME ); +MODULE_FIRMWARE (BCM4329_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM4329_NVRAM_NAME ); +MODULE_FIRMWARE (BCM4330_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM4330_NVRAM_NAME ); +MODULE_FIRMWARE (BCM4334_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM4334_NVRAM_NAME ); +MODULE_FIRMWARE (BCM4335_FIRMWARE_NAME ); +MODULE_FIRMWARE (BCM4335_NVRAM_NAME ); + +struct brcmf_firmware_names { +u32 chipid; +u32 revmsk; +const char *bin; +const char *nv; +}; + +enum brcmf_firmware_type { +BRCMF_FIRMWARE_BIN , +BRCMF_FIRMWARE_NVRAM +}; + +#define BRCMF_FIRMWARE_NVRAM (name) \ + name ## _FIRMWARE_NAME, name ## _NVRAM_NAME + +static const struct brcmf_firmware_names brcmf_fwname_data[] = { + {BCM43143_CHIP_ID ,0xFFFFFFFF ,BRCMF_FIRMWARE_NVRAM (BCM43143 ) }, + {BCM43241_CHIP_ID ,0x0000001F ,BRCMF_FIRMWARE_NVRAM (BCM43241B0 ) }, + {BCM43241_CHIP_ID ,0xFFFFFFE0 ,BRCMF_FIRMWARE_NVRAM (BCM43241B4 ) }, + {BCM4329_CHIP_ID ,0xFFFFFFFF ,BRCMF_FIRMWARE_NVRAM (BCM4329 ) }, + {BCM4330_CHIP_ID ,0xFFFFFFFF ,BRCMF_FIRMWARE_NVRAM (BCM4330 ) }, + {BCM4334_CHIP_ID ,0xFFFFFFFF ,BRCMF_FIRMWARE_NVRAM (BCM4334 ) }, + {BCM4335_CHIP_ID ,0xFFFFFFFF ,BRCMF_FIRMWARE_NVRAM (BCM4335 ) } +}; + + +static const struct firmware *brcmf_sdbrcm_get_fw (struct brcmf_sdio *bus, +enum brcmf_firmware_type type) +{ +const struct firmware *fw; +const char *name; +int err, i; + +for (i =0 ; i <ARRAY_SIZE (brcmf_fwname_data); i++) { +if (brcmf_fwname_data[i].chipid == bus->ci->chip && + brcmf_fwname_data[i].revmsk &BIT (bus->ci->chiprev)) { +switch (type) { +case BRCMF_FIRMWARE_BIN : + name = brcmf_fwname_data[i].bin; +break ; +case BRCMF_FIRMWARE_NVRAM : + name = brcmf_fwname_data[i].nv; +break ; +default : +brcmf_err ("invalid firmware type (%d)\n" , type); +return NULL ; + } + goto found; + } + } +brcmf_err ("Unknown chipid %d [%d]\n" , + bus->ci->chip, bus->ci->chiprev); +return NULL ; + +found: + err =request_firmware (&fw, name, &bus->sdiodev->func[2 ]->dev); +if ((err) || (!fw)) { +brcmf_err ("fail to request firmware %s (%d)\n" , name, err); +return NULL ; + } + +return fw; +} +static void pkt_align (struct sk_buff *p,int len,int align) {uint datalign;
@@ -3042,69 +3128,43 @@ static bool brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)return true; } -static int brcmf_sdbrcm_get_image (char *buf,int len,struct brcmf_sdio *bus) -{ -if (bus->firmware->size < bus->fw_ptr + len) - len = bus->firmware->size - bus->fw_ptr; - -memcpy (buf, &bus->firmware->data[bus->fw_ptr], len); - bus->fw_ptr += len; -return len; -} -static int brcmf_sdbrcm_download_code_file (struct brcmf_sdio *bus) { +const struct firmware *fw; +int err;int offset; -uint len; -u8 *memblock =NULL , *memptr; -int ret; -u8 idx; - -brcmf_dbg (INFO ,"Enter\n" ); - - ret =request_firmware (&bus->firmware,BRCMF_SDIO_FW_NAME , - &bus->sdiodev->func[2 ]->dev); -if (ret) { -brcmf_err ("Fail to request firmware %d\n" , ret); -return ret; - } - bus->fw_ptr =0 ; - - memptr = memblock =kmalloc (MEMBLOCK +BRCMF_SDALIGN ,GFP_ATOMIC ); -if (memblock ==NULL ) { - ret = -ENOMEM ; - goto err; - } -if ((u32 )(unsigned long )memblock %BRCMF_SDALIGN ) - memptr += (BRCMF_SDALIGN - - ((u32 )(unsigned long )memblock %BRCMF_SDALIGN )); - - offset = bus->ci->rambase; - -/* Download image */ - len =brcmf_sdbrcm_get_image ((char *)memptr,MEMBLOCK , bus); - idx =brcmf_sdio_chip_getinfidx (bus->ci,BCMA_CORE_ARM_CR4 ); -if (BRCMF_MAX_CORENUM != idx) -memcpy (&bus->ci->rst_vec, memptr,sizeof (bus->ci->rst_vec)); -while (len) { - ret =brcmf_sdio_ramrw (bus->sdiodev, true, offset, memptr, len); -if (ret) { +int address; +int len; + + fw =brcmf_sdbrcm_get_fw (bus,BRCMF_FIRMWARE_BIN ); +if (fw ==NULL ) +return -ENOENT ; + +if (brcmf_sdio_chip_getinfidx (bus->ci,BCMA_CORE_ARM_CR4 ) != +BRCMF_MAX_CORENUM ) +memcpy (&bus->ci->rst_vec, fw->data,sizeof (bus->ci->rst_vec)); + + err =0 ; + offset =0 ; + address = bus->ci->rambase; +while (offset < fw->size) { + len = ((offset +MEMBLOCK ) < fw->size) ?MEMBLOCK : + fw->size - offset; + err =brcmf_sdio_ramrw (bus->sdiodev, true, address, + (u8 *)&fw->data[offset], len); +if (err) {brcmf_err ("error %d on writing %d membytes at 0x%08x\n" , - ret,MEMBLOCK , offset); - goto err; + err, len, address); + goto failure; } - - offset +=MEMBLOCK ; - len =brcmf_sdbrcm_get_image ((char *)memptr,MEMBLOCK , bus); + offset += len; + address += len; } -err: -kfree (memblock); - -release_firmware (bus->firmware); - bus->fw_ptr =0 ; +failure: +release_firmware (fw); -return ret; +return err; }/*
@@ -3116,7 +3176,8 @@ err:* by two NULs. */ -static int brcmf_process_nvram_vars (struct brcmf_sdio *bus) +static int brcmf_process_nvram_vars (struct brcmf_sdio *bus, +const struct firmware *nv) {char *varbuf;char *dp;
@@ -3125,12 +3186,12 @@ static int brcmf_process_nvram_vars(struct brcmf_sdio *bus)int ret =0 ;uint buf_len, n, len; - len = bus->firmware->size; + len = nv->size; varbuf =vmalloc (len);if (!varbuf)return -ENOMEM ; -memcpy (varbuf, bus->firmware->data, len); +memcpy (varbuf, nv->data, len); dp = varbuf; findNewline = false;
@@ -3182,18 +3243,16 @@ err:static int brcmf_sdbrcm_download_nvram (struct brcmf_sdio *bus) { +const struct firmware *nv;int ret; - ret =request_firmware (&bus->firmware,BRCMF_SDIO_NV_NAME , - &bus->sdiodev->func[2 ]->dev); -if (ret) { -brcmf_err ("Fail to request nvram %d\n" , ret); -return ret; - } + nv =brcmf_sdbrcm_get_fw (bus,BRCMF_FIRMWARE_NVRAM ); +if (nv ==NULL ) +return -ENOENT ; - ret =brcmf_process_nvram_vars (bus); + ret =brcmf_process_nvram_vars (bus, nv); -release_firmware (bus->firmware); +release_firmware (nv);return ret; }
Signature · 1 line
1.7.10.4
PATCH 7/7 brcmfmac: rework rx path bus interface
In reply to Arend van SprielThe brcmfmac has common and bus specific part. The rx function api was using sk_buff_head. Changed to sk_buff instead.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 38 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 12 +++---- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +-- 4 files changed, 22 insertions(+), 35 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +1 -1
@@ -136,7 +136,7 @@ extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, int prec);/* Receive frame for delivery to OS. Callee disposes of rxp. */ -extern void brcmf_rx_frames (struct device *dev,struct sk_buff_head *rxlist); +extern void brcmf_rx_frame (struct device *dev,struct sk_buff *rxp);/* Indication from bus module regarding presence/insertion of dongle. */ extern int brcmf_attach (uint bus_hdrlen,struct device *dev);
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +16 -22
@@ -509,9 +509,8 @@ netif_rx: } } -void brcmf_rx_frames (struct device *dev,struct sk_buff_head *skb_list) +void brcmf_rx_frame (struct device *dev,struct sk_buff *skb) { -struct sk_buff *skb, *pnext;struct brcmf_if *ifp;struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_pub *drvr = bus_if->drvr;
@@ -519,29 +518,24 @@ void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)u8 ifidx;int ret; -brcmf_dbg (DATA ,"Enter: %s: count=%u\n" ,dev_name (dev), -skb_queue_len (skb_list)); +brcmf_dbg (DATA ,"Enter: %s: rxp=%p\n" ,dev_name (dev), skb); - skb_queue_walk_safe(skb_list, skb, pnext) { -skb_unlink (skb, skb_list); - -/* process and remove protocol-specific header */ - ret =brcmf_proto_hdrpull (drvr, true, &ifidx, skb); - ifp = drvr->iflist[ifidx]; - -if (ret || !ifp || !ifp->ndev) { -if ((ret != -ENODATA ) && ifp) - ifp->stats.rx_errors++; -brcmu_pkt_buf_free_skb (skb); -continue ; - } +/* process and remove protocol-specific header */ + ret =brcmf_proto_hdrpull (drvr, true, &ifidx, skb); + ifp = drvr->iflist[ifidx]; - rd = (struct brcmf_skb_reorder_data *)skb->cb; -if (rd->reorder) -brcmf_rxreorder_process_info (ifp, rd->reorder, skb); -else -brcmf_netif_rx (ifp, skb); +if (ret || !ifp || !ifp->ndev) { +if ((ret != -ENODATA ) && ifp) + ifp->stats.rx_errors++; +brcmu_pkt_buf_free_skb (skb); +return ; } + + rd = (struct brcmf_skb_reorder_data *)skb->cb; +if (rd->reorder) +brcmf_rxreorder_process_info (ifp, rd->reorder, skb); +else +brcmf_netif_rx (ifp, skb); } void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +4 -8
@@ -1492,13 +1492,12 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq) bus->glom.qlen, pfirst, pfirst->data, pfirst->len, pfirst->next, pfirst->prev); +skb_unlink (pfirst, &bus->glom); +brcmf_rx_frame (bus->sdiodev->dev, pfirst); + bus->sdcnt.rxglompkts++; } -/* sent any remaining packets up */ -if (bus->glom.qlen) -brcmf_rx_frames (bus->sdiodev->dev, &bus->glom); bus->sdcnt.rxglomframes++; - bus->sdcnt.rxglompkts += bus->glom.qlen; }return num; }
@@ -1643,7 +1642,6 @@ static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)static uint brcmf_sdio_readframes (struct brcmf_sdio *bus,uint maxframes) {struct sk_buff *pkt;/* Packet for event or data frames */ -struct sk_buff_head pktlist;/* needed for bus interface */ u16 pad;/* Number of pad bytes to read */ uint rxleft =0 ;/* Remaining number of frames allowed */ int ret;/* Return code from calls */
@@ -1845,9 +1843,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)continue ; } -skb_queue_head_init (&pktlist); -skb_queue_tail (&pktlist, pkt); -brcmf_rx_frames (bus->sdiodev->dev, &pktlist); +brcmf_rx_frame (bus->sdiodev->dev, pkt); } rxcount = maxframes - rxleft;
drivers/net/wireless/brcm80211/brcmfmac/usb.c +1 -4
@@ -435,7 +435,6 @@ static void brcmf_usb_rx_complete(struct urb *urb)struct brcmf_usbreq *req = (struct brcmf_usbreq *)urb->context;struct brcmf_usbdev_info *devinfo = req->devinfo;struct sk_buff *skb; -struct sk_buff_head skbq;brcmf_dbg (USB ,"Enter, urb->status=%d\n" , urb->status);brcmf_usb_del_fromq (devinfo, req);
@@ -450,10 +449,8 @@ static void brcmf_usb_rx_complete(struct urb *urb) }if (devinfo->bus_pub.state ==BRCMFMAC_USB_STATE_UP ) { -skb_queue_head_init (&skbq); -skb_queue_tail (&skbq, skb);skb_put (skb, urb->actual_length); -brcmf_rx_frames (devinfo->dev, &skbq); +brcmf_rx_frame (devinfo->dev, skb);brcmf_usb_rx_refill (devinfo, req); }else {brcmu_pkt_buf_free_skb (skb);
Signature · 1 line
1.7.10.4
Quoted 7 lines · Arend van Spriel
This series has a few cleanup patches fixing a sparse error, cleaning up the rx path and also changing the firmware filename approach after getting feedback on this by Stephen Warren. The remaining patches are adding support for the BCM4339 SDIO chipset.
This series is intended for v3.13 kernel and applies to the master branch of the wireless-next repository.
Hi John,
Did you miss this series from last week?
Regards,
Arend
Quoted 26 lines
Arend van Spriel (2):
brcmfmac: fix sparse error 'bad constant expression'
brcmfmac: rework rx path bus interfaceFranky Lin (4):
brcmfmac: sync firmware event list
brcmfmac: add BCM4339 SDIO interface support
brcmfmac: add valid core index check in related functions
brcmfmac: reserve memory for bus layer insk_buff::cbHante Meuleman (1):
brcmfmac: Use fw filename and nvram based of devid for sdio..../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 11 +- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 - drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 38 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 234 ++++++++++++-------- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 28 +++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 8 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 11 files changed, 211 insertions(+), 125 deletions(-)
Quoted 9 lines · Arend van Spriel
Quoted 7 lines · Arend van Spriel
This series has a few cleanup patches fixing a sparse error, cleaning up the rx path and also changing the firmware filename approach after getting feedback on this by Stephen Warren. The remaining patches are adding support for the BCM4339 SDIO chipset.
This series is intended for v3.13 kernel and applies to the master branch of the wireless-next repository.
Quoted 6 lines
Hi John,
Did you miss this series from last week?
Regards,
Arend
No, just haven't merged everything yet... :-(
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.