brcmfmac: new device support and fixes
cover brcmfmac: new device support and fixes
This patch series adds support for two new SDIO devices, ie. the BCM43143 and the BCM4335. It also contains several fixes for the firmware-signalling feature.
This series applies to the master branch of the wireless-next repository.
Arend van Spriel (4):
brcmfmac: obtain iftype for firmware-signal descriptor lookup
brcmfmac: pass ifp pointer in brcmf_fws_find_mac_desc()
brcmfmac: rename brcmf_fws_mac_desc_ready()
brcmfmac: remove ifidx variable from brcmf_fws_process_skb()
Franky Lin (6):
brcmfmac: aggregate dongle ram access interface
brcmfmac: move chip download state code to sdio_chip.c
brcmutil: add new d11 interface support
brcmfmac: adopt new d11 interface
brcmfmac: add support for dongle ARM CR4 core
brcmfmac: add BCM4335 sdio interface support
Hante Meuleman (3):
brcmfmac: Add 43143 SDIO support.
brcmfmac: Add drive strength programming for SDIO 43143.
brcmfmac: define and use platform specific data for SDIO.
Piotr Haber (2):
brcmfmac: support save&restore firmware feature
brcmfmac: setup SDIO reset behavior
drivers/net/wireless/brcm80211/Kconfig | 9 - drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 243 +++++--- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 118 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 659 ++++++++++---------- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 57 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 98 ++- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 369 ++++++++++- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 101 ++- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 32 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 141 +++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 8 +- drivers/net/wireless/brcm80211/brcmutil/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmutil/d11.c | 162 +++++ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 2 + drivers/net/wireless/brcm80211/include/brcmu_d11.h | 145 +++++ .../net/wireless/brcm80211/include/chipcommon.h | 14 +- include/linux/bcma/bcma.h | 1 + include/linux/bcma/bcma_driver_chipcommon.h | 3 + include/linux/bcma/bcma_regs.h | 1 + include/linux/brcmfmac_platform.h | 125 ++++ 21 files changed, 1593 insertions(+), 699 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmutil/d11.c create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_d11.h create mode 100644 include/linux/brcmfmac_platform.h
Signature · 1 line
1.7.10.4
PATCH 1/15 brcmfmac: support save&restore firmware feature
From: Piotr Haber <[email protected]>
Save & restore is an advanced power saving feature, supported only on selected devices.
SR operation is almost completely transparent to the driver. Support for it is hardware and firmware dependent.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 262 +++++++++++++++++++- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 22 +- .../net/wireless/brcm80211/include/chipcommon.h | 14 +- 3 files changed, 282 insertions(+), 16 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +250 -12
@@ -324,6 +324,9 @@ MODULE_FIRMWARE(BRCMF_SDIO_NV_NAME);*/ #define BRCMF_IDLE_INTERVAL 1 +#define KSO_WAIT_US 50 +#define MAX_KSO_ATTEMPTS (PMU_MAX_TRANSITION_DLY/KSO_WAIT_US) +/* * Conversion of 802.1D priority to precedence level */
@@ -588,12 +591,14 @@ struct brcmf_sdio {bool txoff;/* Transmit flow-controlled */ struct brcmf_sdio_count sdcnt; +bool sr_enabled;/* SaveRestore enabled */ +bool sleeping;/* SDIO bus sleeping */ };/* clkstate */ #define CLK_NONE 0#define CLK_SDONLY 1 -#define CLK_PENDING 2/* Not used yet */ +#define CLK_PENDING 2#define CLK_AVAIL 3#ifdef DEBUG
@@ -665,6 +670,62 @@ w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset)return ret; } +static int +brcmf_sdbrcm_kso_control (struct brcmf_sdio *bus,bool on) +{ +u8 wr_val =0 , rd_val, cmp_val, bmask; +int err =0 ; +int try_cnt =0 ; + +brcmf_dbg (TRACE ,"Enter\n" ); + + wr_val = (on <<SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT ); +/* 1st KSO write goes to AOS wake up core if device is asleep */ +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_SLEEPCSR , + wr_val, &err); +if (err) { +brcmf_err ("SDIO_AOS KSO write error: %d\n" , err); +return err; + } + +if (on) { +/* device WAKEUP through KSO: +* write bit 0 & read back until +* both bits 0 (kso bit) & 1 (dev on status) are set +*/ + cmp_val =SBSDIO_FUNC1_SLEEPCSR_KSO_MASK | +SBSDIO_FUNC1_SLEEPCSR_DEVON_MASK ; + bmask = cmp_val; +usleep_range (2000 ,3000 ); + }else { +/* Put device to sleep, turn off KSO */ + cmp_val =0 ; +/* only check for bit0, bit1(dev on status) may not +* get cleared right away +*/ + bmask =SBSDIO_FUNC1_SLEEPCSR_KSO_MASK ; + } + +do { +/* reliable KSO bit set/clr: +* the sdiod sleep write access is synced to PMU 32khz clk +* just one write attempt may fail, +* read it back until it matches written value +*/ + rd_val =brcmf_sdio_regrb (bus->sdiodev,SBSDIO_FUNC1_SLEEPCSR , + &err); +if (((rd_val & bmask) == cmp_val) && !err) +break ; +brcmf_dbg (SDIO ,"KSO wr/rd retry:%d (max: %d) ERR:%x\n" , + try_cnt,MAX_KSO_ATTEMPTS , err); +udelay (KSO_WAIT_US ); +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_SLEEPCSR , + wr_val, &err); + }while (try_cnt++ <MAX_KSO_ATTEMPTS ); + +return err; +} +#define PKT_AVAILABLE () (intstatus & I_HMB_FRAME_IND)#define HOSTINTMASK (I_HMB_SW_MASK | I_CHIPACTIVE)
@@ -680,6 +741,11 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) clkctl =0 ; +if (bus->sr_enabled) { + bus->clkstate = (on ?CLK_AVAIL :CLK_SDONLY ); +return 0 ; + } +if (on) {/* Request HT Avail */ clkreq =
@@ -856,6 +922,63 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)return 0 ; } +static int +brcmf_sdbrcm_bus_sleep (struct brcmf_sdio *bus,bool sleep,bool pendok) +{ +int err =0 ; +brcmf_dbg (TRACE ,"Enter\n" ); +brcmf_dbg (SDIO ,"request %s currently %s\n" , + (sleep ?"SLEEP" :"WAKE" ), + (bus->sleeping ?"SLEEP" :"WAKE" )); + +/* If SR is enabled control bus state with KSO */ +if (bus->sr_enabled) { +/* Done if we're already in the requested state */ +if (sleep == bus->sleeping) + goto end; + +/* Going to sleep */ +if (sleep) { +/* Don't sleep if something is pending */ +if (atomic_read (&bus->intstatus) || +atomic_read (&bus->ipend) >0 || + (!atomic_read (&bus->fcstate) && +brcmu_pktq_mlen (&bus->txq, ~bus->flowcontrol) && +data_ok (bus))) +return -EBUSY ; + err =brcmf_sdbrcm_kso_control (bus, false); +/* disable watchdog */ +if (!err) +brcmf_sdbrcm_wd_timer (bus,0 ); + }else { + bus->idlecount =0 ; + err =brcmf_sdbrcm_kso_control (bus, true); + } +if (!err) { +/* Change state */ + bus->sleeping = sleep; +brcmf_dbg (SDIO ,"new state %s\n" , + (sleep ?"SLEEP" :"WAKE" )); + }else { +brcmf_err ("error while changing bus sleep state %d\n" , + err); +return err; + } + } + +end: +/* control clocks */ +if (sleep) { +if (!bus->sr_enabled) +brcmf_sdbrcm_clkctl (bus,CLK_NONE , pendok); + }else { +brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , pendok); + } + +return err; + +} +static u32 brcmf_sdbrcm_hostmail (struct brcmf_sdio *bus) {u32 intstatus =0 ;
@@ -1960,7 +2083,7 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev)sdio_claim_host (bus->sdiodev->func[1 ]);/* Enable clock for device interrupts */ -brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , false); +brcmf_sdbrcm_bus_sleep (bus, false, false);/* Disable and clear interrupts at the chip level also */ w_sdreg32 (bus,0 , offsetof(struct sdpcmd_regs , hostintmask));
@@ -2096,7 +2219,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)sdio_claim_host (bus->sdiodev->func[1 ]);/* If waiting for HTAVAIL, check status */ -if (bus->clkstate ==CLK_PENDING ) { +if (!bus->sr_enabled && bus->clkstate ==CLK_PENDING ) {u8 clkctl, devctl =0 ;#ifdef DEBUG
@@ -2142,7 +2265,7 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) }/* Make sure backplane clock is on */ -brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , true); +brcmf_sdbrcm_bus_sleep (bus, false, true);/* Pending interrupt indicates new device status */ if (atomic_read (&bus->ipend) >0 ) {
@@ -2288,8 +2411,9 @@ static void brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)if ((bus->clkstate !=CLK_PENDING ) && bus->idletime ==BRCMF_IDLE_IMMEDIATE ) { bus->activity = false; +brcmf_dbg (SDIO ,"idle state\n" );sdio_claim_host (bus->sdiodev->func[1 ]); -brcmf_sdbrcm_clkctl (bus,CLK_NONE , false); +brcmf_sdbrcm_bus_sleep (bus, true, false);sdio_release_host (bus->sdiodev->func[1 ]); } }
@@ -2592,7 +2716,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)/* Make sure backplane clock is on */ sdio_claim_host (bus->sdiodev->func[1 ]); -brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , false); +brcmf_sdbrcm_bus_sleep (bus, false, false);sdio_release_host (bus->sdiodev->func[1 ]);/* Hardware tag: 2 byte len followed by 2 byte ~len check (all LE) */
@@ -2650,6 +2774,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen) bus->activity = false;sdio_claim_host (bus->sdiodev->func[1 ]); +brcmf_dbg (INFO ,"idle\n" );brcmf_sdbrcm_clkctl (bus,CLK_NONE , true);sdio_release_host (bus->sdiodev->func[1 ]); }else {
@@ -2686,7 +2811,7 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,* address of sdpcm_shared structure */ sdio_claim_host (bus->sdiodev->func[1 ]); -brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , false); +brcmf_sdbrcm_bus_sleep (bus, false, false); rv =brcmf_sdbrcm_membytes (bus, false, shaddr, (u8 *)&addr_le,4 );sdio_release_host (bus->sdiodev->func[1 ]);
@@ -3325,6 +3450,103 @@ err:return bcmerror; } +static bool brcmf_sdbrcm_sr_capable (struct brcmf_sdio *bus) +{ +u32 addr, reg; + +brcmf_dbg (TRACE ,"Enter\n" ); + +/* old chips with PMU version less than 17 don't support save restore */ +if (bus->ci->pmurev <17 ) +return false; + +/* read PMU chipcontrol register 3*/ + addr =CORE_CC_REG (bus->ci->c_inf[0 ].base, chipcontrol_addr); +brcmf_sdio_regwl (bus->sdiodev, addr,3 ,NULL ); + addr =CORE_CC_REG (bus->ci->c_inf[0 ].base, chipcontrol_data); + reg =brcmf_sdio_regrl (bus->sdiodev, addr,NULL ); + +return (bool )reg; +} + +static void brcmf_sdbrcm_sr_init (struct brcmf_sdio *bus) +{ +int err =0 ; +u8 val; + +brcmf_dbg (TRACE ,"Enter\n" ); + + val =brcmf_sdio_regrb (bus->sdiodev,SBSDIO_FUNC1_WAKEUPCTRL , + &err); +if (err) { +brcmf_err ("error reading SBSDIO_FUNC1_WAKEUPCTRL\n" ); +return ; + } + + val |=1 <<SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT ; +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_WAKEUPCTRL , + val, &err); +if (err) { +brcmf_err ("error writing SBSDIO_FUNC1_WAKEUPCTRL\n" ); +return ; + } + +/* Add CMD14 Support */ +brcmf_sdio_regwb (bus->sdiodev,SDIO_CCCR_BRCM_CARDCAP , + (SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT | +SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT ), + &err); +if (err) { +brcmf_err ("error writing SDIO_CCCR_BRCM_CARDCAP\n" ); +return ; + } + +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_CHIPCLKCSR , +SBSDIO_FORCE_HT , &err); +if (err) { +brcmf_err ("error writing SBSDIO_FUNC1_CHIPCLKCSR\n" ); +return ; + } + +/* set flag */ + bus->sr_enabled = true; +brcmf_dbg (INFO ,"SR enabled\n" ); +} + +/* enable KSO bit */ +static int brcmf_sdbrcm_kso_init (struct brcmf_sdio *bus) +{ +u8 val; +int err =0 ; + +brcmf_dbg (TRACE ,"Enter\n" ); + +/* KSO bit added in SDIO core rev 12 */ +if (bus->ci->c_inf[1 ].rev <12 ) +return 0 ; + + val =brcmf_sdio_regrb (bus->sdiodev,SBSDIO_FUNC1_SLEEPCSR , + &err); +if (err) { +brcmf_err ("error reading SBSDIO_FUNC1_SLEEPCSR\n" ); +return err; + } + +if (!(val &SBSDIO_FUNC1_SLEEPCSR_KSO_MASK )) { + val |= (SBSDIO_FUNC1_SLEEPCSR_KSO_EN << +SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT ); +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_SLEEPCSR , + val, &err); +if (err) { +brcmf_err ("error writing SBSDIO_FUNC1_SLEEPCSR\n" ); +return err; + } + } + +return 0 ; +} + +static bool brcmf_sdbrcm_download_firmware (struct brcmf_sdio *bus) {
@@ -3423,8 +3645,13 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) ret = -ENODEV ; } -/* Restore previous clock setting */ -brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_CHIPCLKCSR , saveclk, &err); +if (brcmf_sdbrcm_sr_capable (bus)) { +brcmf_sdbrcm_sr_init (bus); + }else { +/* Restore previous clock setting */ +brcmf_sdio_regwb (bus->sdiodev,SBSDIO_FUNC1_CHIPCLKCSR , + saveclk, &err); + }if (ret ==0 ) { ret =brcmf_sdio_intr_register (bus->sdiodev);
@@ -3485,7 +3712,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)brcmf_dbg (TIMER ,"Enter\n" );/* Poll period: check device if appropriate. */ -if (bus->poll && (++bus->polltick >= bus->pollrate)) { +if (!bus->sr_enabled && + bus->poll && (++bus->polltick >= bus->pollrate)) {u32 intstatus =0 ;/* Reset poll tick */
@@ -3536,7 +3764,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus) bus->console.count -= bus->console_interval;sdio_claim_host (bus->sdiodev->func[1 ]);/* Make sure backplane clock is on */ -brcmf_sdbrcm_clkctl (bus,CLK_AVAIL , false); +brcmf_sdbrcm_bus_sleep (bus, false, false);if (brcmf_sdbrcm_readconsole (bus) <0 )/* stop on error */ bus->console_interval =0 ;
@@ -3553,8 +3781,9 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus) bus->activity = false;brcmf_sdbrcm_wd_timer (bus,BRCMF_WD_POLL_MS ); }else { +brcmf_dbg (SDIO ,"idle\n" );sdio_claim_host (bus->sdiodev->func[1 ]); -brcmf_sdbrcm_clkctl (bus,CLK_NONE , false); +brcmf_sdbrcm_bus_sleep (bus, true, false);sdio_release_host (bus->sdiodev->func[1 ]); } }
@@ -3686,6 +3915,11 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) goto fail; } +if (brcmf_sdbrcm_kso_init (bus)) { +brcmf_err ("error enabling KSO\n" ); + goto fail; + } +brcmf_sdio_chip_drivestrengthinit (bus->sdiodev, bus->ci,SDIO_DRIVE_STRENGTH );
@@ -3755,6 +3989,10 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus) bus->use_rxchain = false; bus->sd_rxchain = false; +/* SR state */ + bus->sleeping = false; + bus->sr_enabled = false; +return true; }
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +20 -2
@@ -48,7 +48,11 @@#define SBSDIO_NUM_FUNCTION 3/* function 0 vendor specific CCCR registers */ -#define SDIO_CCCR_BRCM_SEPINT 0xf2 +#define SDIO_CCCR_BRCM_CARDCAP 0xf0 +#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT 0x02 +#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT 0x04 +#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC 0x08 +#define SDIO_CCCR_BRCM_SEPINT 0xf2#define SDIO_SEPINT_MASK 0x01#define SDIO_SEPINT_OE 0x02
@@ -97,9 +101,23 @@#define SBSDIO_FUNC1_RFRAMEBCLO 0x1001B/* Read Frame Byte Count High */ #define SBSDIO_FUNC1_RFRAMEBCHI 0x1001C +/* MesBusyCtl (rev 11) */ +#define SBSDIO_FUNC1_MESBUSYCTRL 0x1001D +/* Sdio Core Rev 12 */ +#define SBSDIO_FUNC1_WAKEUPCTRL 0x1001E +#define SBSDIO_FUNC1_WCTRL_ALPWAIT_MASK 0x1 +#define SBSDIO_FUNC1_WCTRL_ALPWAIT_SHIFT 0 +#define SBSDIO_FUNC1_WCTRL_HTWAIT_MASK 0x2 +#define SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT 1 +#define SBSDIO_FUNC1_SLEEPCSR 0x1001F +#define SBSDIO_FUNC1_SLEEPCSR_KSO_MASK 0x1 +#define SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT 0 +#define SBSDIO_FUNC1_SLEEPCSR_KSO_EN 1 +#define SBSDIO_FUNC1_SLEEPCSR_DEVON_MASK 0x2 +#define SBSDIO_FUNC1_SLEEPCSR_DEVON_SHIFT 1#define SBSDIO_FUNC1_MISC_REG_START 0x10000/* f1 misc register start */ -#define SBSDIO_FUNC1_MISC_REG_LIMIT 0x1001C/* f1 misc register end */ +#define SBSDIO_FUNC1_MISC_REG_LIMIT 0x1001F/* f1 misc register end */ /* function 1 OCP space */
drivers/net/wireless/brcm80211/include/chipcommon.h +12 -2
@@ -205,7 +205,7 @@ struct chipcregs {u32 res_req_timer_sel;u32 res_req_timer;u32 res_req_mask; -u32 PAD ; +u32 pmucapabilities_ext;/* 0x64c, pmurev >=15 */ u32 chipcontrol_addr;/* 0x650 */ u32 chipcontrol_data;/* 0x654 */ u32 regcontrol_addr;
@@ -214,7 +214,11 @@ struct chipcregs {u32 pllcontrol_data;u32 pmustrapopt;/* 0x668, corerev >= 28 */ u32 pmu_xtalfreq;/* 0x66C, pmurev >= 10 */ -u32 PAD [100 ]; +u32 retention_ctl;/* 0x670, pmurev >= 15 */ +u32 PAD [3 ]; +u32 retention_grpidx;/* 0x680 */ +u32 retention_grpctl;/* 0x684 */ +u32 PAD [94 ];u16 sromotp[768 ]; };
@@ -276,6 +280,12 @@ struct chipcregs {#define PCAP5_VC_SHIFT 22#define PCAP5_CC_MASK 0xf8000000#define PCAP5_CC_SHIFT 27 +/* pmucapabilites_ext PMU rev >= 15 */ +#define PCAPEXT_SR_SUPPORTED_MASK (1 << 1) +/* retention_ctl PMU rev >= 15 */ +#define PMU_RCTL_MACPHY_DISABLE_MASK (1 << 26) +#define PMU_RCTL_LOGIC_DISABLE_MASK (1 << 27) +/* * Maximum delay for the PMU state transition in us.
Signature · 1 line
1.7.10.4
PATCH 2/15 brcmfmac: aggregate dongle ram access interface
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
For fullmac chips host driver can access to dongle RAM through SDIO function 1. Introduce brcmf_sdio_ramrw and place it at bcmsdh.c with other interface functions.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 88 ++++++++++---- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 120 +++++--------------- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 + 3 files changed, 96 insertions(+), 114 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +66 -22
@@ -457,36 +457,80 @@ done:return err; } -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) { -struct sk_buff *mypkt; -bool write = rw ?SDIOH_WRITE :SDIOH_READ ; -int err; +int bcmerror =0 ; +struct sk_buff *pkt; +u32 sdaddr; +uint dsize; + + dsize =min_t (uint,SBSDIO_SB_OFT_ADDR_LIMIT , size); + pkt =dev_alloc_skb (dsize); +if (!pkt) { +brcmf_err ("dev_alloc_skb failed: len %d\n" , dsize); +return -EIO ; + } + pkt->priority =0 ; - addr &=SBSDIO_SB_OFT_ADDR_MASK ; - addr |=SBSDIO_SB_ACCESS_2_4B_FLAG ; +/* Determine initial transfer parameters */ + sdaddr = address &SBSDIO_SB_OFT_ADDR_MASK ; +if ((sdaddr + size) &SBSDIO_SBWINDOW_MASK ) + dsize = (SBSDIO_SB_OFT_ADDR_LIMIT - sdaddr); +else + dsize = size; - mypkt =brcmu_pkt_buf_get_skb (nbytes); -if (!mypkt) { -brcmf_err ("brcmu_pkt_buf_get_skb failed: len %d\n" , - nbytes); -return -EIO ; +sdio_claim_host (sdiodev->func[1 ]); + +/* Do the transfer(s) */ +while (size) { +/* Set the backplane window to include the start address */ + bcmerror =brcmf_sdcard_set_sbaddr_window (sdiodev, address); +if (bcmerror) +break ; + +brcmf_dbg (SDIO ,"%s %d bytes at offset 0x%08x in window 0x%08x\n" , + write ?"write" :"read" , dsize, + sdaddr, address &SBSDIO_SBWINDOW_MASK ); + + sdaddr &=SBSDIO_SB_OFT_ADDR_MASK ; + sdaddr |=SBSDIO_SB_ACCESS_2_4B_FLAG ; + +skb_put (pkt, dsize); +if (write) +memcpy (pkt->data, data, dsize); + bcmerror =brcmf_sdioh_request_buffer (sdiodev,SDIOH_DATA_INC , + write,SDIO_FUNC_1 , + sdaddr, pkt); +if (bcmerror) { +brcmf_err ("membytes transfer failed\n" ); +break ; + } +if (!write) +memcpy (data, pkt->data, dsize); +skb_trim (pkt, dsize); + +/* Adjust for next transfer (if any) */ + size -= dsize; +if (size) { + data += dsize; + address += dsize; + sdaddr =0 ; + dsize =min_t (uint,SBSDIO_SB_OFT_ADDR_LIMIT , size); + } } -/* For a write, copy the buffer data into the packet. */ -if (write) -memcpy (mypkt->data, buf, nbytes); +dev_kfree_skb (pkt); - err =brcmf_sdioh_request_buffer (sdiodev,SDIOH_DATA_INC , write, -SDIO_FUNC_1 , addr, mypkt); +/* Return the window to backplane enumeration space for core access */ +if (brcmf_sdcard_set_sbaddr_window (sdiodev, sdiodev->sbwad)) +brcmf_err ("FAILED to set window back to 0x%x\n" , + sdiodev->sbwad); -/* For a read, copy the packet data back to the buffer. */ -if (!err && !write) -memcpy (buf, mypkt->data, nbytes); +sdio_release_host (sdiodev->func[1 ]); -brcmu_pkt_buf_free_skb (mypkt); -return err; +return bcmerror; }int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +28 -92
218 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +2 -0
@@ -242,6 +242,8 @@ brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,*/ extern int brcmf_sdcard_rwdata (struct brcmf_sdio_dev *sdiodev,uint rw,u32 addr,u8 *buf,uint nbytes); +extern int brcmf_sdio_ramrw (struct brcmf_sdio_dev *sdiodev,bool write, +u32 address,u8 *data,uint size);/* Issue an abort to the specified function */ extern int brcmf_sdcard_abort (struct brcmf_sdio_dev *sdiodev,uint fn);
Signature · 1 line
1.7.10.4
PATCH 3/15 brcmfmac: move chip download state code to sdio_chip.c
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
enter/exit download state routine is going to diverge with new ARM core introduced. Move corresponding code to sdio_chip.c for new ARM core support.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 205 +------------------- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 140 ++++++++++++- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 95 ++++++++- 3 files changed, 241 insertions(+), 199 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +9 -196
@@ -336,95 +336,6 @@ static uint prio2prec(u32 prio) (prio^2) : prio; } -/* core registers */ -struct sdpcmd_regs { -u32 corecontrol;/* 0x00, rev8 */ -u32 corestatus;/* rev8 */ -u32 PAD[1 ]; -u32 biststatus;/* rev8 */ - -/* PCMCIA access */ -u16 pcmciamesportaladdr;/* 0x010, rev8 */ -u16 PAD[1 ]; -u16 pcmciamesportalmask;/* rev8 */ -u16 PAD[1 ]; -u16 pcmciawrframebc;/* rev8 */ -u16 PAD[1 ]; -u16 pcmciaunderflowtimer;/* rev8 */ -u16 PAD[1 ]; - -/* interrupt */ -u32 intstatus;/* 0x020, rev8 */ -u32 hostintmask;/* rev8 */ -u32 intmask;/* rev8 */ -u32 sbintstatus;/* rev8 */ -u32 sbintmask;/* rev8 */ -u32 funcintmask;/* rev4 */ -u32 PAD[2 ]; -u32 tosbmailbox;/* 0x040, rev8 */ -u32 tohostmailbox;/* rev8 */ -u32 tosbmailboxdata;/* rev8 */ -u32 tohostmailboxdata;/* rev8 */ - -/* synchronized access to registers in SDIO clock domain */ -u32 sdioaccess;/* 0x050, rev8 */ -u32 PAD[3 ]; - -/* PCMCIA frame control */ -u8 pcmciaframectrl;/* 0x060, rev8 */ -u8 PAD[3 ]; -u8 pcmciawatermark;/* rev8 */ -u8 PAD[155 ]; - -/* interrupt batching control */ -u32 intrcvlazy;/* 0x100, rev8 */ -u32 PAD[3 ]; - -/* counters */ -u32 cmd52rd;/* 0x110, rev8 */ -u32 cmd52wr;/* rev8 */ -u32 cmd53rd;/* rev8 */ -u32 cmd53wr;/* rev8 */ -u32 abort;/* rev8 */ -u32 datacrcerror;/* rev8 */ -u32 rdoutofsync;/* rev8 */ -u32 wroutofsync;/* rev8 */ -u32 writebusy;/* rev8 */ -u32 readwait;/* rev8 */ -u32 readterm;/* rev8 */ -u32 writeterm;/* rev8 */ -u32 PAD[40 ]; -u32 clockctlstatus;/* rev8 */ -u32 PAD[7 ]; - -u32 PAD[128 ];/* DMA engines */ - -/* SDIO/PCMCIA CIS region */ -char cis[512 ];/* 0x400-0x5ff, rev6 */ - -/* PCMCIA function control registers */ -char pcmciafcr[256 ];/* 0x600-6ff, rev6 */ -u16 PAD[55 ]; - -/* PCMCIA backplane access */ -u16 backplanecsr;/* 0x76E, rev6 */ -u16 backplaneaddr0;/* rev6 */ -u16 backplaneaddr1;/* rev6 */ -u16 backplaneaddr2;/* rev6 */ -u16 backplaneaddr3;/* rev6 */ -u16 backplanedata0;/* rev6 */ -u16 backplanedata1;/* rev6 */ -u16 backplanedata2;/* rev6 */ -u16 backplanedata3;/* rev6 */ -u16 PAD[31 ]; - -/* sprom "size" & "blank" info */ -u16 spromstatus;/* 0x7BE, rev2 */ -u32 PAD[464 ]; - -u16 PAD[0x80 ]; -}; -#ifdef DEBUG /* Device console log buffer state */ struct brcmf_console {
@@ -3082,84 +2993,8 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)return rxlen ? (int )rxlen : -ETIMEDOUT ; } -static int brcmf_sdbrcm_write_vars (struct brcmf_sdio *bus) +static bool brcmf_sdbrcm_download_state (struct brcmf_sdio *bus,bool enter) { -int bcmerror =0 ; -u32 varaddr; -u32 varsizew; -__le32 varsizew_le; -#ifdef DEBUG -char *nvram_ularray; -#endif /* DEBUG */ - -/* Even if there are no vars are to be written, we still -need to set the ramsize. */ - varaddr = (bus->ramsize -4 ) - bus->varsz; - -if (bus->vars) { -/* Write the vars list */ - bcmerror =brcmf_sdio_ramrw (bus->sdiodev, true, varaddr, - bus->vars, bus->varsz); -#ifdef DEBUG -/* Verify NVRAM bytes */ -brcmf_dbg (INFO ,"Compare NVRAM dl & ul; varsize=%d\n" , - bus->varsz); - nvram_ularray =kmalloc (bus->varsz,GFP_ATOMIC ); -if (!nvram_ularray) -return -ENOMEM ; - -/* Upload image to verify downloaded contents. */ -memset (nvram_ularray,0xaa , bus->varsz); - -/* Read the vars list to temp buffer for comparison */ - bcmerror =brcmf_sdio_ramrw (bus->sdiodev, false, varaddr, - nvram_ularray, bus->varsz); -if (bcmerror) { -brcmf_err ("error %d on reading %d nvram bytes at 0x%08x\n" , - bcmerror, bus->varsz, varaddr); - } -/* Compare the org NVRAM with the one read from RAM */ -if (memcmp (bus->vars, nvram_ularray, bus->varsz)) -brcmf_err ("Downloaded NVRAM image is corrupted\n" ); -else -brcmf_err ("Download/Upload/Compare of NVRAM ok\n" ); - -kfree (nvram_ularray); -#endif /* DEBUG */ - } - -/* adjust to the user specified RAM */ -brcmf_dbg (INFO ,"Physical memory size: %d\n" , bus->ramsize); -brcmf_dbg (INFO ,"Vars are at %d, orig varsize is %d\n" , - varaddr, bus->varsz); - -/* -* Determine the length token: -* Varsize, converted to words, in lower 16-bits, checksum -* in upper 16-bits. -*/ -if (bcmerror) { - varsizew =0 ; - varsizew_le =cpu_to_le32 (0 ); - }else { - varsizew = bus->varsz /4 ; - varsizew = (~varsizew <<16 ) | (varsizew &0x0000FFFF ); - varsizew_le =cpu_to_le32 (varsizew); - } - -brcmf_dbg (INFO ,"New varsize is %d, length token=0x%08x\n" , - bus->varsz, varsizew); - -/* Write the length token to the last word */ - bcmerror =brcmf_sdio_ramrw (bus->sdiodev, true, (bus->ramsize -4 ), - (u8 *)&varsizew_le,4 ); - -return bcmerror; -} - -static int brcmf_sdbrcm_download_state (struct brcmf_sdio *bus,bool enter) -{ -int bcmerror =0 ;struct chip_info *ci = bus->ci;/* To enter download state, disable ARM and reset SOCRAM.
@@ -3168,41 +3003,19 @@ static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)if (enter) { bus->alp_only = true; - ci->coredisable (bus->sdiodev, ci,BCMA_CORE_ARM_CM3 ); - - ci->resetcore (bus->sdiodev, ci,BCMA_CORE_INTERNAL_MEM ); - -/* Clear the top bit of memory */ -if (bus->ramsize) { -u32 zeros =0 ; -brcmf_sdio_ramrw (bus->sdiodev, true, bus->ramsize -4 , - (u8 *)&zeros,4 ); - } +brcmf_sdio_chip_enter_download (bus->sdiodev, ci); }else { -if (!ci->iscoreup (bus->sdiodev, ci,BCMA_CORE_INTERNAL_MEM )) { -brcmf_err ("SOCRAM core is down after reset?\n" ); - bcmerror = -EBADE ; - goto fail; - } - - bcmerror =brcmf_sdbrcm_write_vars (bus); -if (bcmerror) { -brcmf_err ("no vars written to RAM\n" ); - bcmerror =0 ; - } - -w_sdreg32 (bus,0xFFFFFFFF , - offsetof(struct sdpcmd_regs , intstatus)); - - ci->resetcore (bus->sdiodev, ci,BCMA_CORE_ARM_CM3 ); +if (!brcmf_sdio_chip_exit_download (bus->sdiodev, ci, bus->vars, + bus->varsz)) +return false;/* Allow HT Clock now that the ARM is running. */ bus->alp_only = false; bus->sdiodev->bus_if->state =BRCMF_BUS_LOAD ; } -fail: -return bcmerror; + +return true; }static int brcmf_sdbrcm_get_image (char *buf,int len,struct brcmf_sdio *bus)
@@ -3359,7 +3172,7 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)int bcmerror =-1 ;/* Keep arm in reset */ -if (brcmf_sdbrcm_download_state (bus, true)) { +if (!brcmf_sdbrcm_download_state (bus, true)) {brcmf_err ("error placing ARM core in reset\n" ); goto err; }
@@ -3375,7 +3188,7 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) }/* Take arm out of reset */ -if (brcmf_sdbrcm_download_state (bus, false)) { +if (!brcmf_sdbrcm_download_state (bus, false)) {brcmf_err ("error getting out of ARM core reset\n" ); goto err; }
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +138 -2
149 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +94 -1
106 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 4/15 brcmutil: add new d11 interface support
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
802.11 core interface is upgraded with 11ac support. Add channel spec support code to brcmutil.
--- drivers/net/wireless/brcm80211/brcmutil/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmutil/d11.c | 162 ++++++++++++++++++++ drivers/net/wireless/brcm80211/include/brcmu_d11.h | 145 ++++++++++++++++++ 3 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/brcm80211/brcmutil/d11.c create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_d11.h
drivers/net/wireless/brcm80211/brcmutil/Makefile +2 -1
@@ -20,7 +20,8 @@ ccflags-y := \ -Idrivers/net/wireless/brcm80211/include BRCMUTIL_OFILES := \ - utils.o + utils.o \ + d11.o MODULEPFX := brcmutil
drivers/net/wireless/brcm80211/brcmutil/d11.c new file +162 -0
162 lines not on this page · raw message
drivers/net/wireless/brcm80211/include/brcmu_d11.h new file +145 -0
145 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 5/15 brcmfmac: adopt new d11 interface
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Adopting the new d11 interface for 11ac fullmac chip support.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 98 +++++++------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 134 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 7 +- 4 files changed, 125 insertions(+), 115 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -0
@@ -28,6 +28,7 @@/******************************************************************************* * IO codes that are interpreted by dongle firmware ******************************************************************************/ +#define BRCMF_C_GET_VERSION 1#define BRCMF_C_UP 2#define BRCMF_C_DOWN 3#define BRCMF_C_SET_PROMISC 10
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +48 -50
207 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +70 -64
307 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +6 -1
@@ -17,6 +17,9 @@#ifndef _wl_cfg80211_h_#define _wl_cfg80211_h_ +/* for brcmu_d11inf */ +#include <brcmu_d11.h> +#define WL_NUM_SCAN_MAX 10#define WL_NUM_PMKIDS_MAX MAXPMKID#define WL_TLV_INFO_MAX 1024
@@ -408,6 +411,7 @@ struct brcmf_cfg80211_info {u8 vif_cnt;struct brcmf_cfg80211_vif_event vif_event;struct completion vif_disabled; +struct brcmu_d11inf d11inf; };/**
@@ -484,7 +488,8 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag, const u8 *vndr_ie_buf, u32 vndr_ie_len);s32 brcmf_vif_clear_mgmt_ies (struct brcmf_cfg80211_vif *vif);struct brcmf_tlv *brcmf_parse_tlvs (void *buf,int buflen,uint key); -u16 channel_to_chanspec (struct ieee80211_channel *ch); +u16 channel_to_chanspec (struct brcmu_d11inf *d11inf, +struct ieee80211_channel *ch);u32 wl_get_vif_state_all (struct brcmf_cfg80211_info *cfg,unsigned long state);void brcmf_cfg80211_arm_vif_event (struct brcmf_cfg80211_info *cfg,struct brcmf_cfg80211_vif *vif);
Signature · 1 line
1.7.10.4
PATCH 6/15 brcmfmac: add support for dongle ARM CR4 core
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Newer WiFi chip use ARM CR4 core to achieve higher performance. Add necessary code for host driver in order to support CR4 core.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 15 +- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 150 +++++++++++++++++--- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 6 +- include/linux/bcma/bcma.h | 1 + include/linux/bcma/bcma_regs.h | 1 + 5 files changed, 148 insertions(+), 25 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +11 -4
@@ -2652,7 +2652,7 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus,struct sdpcm_shared_le sh_le;__le32 addr_le; - shaddr = bus->ramsize -4 ; + shaddr = bus->ci->rambase + bus->ramsize -4 ;/* * Read last word in socram to determine
@@ -3030,10 +3030,11 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)static int brcmf_sdbrcm_download_code_file (struct brcmf_sdio *bus) { -int offset =0 ; +int offset;uint len;u8 *memblock =NULL , *memptr;int ret; +u8 idx;brcmf_dbg (INFO ,"Enter\n" );
@@ -3054,9 +3055,14 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus) memptr += (BRCMF_SDALIGN - ((u32 )(unsigned long )memblock %BRCMF_SDALIGN )); + offset = bus->ci->rambase; +/* Download image */ -while ((len = -brcmf_sdbrcm_get_image ((char *)memptr,MEMBLOCK , bus))) { + 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) { brcmf_err("error %d on writing %d membytes at 0x%08x\n",
@@ -3065,6 +3071,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus) } offset +=MEMBLOCK ; + len =brcmf_sdbrcm_get_image ((char *)memptr,MEMBLOCK , bus); } err:
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +131 -19
266 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +4 -2
@@ -73,15 +73,17 @@ struct chip_info {u32 pmurev;u32 pmucaps;u32 ramsize; +u32 rambase; +u32 rst_vec;/* reset vertor for ARM CR4 core */ bool (*iscoreup)(struct brcmf_sdio_dev *sdiodev,struct chip_info *ci,u16 coreid);u32 (*corerev)(struct brcmf_sdio_dev *sdiodev,struct chip_info *ci,u16 coreid);void (*coredisable)(struct brcmf_sdio_dev *sdiodev, -struct chip_info *ci,u16 coreid); +struct chip_info *ci,u16 coreid,u32 core_bits);void (*resetcore)(struct brcmf_sdio_dev *sdiodev, -struct chip_info *ci,u16 coreid); +struct chip_info *ci,u16 coreid,u32 core_bits); };struct sbconfig {
include/linux/bcma/bcma.h +1 -0
@@ -134,6 +134,7 @@ struct bcma_host_ops {#define BCMA_CORE_I2S 0x834#define BCMA_CORE_SDR_DDR1_MEM_CTL 0x835/* SDR/DDR1 memory controller core */ #define BCMA_CORE_SHIM 0x837/* SHIM component in ubus/6362 */ +#define BCMA_CORE_ARM_CR4 0x83e#define BCMA_CORE_DEFAULT 0xFFF#define BCMA_MAX_NR_CORES 16
include/linux/bcma/bcma_regs.h +1 -0
@@ -37,6 +37,7 @@#define BCMA_IOST_BIST_DONE 0x8000#define BCMA_RESET_CTL 0x0800#define BCMA_RESET_CTL_RESET 0x0001 +#define BCMA_RESET_ST 0x0804/* BCMA PCI config space registers. */ #define BCMA_PCI_PMCSR 0x44
Signature · 1 line
1.7.10.4
PATCH 7/15 brcmfmac: setup SDIO reset behavior
In reply to Arend van SprielFrom: Piotr Haber <[email protected]>
Set device in a manner that SDIO I/O card reset will lead to WLAN backplane and PMU state reset.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 38 ++++++++++++++++---- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 ++ include/linux/bcma/bcma_driver_chipcommon.h | 3 ++ 3 files changed, 36 insertions(+), 7 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +31 -7
@@ -3635,7 +3635,6 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)int err =0 ;int reg_addr;u32 reg_val; -u8 idx; bus->alp_only = true;
@@ -3686,12 +3685,37 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) goto fail; } -/* Set core control so an SDIO reset does a backplane reset */ - idx =brcmf_sdio_chip_getinfidx (bus->ci,BCMA_CORE_SDIO_DEV ); - reg_addr = bus->ci->c_inf[idx].base + - offsetof(struct sdpcmd_regs , corecontrol); - reg_val =brcmf_sdio_regrl (bus->sdiodev, reg_addr,NULL ); -brcmf_sdio_regwl (bus->sdiodev, reg_addr, reg_val |CC_BPRESEN ,NULL ); +/* Set card control so an SDIO card reset does a WLAN backplane reset */ + reg_val =brcmf_sdio_regrb (bus->sdiodev, +SDIO_CCCR_BRCM_CARDCTRL , &err); +if (err) + goto fail; + + reg_val |=SDIO_CCCR_BRCM_CARDCTRL_WLANRESET ; + +brcmf_sdio_regwb (bus->sdiodev, +SDIO_CCCR_BRCM_CARDCTRL , reg_val, &err); +if (err) + goto fail; + +/* set PMUControl so a backplane reset does PMU state reload */ + reg_addr =CORE_CC_REG (bus->ci->c_inf[0 ].base, + pmucontrol); + reg_val =brcmf_sdio_regrl (bus->sdiodev, + reg_addr, + &err); +if (err) + goto fail; + + reg_val |= (BCMA_CC_PMU_CTL_RES_RELOAD <<BCMA_CC_PMU_CTL_RES_SHIFT ); + +brcmf_sdio_regwl (bus->sdiodev, + reg_addr, + reg_val, + &err); +if (err) + goto fail; +sdio_release_host (bus->sdiodev->func[1 ]);
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +2 -0
@@ -52,6 +52,8 @@#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT 0x02#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT 0x04#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC 0x08 +#define SDIO_CCCR_BRCM_CARDCTRL 0xf1 +#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET 0x02#define SDIO_CCCR_BRCM_SEPINT 0xf2#define SDIO_SEPINT_MASK 0x01
include/linux/bcma/bcma_driver_chipcommon.h +3 -0
@@ -316,6 +316,9 @@#define BCMA_CC_PMU_CTL 0x0600/* PMU control */ #define BCMA_CC_PMU_CTL_ILP_DIV 0xFFFF0000/* ILP div mask */ #define BCMA_CC_PMU_CTL_ILP_DIV_SHIFT 16 +#define BCMA_CC_PMU_CTL_RES 0x00006000/* reset control mask */ +#define BCMA_CC_PMU_CTL_RES_SHIFT 13 +#define BCMA_CC_PMU_CTL_RES_RELOAD 0x2/* reload POR values */ #define BCMA_CC_PMU_CTL_PLL_UPD 0x00000400#define BCMA_CC_PMU_CTL_NOILPONW 0x00000200/* No ILP on wait */ #define BCMA_CC_PMU_CTL_HTREQEN 0x00000100/* HT req enable */
Signature · 1 line
1.7.10.4
PATCH 8/15 brcmfmac: add BCM4335 sdio interface support
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
BCM4335 is an a/b/g/n/ac WiFi chip that supports up to 80MHz channel. This patch adds support for this chip through SDIO interface.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 ++ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 ++ drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 14 ++++++++++++++ drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 19 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +2 -0
@@ -44,6 +44,7 @@#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
@@ -54,6 +55,7 @@ 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)}, { /* end: all zeroes */ }, };MODULE_DEVICE_TABLE (sdio, brcmf_sdmmc_ids);
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -0
@@ -3558,6 +3558,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)return true;if (chipid ==BCM4334_CHIP_ID )return true; +if (chipid ==BCM4335_CHIP_ID ) +return true;return false; }
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +14 -0
@@ -493,6 +493,20 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, ci->c_inf[3 ].cib =0x07004211 ; ci->ramsize =0x80000 ;break ; +case BCM4335_CHIP_ID : + ci->c_inf[0 ].wrapbase =0x18100000 ; + ci->c_inf[0 ].cib =0x2b084411 ; + 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 =0x0f004211 ; + 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 =0x01084411 ; + 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/include/brcm_hw_ids.h +1 -0
@@ -39,5 +39,6 @@#define BCM4330_CHIP_ID 0x4330#define BCM4331_CHIP_ID 0x4331#define BCM4334_CHIP_ID 0x4334 +#define BCM4335_CHIP_ID 0x4335#endif /* _BRCM_HW_IDS_H_ */
Signature · 1 line
1.7.10.4
PATCH 9/15 brcmfmac: Add 43143 SDIO support.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Added sdio device id to list of supported devices. 43143 is a new 802.11n single stream device.
--- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 ++ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 ++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 26 ++++++++++++++++++++ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + 4 files changed, 31 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +2 -0
@@ -40,6 +40,7 @@#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
@@ -51,6 +52,7 @@/* 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 )},
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -0
@@ -3550,6 +3550,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)static bool brcmf_sdbrcm_chipmatch (u16 chipid) { +if (chipid ==BCM43143_CHIP_ID ) +return true;if (chipid ==BCM43241_CHIP_ID )return true;if (chipid ==BCM4329_CHIP_ID )
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +26 -0
@@ -40,6 +40,15 @@#define BCM4329_CORE_ARM_BASE 0x18002000#define BCM4329_RAMSIZE 0x48000 +/* bcm43143 */ +/* SDIO device core */ +#define BCM43143_CORE_BUS_BASE 0x18002000 +/* internal memory core */ +#define BCM43143_CORE_SOCRAM_BASE 0x18004000 +/* ARM Cortex M3 core, ID 0x82a */ +#define BCM43143_CORE_ARM_BASE 0x18003000 +#define BCM43143_RAMSIZE 0x70000 +#define SBCOREREV (sbidh) \ ((((sbidh) & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT) | \ ((sbidh) & SSB_IDHIGH_RCLO))
@@ -433,6 +442,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,/* Address of cores for new chips should be added here */ switch (ci->chip) { +case BCM43143_CHIP_ID : + ci->c_inf[0 ].wrapbase = ci->c_inf[0 ].base +0x00100000 ; + ci->c_inf[0 ].cib =0x2b000000 ; + ci->c_inf[1 ].id =BCMA_CORE_SDIO_DEV ; + ci->c_inf[1 ].base =BCM43143_CORE_BUS_BASE ; + ci->c_inf[1 ].wrapbase = ci->c_inf[1 ].base +0x00100000 ; + ci->c_inf[1 ].cib =0x18000000 ; + ci->c_inf[2 ].id =BCMA_CORE_INTERNAL_MEM ; + ci->c_inf[2 ].base =BCM43143_CORE_SOCRAM_BASE ; + ci->c_inf[2 ].wrapbase = ci->c_inf[2 ].base +0x00100000 ; + ci->c_inf[2 ].cib =0x14000000 ; + ci->c_inf[3 ].id =BCMA_CORE_ARM_CM3 ; + ci->c_inf[3 ].base =BCM43143_CORE_ARM_BASE ; + ci->c_inf[3 ].wrapbase = ci->c_inf[3 ].base +0x00100000 ; + ci->c_inf[3 ].cib =0x07000000 ; + ci->ramsize =BCM43143_RAMSIZE ; +break ;case BCM43241_CHIP_ID : ci->c_inf[0 ].wrapbase =0x18100000 ; ci->c_inf[0 ].cib =0x2a084411 ;
drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +1 -0
@@ -29,6 +29,7 @@/* Chipcommon Core Chip IDs */ #define BCM4313_CHIP_ID 0x4313 +#define BCM43143_CHIP_ID 43143#define BCM43224_CHIP_ID 43224#define BCM43225_CHIP_ID 43225#define BCM43235_CHIP_ID 43235
Signature · 1 line
1.7.10.4
PATCH 10/15 brcmfmac: Add drive strength programming for SDIO 43143.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 53 +++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +34 -19
@@ -82,6 +82,14 @@ static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = { {0, 0x1} }; +/* SDIO Drive Strength to sel value table for 43143 PMU Rev 17 (3.3V) */ +static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = { + {16 ,0x7 }, + {12 ,0x5 }, + {8 ,0x3 }, + {4 ,0x1 } +}; +u8 brcmf_sdio_chip_getinfidx (struct chip_info *ci,u16 coreid) {
@@ -702,21 +710,37 @@ void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci, u32 drivestrength) { - struct sdiod_drive_str *str_tab = NULL; -u32 str_mask =0 ; -u32 str_shift =0 ; + const struct sdiod_drive_str *str_tab = NULL; +u32 str_mask; +u32 str_shift;char chn[8 ];u32 base = ci->c_inf[0 ].base; +u32 i; +u32 drivestrength_sel =0 ; +u32 cc_data_temp; +u32 addr;if (!(ci->c_inf[0 ].caps &CC_CAP_PMU ))return ;switch (SDIOD_DRVSTR_KEY (ci->chip, ci->pmurev)) {case SDIOD_DRVSTR_KEY (BCM4330_CHIP_ID ,12 ): - str_tab = (struct sdiod_drive_str *)&sdiod_drvstr_tab1_1v8; + str_tab = sdiod_drvstr_tab1_1v8; str_mask =0x00003800 ; str_shift =11 ;break ; +case SDIOD_DRVSTR_KEY (BCM43143_CHIP_ID ,17 ): +/* note: 43143 does not support tristate */ + i =ARRAY_SIZE (sdiod_drvstr_tab2_3v3) -1 ; +if (drivestrength >= sdiod_drvstr_tab2_3v3[i].strength) { + str_tab = sdiod_drvstr_tab2_3v3; + str_mask =0x00000007 ; + str_shift =0 ; + }else +brcmf_err ("Invalid SDIO Drive strength for chip %s, strength=%d\n" , +brcmf_sdio_chip_name (ci->chip, chn,8 ), + drivestrength); +break ;default : brcmf_err("No SDIO Drive strength init done for chip %s rev %d pmurev %d\n", brcmf_sdio_chip_name(ci->chip, chn, 8),
@@ -725,31 +749,22 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev, }if (str_tab !=NULL ) { -u32 drivestrength_sel =0 ; -u32 cc_data_temp; -int i; -for (i =0 ; str_tab[i].strength !=0 ; i++) {if (drivestrength >= str_tab[i].strength) { drivestrength_sel = str_tab[i].sel;break ; } } - -brcmf_sdio_regwl (sdiodev,CORE_CC_REG (base, chipcontrol_addr), -1 ,NULL ); - cc_data_temp = -brcmf_sdio_regrl (sdiodev, -CORE_CC_REG (base, chipcontrol_addr), -NULL ); + addr =CORE_CC_REG (base, chipcontrol_addr); +brcmf_sdio_regwl (sdiodev, addr,1 ,NULL ); + cc_data_temp =brcmf_sdio_regrl (sdiodev, addr,NULL ); cc_data_temp &= ~str_mask; drivestrength_sel <<= str_shift; cc_data_temp |= drivestrength_sel; -brcmf_sdio_regwl (sdiodev,CORE_CC_REG (base, chipcontrol_addr), - cc_data_temp,NULL ); +brcmf_sdio_regwl (sdiodev, addr, cc_data_temp,NULL ); -brcmf_dbg (INFO ,"SDIO: %dmA drive strength selected, set to 0x%08x\n" , - drivestrength, cc_data_temp); +brcmf_dbg (INFO ,"SDIO: %d mA (req=%d mA) drive strength selected, set to 0x%08x\n" , + str_tab[i].strength, drivestrength, cc_data_temp); } }
Signature · 1 line
1.7.10.4
PATCH 11/15 brcmfmac: define and use platform specific data for SDIO.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by Kconfig BRCMFMAC_SDIO_OOB but that is now determined dynamically by checking availibility of platform data.
--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/brcmfmac_platform.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-) create mode 100644 include/linux/brcmfmac_platform.h
drivers/net/wireless/brcm80211/Kconfig +0 -9
@@ -37,15 +37,6 @@ config BRCMFMAC_SDIO IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to use the driver for a SDIO wireless card. -config BRCMFMAC_SDIO_OOB - bool "Out of band interrupt support for SDIO interface chipset" - depends on BRCMFMAC_SDIO - ---help--- - This option enables out-of-band interrupt support for Broadcom - SDIO Wifi chipset using fullmac in order to gain better - performance and deep sleep wake up capability on certain - platforms. Say N if you are unsure. - config BRCMFMAC_USB bool "USB bus interface support for FullMAC driver" depends on USB
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +78 -77
198 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +31 -83
187 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +15 -14
@@ -31,6 +31,7 @@#include <linux/bcma/bcma.h> #include <linux/debugfs.h> #include <linux/vmalloc.h> +#include <linux/brcmfmac_platform.h> #include <asm/unaligned.h> #include <defs.h> #include <brcmu_wifi.h>
@@ -517,7 +518,7 @@ static int qcount[NUMPRIO];static int tx_packets[NUMPRIO ];#endif /* DEBUG */ -#define SDIO_DRIVE_STRENGTH 6/* in milliamps */ +#define DEFAULT_SDIO_DRIVE_STRENGTH 6/* in milliamps */ #define RETRYCHAN (chan) ((chan) == SDPCM_EVENT_CHANNEL)
@@ -2046,23 +2047,19 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev) bus->tx_seq = bus->rx_seq =0 ; } -#ifdef CONFIG_BRCMFMAC_SDIO_OOB static inline void brcmf_sdbrcm_clrintr (struct brcmf_sdio *bus) {unsigned long flags; -spin_lock_irqsave (&bus->sdiodev->irq_en_lock, flags); -if (!bus->sdiodev->irq_en && !atomic_read (&bus->ipend)) { -enable_irq (bus->sdiodev->irq); - bus->sdiodev->irq_en = true; +if (bus->sdiodev->oob_irq_requested) { +spin_lock_irqsave (&bus->sdiodev->irq_en_lock, flags); +if (!bus->sdiodev->irq_en && !atomic_read (&bus->ipend)) { +enable_irq (bus->sdiodev->pdata->oob_irq_nr); + bus->sdiodev->irq_en = true; + } +spin_unlock_irqrestore (&bus->sdiodev->irq_en_lock, flags); } -spin_unlock_irqrestore (&bus->sdiodev->irq_en_lock, flags); -} -#else -static inline void brcmf_sdbrcm_clrintr (struct brcmf_sdio *bus) -{ } -#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ static inline void brcmf_sdbrcm_adddpctsk (struct brcmf_sdio *bus) {
@@ -3639,6 +3636,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)int err =0 ;int reg_addr;u32 reg_val; +u32 drivestrength; bus->alp_only = true;
@@ -3679,8 +3677,11 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) goto fail; } -brcmf_sdio_chip_drivestrengthinit (bus->sdiodev, bus->ci, -SDIO_DRIVE_STRENGTH ); +if ((bus->sdiodev->pdata) && (bus->sdiodev->pdata->drive_strength)) + drivestrength = bus->sdiodev->pdata->drive_strength; +else + drivestrength =DEFAULT_SDIO_DRIVE_STRENGTH ; +brcmf_sdio_chip_drivestrengthinit (bus->sdiodev, bus->ci, drivestrength);/* Get info on the SOCRAM cores... */ bus->ramsize = bus->ci->ramsize;
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +2 -4
@@ -174,13 +174,11 @@ struct brcmf_sdio_dev {wait_queue_head_t request_buffer_wait;struct device *dev;struct brcmf_bus *bus_if; -#ifdef CONFIG_BRCMFMAC_SDIO_OOB -unsigned int irq;/* oob interrupt number */ -unsigned long irq_flags;/* board specific oob flags */ +struct brcmfmac_sdio_platform_data *pdata; +bool oob_irq_requested;bool irq_en;/* irq enable flags */ spinlock_t irq_en_lock;bool irq_wake;/* irq wake enable flags */ -#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ };/* Register/deregister interrupt handler. */
include/linux/brcmfmac_platform.h new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [PATCH 11/15] brcmfmac: define and use platform specific data for SDIO.
Quoted 23 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by
KconfigBRCMFMAC_SDIO_OOBbut that is now determined dynamically by checking availibility of platform data.Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Franky (Zhenhui) Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Piotr Haber <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/brcmfmac_platform.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-) create mode 100644 include/linux/brcmfmac_platform.h
....
include/linux/brcmfmac_platform.h
Quoted 2 lines
include/linux/brcmfmac_platform.h new file +0
-0
This should be placed into include/linux/platform_data/
Quoted 127 lines
include/linux/brcmfmac_platform.h new file +125
-0@@ -0,0 +1,125 @@ +/* +* Copyright (c) 2013 Broadcom Corporation +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#ifndef _LINUX_BRCMFMAC_PLATFORM_H +#define _LINUX_BRCMFMAC_PLATFORM_H + +/* +* Platform specific driver functions and data. Through the platform specific +* device data functions can be provided to help the brcmfmac driver to +* operate with the device in combination with the used platform. +* +* Use the platform data in the following (similar) way: +* +* +#include <brcmfmac_platform.h> + + +static void brcmfmac_power_on(void) +{ +} + +static void brcmfmac_power_off(void) +{ +} + +static void brcmfmac_reset(void) +{ +} + +static struct brcmfmac_sdio_platform_data brcmfmac_sdio_pdata = { +.power_on = brcmfmac_power_on, +.power_off = brcmfmac_power_off, +.reset = brcmfmac_reset +}; + +static struct platform_device brcmfmac_device = { +.name = BRCMFMAC_SDIO_PDATA_NAME, +.id = PLATFORM_DEVID_NONE, +.dev.platform_data = &brcmfmac_sdio_pdata +}; + +void __init brcmfmac_init_pdata(void) +{ +brcmfmac_sdio_pdata.oob_irq_supported = true; +brcmfmac_sdio_pdata.oob_irq_nr = gpio_to_irq(GPIO_BRCMF_SDIO_OOB); +brcmfmac_sdio_pdata.oob_irq_flags = IORESOURCE_IRQ | +IORESOURCE_IRQ_HIGHLEVEL; +platform_device_register(&brcmfmac_device); +} +* +* +* Note: the brcmfmac can be loaded as module or be statically built-in into +* the kernel. If built-in then do note that it uses module_init (and +* module_exit) routines which equal device_initcall. So if you intend to +* create a module with the platform specific data for the brcmfmac and have +* it built-in to the kernel then use a higher initcall then device_initcall +* (see init.h). If this is not done then brcmfmac will load without problems +* but will not pickup the platform data. +* +* When the driver does not "detect" platform driver data then it will continue +* without reporting anything and just assume there is no data needed. Which is +* probably true for most platforms. +* +* Explanation of the platform_data fields: +* +* drive_strength: is the preferred drive_strength to be used for the SDIO +* pins. If 0 then a default value will be used. This is the target drive +* strength, the exact drive strength which will be used depends on the +* capabilities of the device. +* +* oob_irq_supported: does the board have support for OOB interrupts. SDIO +* in-band interrupts are relatively slow and for having less overhead on +* interrupt processing an out of band interrupt can be used. If the HW +* supports this then enable this by setting this field to true and configure +* the oob related fields. +* +* oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are +* used for registering the irq using request_irq function. +* +* power_on: This function is called by the brcmfmac when the module gets +* loaded. This can be particularly useful for low power devices. The platform +* spcific routine may for example decide to power up the complete device. +* If there is no use-case for this function then provide NULL. +* +* power_off: This function is called by the brcmfmac when the module gets +* unloaded. At this point the device can be powered down or otherwise be reset. +* So if an actual power_off is not supported but reset is then reset the device +* when this function gets called. This can be particularly useful for low power +* devices. If there is no use-case for this function (either power-down or +* reset) then provide NULL. +* +* reset: This function can get called if the device communication broke down. +* This functionality is particularly useful in case of SDIO type devices. It is +* possible to reset a dongle via sdio data interface, but it requires that +* this is fully functional. This function is chip/module specific and this +* function should return only after the complete reset has completed. +*/ + +#define BRCMFMAC_SDIO_PDATA_NAME "brcmfmac_sdio" + +struct brcmfmac_sdio_platform_data { +unsigned int drive_strength; +bool oob_irq_supported; +unsigned int oob_irq_nr; +unsigned long oob_irq_flags; +void (*power_on)(void ); +void (*power_off)(void ); +void (*reset)(void ); +}; + +#endif /* _LINUX_BRCMFMAC_PLATFORM_H */ +
Re: [PATCH 11/15] brcmfmac: define and use platform specific data for SDIO.
Quoted 25 lines · Hauke Mehrtens
Quoted 21 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by
KconfigBRCMFMAC_SDIO_OOBbut that is now determined dynamically by checking availibility of platform data.Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Franky (Zhenhui) Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Piotr Haber <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/brcmfmac_platform.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-)Quoted 2 lines
create mode 100644
include/linux/brcmfmac_platform.h
Quoted 7 lines
....
include/linux/brcmfmac_platform.h
Quoted 2 lines
include/linux/brcmfmac_platform.h new file +0
-0This should be placed into
include/linux/platform_data/
Are you sure. This file specifies the platform data API so it does not contain actual platform_data. At first glance this folder seems to contain board specific platform data, but did not look closely.
Regards,
Arend
Re: [PATCH 11/15] brcmfmac: define and use platform specific data for SDIO.
Quoted 37 lines · Arend van Spriel
Quoted 28 lines · Hauke Mehrtens
Quoted 24 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by
KconfigBRCMFMAC_SDIO_OOBbut that is now determined dynamically by checking availibility of platform data.Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Franky (Zhenhui) Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Piotr Haber <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/brcmfmac_platform.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-)Quoted 2 lines
create mode 100644
include/linux/brcmfmac_platform.hQuoted 7 lines
....
include/linux/brcmfmac_platform.h
Quoted 2 lines
include/linux/brcmfmac_platform.h new file +0
-0This should be placed into
include/linux/platform_data/
Quoted 3 lines
Are you sure. This file specifies the platform data API so it does not contain actual
platform_data. At first glance this folder seems to contain board specific platform data, but did not look closely.
I think, all the files in include/linux/platform_data/*.h are defining some struct used in pdev->dev.platform_data in various drivers. The content of such structs is mostly located in the arch code where the SoC gets initialized, but I am not sure about this.
Hauke
Re: [PATCH 11/15] brcmfmac: define and use platform specific data for SDIO.
Quoted 38 lines · Hauke Mehrtens
Quoted 37 lines · Arend van Spriel
Quoted 35 lines · Hauke Mehrtens
Quoted 26 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by
KconfigBRCMFMAC_SDIO_OOBbut that is now determined dynamically by checking availibility of platform data.Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Franky (Zhenhui) Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Reviewed-by Piotr Haber <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/brcmfmac_platform.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-)create mode 100644
include/linux/brcmfmac_platform.h....
include/linux/brcmfmac_platform.h
Quoted 2 lines
include/linux/brcmfmac_platform.h new file +0
-0This should be placed into
include/linux/platform_data/
Quoted 8 lines
Quoted 3 lines
Are you sure. This file specifies the platform data API so it does not contain actual
platform_data. At first glance this folder seems to contain board specific platform data, but did not look closely.I think, all the files in
include/linux/platform_data/*.hare defining some struct used inpdev->dev.platform_datain various drivers. The content of such structs is mostly located in the arch code where the SoC gets initialized, but I am not sure about this.
Hi Hauke,
I did some more digging in there and I think you are right. I will send a replacement patch to John.
Thanks & Regards,
Arend
PATCH v2 11/15 brcmfmac: define and use platform specific data for SDIO.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
This patch adds support for platform specific data for SDIO fullmac devices. Currently OOB interrupts are configured by Kconfig BRCMFMAC_SDIO_OOB but that is now determined dynamically by checking availibility of platform data.
---
Hi John,
Hauke indicated the platform data header should be in include/linux/platform_data. This patch does that and replaces patch with message-id:
Regards,
Arend
--- drivers/net/wireless/brcm80211/Kconfig | 9 -- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 155 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 114 ++++---------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 29 ++-- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 6 +- include/linux/platform_data/brcmfmac-sdio.h | 125 ++++++++++++++++ 6 files changed, 251 insertions(+), 187 deletions(-) create mode 100644 include/linux/platform_data/brcmfmac-sdio.h
drivers/net/wireless/brcm80211/Kconfig +0 -9
@@ -37,15 +37,6 @@ config BRCMFMAC_SDIO IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to use the driver for a SDIO wireless card. -config BRCMFMAC_SDIO_OOB - bool "Out of band interrupt support for SDIO interface chipset" - depends on BRCMFMAC_SDIO - ---help--- - This option enables out-of-band interrupt support for Broadcom - SDIO Wifi chipset using fullmac in order to gain better - performance and deep sleep wake up capability on certain - platforms. Say N if you are unsure. - config BRCMFMAC_USB bool "USB bus interface support for FullMAC driver" depends on USB
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +78 -77
198 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +31 -83
187 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +15 -14
@@ -31,6 +31,7 @@#include <linux/bcma/bcma.h> #include <linux/debugfs.h> #include <linux/vmalloc.h> +#include <linux/platform_data/brcmfmac-sdio.h> #include <asm/unaligned.h> #include <defs.h> #include <brcmu_wifi.h>
@@ -517,7 +518,7 @@ static int qcount[NUMPRIO];static int tx_packets[NUMPRIO ];#endif /* DEBUG */ -#define SDIO_DRIVE_STRENGTH 6/* in milliamps */ +#define DEFAULT_SDIO_DRIVE_STRENGTH 6/* in milliamps */ #define RETRYCHAN (chan) ((chan) == SDPCM_EVENT_CHANNEL)
@@ -2046,23 +2047,19 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev) bus->tx_seq = bus->rx_seq =0 ; } -#ifdef CONFIG_BRCMFMAC_SDIO_OOB static inline void brcmf_sdbrcm_clrintr (struct brcmf_sdio *bus) {unsigned long flags; -spin_lock_irqsave (&bus->sdiodev->irq_en_lock, flags); -if (!bus->sdiodev->irq_en && !atomic_read (&bus->ipend)) { -enable_irq (bus->sdiodev->irq); - bus->sdiodev->irq_en = true; +if (bus->sdiodev->oob_irq_requested) { +spin_lock_irqsave (&bus->sdiodev->irq_en_lock, flags); +if (!bus->sdiodev->irq_en && !atomic_read (&bus->ipend)) { +enable_irq (bus->sdiodev->pdata->oob_irq_nr); + bus->sdiodev->irq_en = true; + } +spin_unlock_irqrestore (&bus->sdiodev->irq_en_lock, flags); } -spin_unlock_irqrestore (&bus->sdiodev->irq_en_lock, flags); -} -#else -static inline void brcmf_sdbrcm_clrintr (struct brcmf_sdio *bus) -{ } -#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ static inline void brcmf_sdbrcm_adddpctsk (struct brcmf_sdio *bus) {
@@ -3639,6 +3636,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)int err =0 ;int reg_addr;u32 reg_val; +u32 drivestrength; bus->alp_only = true;
@@ -3679,8 +3677,11 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) goto fail; } -brcmf_sdio_chip_drivestrengthinit (bus->sdiodev, bus->ci, -SDIO_DRIVE_STRENGTH ); +if ((bus->sdiodev->pdata) && (bus->sdiodev->pdata->drive_strength)) + drivestrength = bus->sdiodev->pdata->drive_strength; +else + drivestrength =DEFAULT_SDIO_DRIVE_STRENGTH ; +brcmf_sdio_chip_drivestrengthinit (bus->sdiodev, bus->ci, drivestrength);/* Get info on the SOCRAM cores... */ bus->ramsize = bus->ci->ramsize;
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +2 -4
@@ -174,13 +174,11 @@ struct brcmf_sdio_dev {wait_queue_head_t request_buffer_wait;struct device *dev;struct brcmf_bus *bus_if; -#ifdef CONFIG_BRCMFMAC_SDIO_OOB -unsigned int irq;/* oob interrupt number */ -unsigned long irq_flags;/* board specific oob flags */ +struct brcmfmac_sdio_platform_data *pdata; +bool oob_irq_requested;bool irq_en;/* irq enable flags */ spinlock_t irq_en_lock;bool irq_wake;/* irq wake enable flags */ -#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ };/* Register/deregister interrupt handler. */
include/linux/platform_data/brcmfmac-sdio.h new file +125 -0
125 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 12/15 brcmfmac: obtain iftype for firmware-signal descriptor lookup
In reply to Arend van SprielThe function brcmf_fws_find_mac_desc() determines the descriptor associated with a sk_buff for firmware-signalling. It needs the interface type to do that. For this a helper function is added in wl_cfg80211.c.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 12 +++++++++--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +++++++ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +9 -3
@@ -31,8 +31,11 @@#include "dhd_dbg.h" #include "dhd_bus.h" #include "fwil.h" +#include "fwil_types.h" #include "fweh.h" #include "fwsignal.h" +#include "p2p.h" +#include "wl_cfg80211.h" /** * DOC: Firmware Signalling
@@ -683,7 +686,7 @@ brcmf_fws_find_mac_desc(struct brcmf_fws_info *fws, int ifidx, u8 *da)struct brcmf_fws_mac_descriptor *entry = &fws->desc.other;struct brcmf_if *ifp;bool multicast; - +enum nl80211_iftype iftype;brcmf_dbg (TRACE ,"enter: ifidx=%d\n" , ifidx); multicast =is_multicast_ether_addr (da);
@@ -691,15 +694,18 @@ brcmf_fws_find_mac_desc(struct brcmf_fws_info *fws, int ifidx, u8 *da)if (WARN_ON (!ifp)) goto done; + iftype =brcmf_cfg80211_get_iftype (ifp); +/* Multicast destination and P2P clients get the interface entry. * STA gets the interface entry if there is no exact match. For * example, TDLS destinations have their own entry. */ entry =NULL ; -if (multicast && ifp->fws_desc) +if ((multicast || iftype ==NL80211_IFTYPE_STATION || + iftype ==NL80211_IFTYPE_P2P_CLIENT ) && ifp->fws_desc) { entry = ifp->fws_desc; -if (entry !=NULL && multicast) +if (entry !=NULL && iftype !=NL80211_IFTYPE_STATION ) goto done; entry =brcmf_fws_mac_descriptor_lookup (fws, da);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +7 -0
@@ -5237,6 +5237,13 @@ s32 brcmf_cfg80211_down(struct net_device *ndev)return err; } +enum nl80211_iftype brcmf_cfg80211_get_iftype (struct brcmf_if *ifp) +{ +struct wireless_dev *wdev = &ifp->vif->wdev; + +return wdev->iftype; +} +u32 wl_get_vif_state_all (struct brcmf_cfg80211_info *cfg,unsigned long state) {struct brcmf_cfg80211_vif *vif;
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -0
@@ -478,6 +478,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,void brcmf_cfg80211_detach (struct brcmf_cfg80211_info *cfg);s32 brcmf_cfg80211_up (struct net_device *ndev);s32 brcmf_cfg80211_down (struct net_device *ndev); +enum nl80211_iftype brcmf_cfg80211_get_iftype (struct brcmf_if *ifp); struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg, enum nl80211_iftype type,
Signature · 1 line
1.7.10.4
PATCH v2 12/15 brcmfmac: obtain iftype for firmware-signal descriptor lookup
The function brcmf_fws_find_mac_desc() determines the descriptor associated with a sk_buff for firmware-signalling. It needs the interface type to do that. For this a helper function is added in wl_cfg80211.c.
---
Hi John
I did it again. It did not compile after resolving a merge conflict preparing the patch series. This patch fixes that.
Regards,
Arend
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 12 +++++++++--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +++++++ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +9 -3
@@ -31,8 +31,11 @@#include "dhd_dbg.h" #include "dhd_bus.h" #include "fwil.h" +#include "fwil_types.h" #include "fweh.h" #include "fwsignal.h" +#include "p2p.h" +#include "wl_cfg80211.h" /** * DOC: Firmware Signalling
@@ -683,7 +686,7 @@ brcmf_fws_find_mac_desc(struct brcmf_fws_info *fws, int ifidx, u8 *da)struct brcmf_fws_mac_descriptor *entry = &fws->desc.other;struct brcmf_if *ifp;bool multicast; - +enum nl80211_iftype iftype;brcmf_dbg (TRACE ,"enter: ifidx=%d\n" , ifidx); multicast =is_multicast_ether_addr (da);
@@ -691,15 +694,18 @@ brcmf_fws_find_mac_desc(struct brcmf_fws_info *fws, int ifidx, u8 *da)if (WARN_ON (!ifp)) goto done; + iftype =brcmf_cfg80211_get_iftype (ifp); +/* Multicast destination and P2P clients get the interface entry. * STA gets the interface entry if there is no exact match. For * example, TDLS destinations have their own entry. */ entry =NULL ; -if (multicast && ifp->fws_desc) +if ((multicast || iftype ==NL80211_IFTYPE_STATION || + iftype ==NL80211_IFTYPE_P2P_CLIENT ) && ifp->fws_desc) entry = ifp->fws_desc; -if (entry !=NULL && multicast) +if (entry !=NULL && iftype !=NL80211_IFTYPE_STATION ) goto done; entry =brcmf_fws_mac_descriptor_lookup (fws, da);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +7 -0
@@ -5237,6 +5237,13 @@ s32 brcmf_cfg80211_down(struct net_device *ndev)return err; } +enum nl80211_iftype brcmf_cfg80211_get_iftype (struct brcmf_if *ifp) +{ +struct wireless_dev *wdev = &ifp->vif->wdev; + +return wdev->iftype; +} +u32 wl_get_vif_state_all (struct brcmf_cfg80211_info *cfg,unsigned long state) {struct brcmf_cfg80211_vif *vif;
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -0
@@ -478,6 +478,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,void brcmf_cfg80211_detach (struct brcmf_cfg80211_info *cfg);s32 brcmf_cfg80211_up (struct net_device *ndev);s32 brcmf_cfg80211_down (struct net_device *ndev); +enum nl80211_iftype brcmf_cfg80211_get_iftype (struct brcmf_if *ifp); struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg, enum nl80211_iftype type,
Signature · 1 line
1.7.10.4
PATCH 13/15 brcmfmac: pass ifp pointer in brcmf_fws_find_mac_desc()
In reply to Arend van SprielInstead of passing the ifidx and lookup the ifp inside the function brcmf_fws_find_mac_desc() simply pass the ifp as parameter.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +5 -8
@@ -681,19 +681,16 @@ brcmf_fws_mac_descriptor_lookup(struct brcmf_fws_info *fws, u8 *ea) }static struct brcmf_fws_mac_descriptor * -brcmf_fws_find_mac_desc (struct brcmf_fws_info *fws,int ifidx,u8 *da) +brcmf_fws_find_mac_desc (struct brcmf_fws_info *fws,struct brcmf_if *ifp, +u8 *da) {struct brcmf_fws_mac_descriptor *entry = &fws->desc.other; -struct brcmf_if *ifp;bool multicast;enum nl80211_iftype iftype; -brcmf_dbg (TRACE ,"enter: ifidx=%d\n" , ifidx); - multicast =is_multicast_ether_addr (da); - ifp = fws->drvr->iflist[ifidx ? ifidx +1 :0 ]; -if (WARN_ON (!ifp)) - goto done; +brcmf_dbg (TRACE ,"enter: idx=%d\n" , ifp->bssidx); + multicast =is_multicast_ether_addr (da); iftype =brcmf_cfg80211_get_iftype (ifp);/* Multicast destination and P2P clients get the interface entry.
@@ -1750,7 +1747,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)/* set control buffer information */ skcb->if_flags =0 ; - skcb->mac =brcmf_fws_find_mac_desc (drvr->fws, ifidx, eh->h_dest); + skcb->mac =brcmf_fws_find_mac_desc (drvr->fws, ifp, eh->h_dest); skcb->state =BRCMF_FWS_SKBSTATE_NEW ;brcmf_skb_if_flags_set_field (skb,INDEX , ifidx);if (!multicast)
Signature · 1 line
1.7.10.4
PATCH 14/15 brcmfmac: rename brcmf_fws_mac_desc_ready()
In reply to Arend van SprielReplace the function by brcmf_fws_mac_desc_closed(). The new function is used in the transmit path and in the dequeue worker.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 31 ++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +13 -18
@@ -714,26 +714,19 @@ done:return entry; } -static bool brcmf_fws_mac_desc_ready (struct brcmf_fws_mac_descriptor *entry, -int fifo) +static bool brcmf_fws_mac_desc_closed (struct brcmf_fws_mac_descriptor *entry, +int fifo) { -bool ready; +bool closed; -/* -* destination entry is ready when firmware says it is OPEN -* and there are no packets enqueued for it. +/* an entry is closed when the state is closed and +* the firmware did not request anything. */ - ready = entry->state ==BRCMF_FWS_STATE_OPEN && - !entry->suppressed && -brcmu_pktq_mlen (&entry->psq,3 << (fifo *2 )) ==0 ; + closed = entry->state ==BRCMF_FWS_STATE_CLOSE && + !entry->requested_credit && !entry->requested_packet; -/* -* Or when the destination entry is CLOSED, but firmware has -* specifically requested packets for this entry. -*/ - ready = ready || (entry->state ==BRCMF_FWS_STATE_CLOSE && - (entry->requested_credit + entry->requested_packet)); -return ready; +/* Or firmware does not allow traffic for given fifo */ +return closed || !(entry->ac_bitmap &BIT (fifo)); } static void brcmf_fws_mac_desc_cleanup(struct brcmf_fws_info *fws,
@@ -1086,7 +1079,7 @@ static struct sk_buff *brcmf_fws_deq(struct brcmf_fws_info *fws, int fifo)for (i =0 ; i < num_nodes; i++) { entry = &table[(node_pos + i) % num_nodes]; -if (!entry->occupied) +if (!entry->occupied ||brcmf_fws_mac_desc_closed (entry, fifo))continue ;if (entry->suppressed)
@@ -1758,7 +1751,9 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) multicast, fifo);brcmf_fws_lock (drvr, flags); -if (!brcmf_fws_mac_desc_ready (skcb->mac, fifo) || +if (skcb->mac->suppressed || +brcmf_fws_mac_desc_closed (skcb->mac, fifo) || +brcmu_pktq_mlen (&skcb->mac->psq,3 << (fifo *2 )) || (!multicast &&brcmf_fws_consume_credit (drvr->fws, fifo, skb) <0 )) {/* enqueue the packet in delayQ */
Signature · 1 line
1.7.10.4
PATCH v2 14/15 brcmfmac: rename brcmf_fws_mac_desc_ready()
Replace the function by brcmf_fws_mac_desc_closed(). The new function is used in the transmit path and in the dequeue worker.
---
Hi John,
Can not blame merging this time. The original patch has some checkpatch warnings that this patch fixes. Sorry about that.
Regards,
Arend
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 31 ++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +13 -18
@@ -714,26 +714,19 @@ done:return entry; } -static bool brcmf_fws_mac_desc_ready (struct brcmf_fws_mac_descriptor *entry, -int fifo) +static bool brcmf_fws_mac_desc_closed (struct brcmf_fws_mac_descriptor *entry, +int fifo) { -bool ready; +bool closed; -/* -* destination entry is ready when firmware says it is OPEN -* and there are no packets enqueued for it. +/* an entry is closed when the state is closed and +* the firmware did not request anything. */ - ready = entry->state ==BRCMF_FWS_STATE_OPEN && - !entry->suppressed && -brcmu_pktq_mlen (&entry->psq,3 << (fifo *2 )) ==0 ; + closed = entry->state ==BRCMF_FWS_STATE_CLOSE && + !entry->requested_credit && !entry->requested_packet; -/* -* Or when the destination entry is CLOSED, but firmware has -* specifically requested packets for this entry. -*/ - ready = ready || (entry->state ==BRCMF_FWS_STATE_CLOSE && - (entry->requested_credit + entry->requested_packet)); -return ready; +/* Or firmware does not allow traffic for given fifo */ +return closed || !(entry->ac_bitmap &BIT (fifo)); } static void brcmf_fws_mac_desc_cleanup(struct brcmf_fws_info *fws,
@@ -1086,7 +1079,7 @@ static struct sk_buff *brcmf_fws_deq(struct brcmf_fws_info *fws, int fifo)for (i =0 ; i < num_nodes; i++) { entry = &table[(node_pos + i) % num_nodes]; -if (!entry->occupied) +if (!entry->occupied ||brcmf_fws_mac_desc_closed (entry, fifo))continue ;if (entry->suppressed)
@@ -1758,7 +1751,9 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) multicast, fifo);brcmf_fws_lock (drvr, flags); -if (!brcmf_fws_mac_desc_ready (skcb->mac, fifo) || +if (skcb->mac->suppressed || +brcmf_fws_mac_desc_closed (skcb->mac, fifo) || +brcmu_pktq_mlen (&skcb->mac->psq,3 << (fifo *2 )) || (!multicast &&brcmf_fws_consume_credit (drvr->fws, fifo, skb) <0 )) {/* enqueue the packet in delayQ */
Signature · 1 line
1.7.10.4
PATCH 15/15 brcmfmac: remove ifidx variable from brcmf_fws_process_skb()
In reply to Arend van SprielThe value can be obtained from the struct brcmf_if object pointer and it is used only twice.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +2 -3
@@ -1718,7 +1718,6 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)struct brcmf_skbuff_cb *skcb =brcmf_skbcb (skb);struct ethhdr *eh = (struct ethhdr *)(skb->data);ulong flags; -u8 ifidx = ifp->ifidx;int fifo =BRCMF_FWS_FIFO_BCMC ;bool multicast =is_multicast_ether_addr (eh->h_dest);
@@ -1732,7 +1731,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)if (!brcmf_fws_fc_active (drvr->fws)) {/* If the protocol uses a data header, apply it */ -brcmf_proto_hdrpush (drvr, ifidx,0 , skb); +brcmf_proto_hdrpush (drvr, ifp->ifidx,0 , skb);/* Use bus module to send data frame */ return brcmf_bus_txdata (drvr->bus_if, skb);
@@ -1742,7 +1741,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) skcb->if_flags =0 ; skcb->mac =brcmf_fws_find_mac_desc (drvr->fws, ifp, eh->h_dest); skcb->state =BRCMF_FWS_SKBSTATE_NEW ; -brcmf_skb_if_flags_set_field (skb,INDEX , ifidx); +brcmf_skb_if_flags_set_field (skb,INDEX , ifp->ifidx);if (!multicast) fifo = brcmf_fws_prio2fifo[skb->priority];brcmf_skb_if_flags_set_field (skb,FIFO , fifo);
Signature · 1 line
1.7.10.4