brcmfmac: sdio suspend rework and debugfs change
cover brcmfmac: sdio suspend rework and debugfs change
Here some late patches for 3.20 kernel. Most related to SDIO as that received a bit more attention last couple of weeks. Also added a debugfs file so users can provide us all the revinfo we could ask for.
This series is intended for v3.20 and applies to the master branch of the wireless-drivers-next repository.
Arend van Spriel (3):
brcmfmac: use helper function for changing SDIO state
brcmfmac: add debugfs file containing revision info
brcmfmac: make sdio suspend wait for threads to freeze
Hante Meuleman (3):
brcmfmac: Remove error print for invalid key index.
brcmfmac: Dont sleep when ctrl frames to transmit.
brcmfmac: Fix escan timer causing oops.
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 166 +++++++++++++++++---- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 11 +- drivers/net/wireless/brcm80211/brcmfmac/core.c | 30 ++++ drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 109 ++++++++------ drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 47 ++++-- 5 files changed, 270 insertions(+), 93 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/6 brcmfmac: use helper function for changing SDIO state
Changing the SDIO state of the driver involves changing the bus interface state. Adding a helper function makes sure that knowledge is in one place.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 41 +++++++++++++++++------- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 18 +++++------ drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 21 ++++++++---- 3 files changed, 54 insertions(+), 26 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +30 -11
@@ -197,6 +197,30 @@ int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)return 0 ; } +void brcmf_sdiod_change_state (struct brcmf_sdio_dev *sdiodev, +enum brcmf_sdiod_state state) +{ +if (sdiodev->state ==BRCMF_SDIOD_NOMEDIUM || + state == sdiodev->state) +return ; + +brcmf_dbg (TRACE ,"%d -> %d\n" , sdiodev->state, state); +switch (sdiodev->state) { +case BRCMF_SDIOD_DATA : +/* any other state means bus interface is down */ +brcmf_bus_change_state (sdiodev->bus_if,BRCMF_BUS_DOWN ); +break ; +case BRCMF_SDIOD_DOWN : +/* transition from DOWN to DATA means bus interface is up */ +if (state ==BRCMF_SDIOD_DATA ) +brcmf_bus_change_state (sdiodev->bus_if,BRCMF_BUS_UP ); +break ; +default : +break ; + } + sdiodev->state = state; +} +static inline int brcmf_sdiod_f0_writeb (struct sdio_func *func,uint regaddr,u8 byte) {
@@ -269,12 +293,6 @@ static int brcmf_sdiod_request_data(struct brcmf_sdio_dev *sdiodev, u8 fn,return ret; } -static void brcmf_sdiod_nomedium_state (struct brcmf_sdio_dev *sdiodev) -{ - sdiodev->state =BRCMF_STATE_NOMEDIUM ; -brcmf_bus_change_state (sdiodev->bus_if,BRCMF_BUS_DOWN ); -} -static int brcmf_sdiod_regrw_helper (struct brcmf_sdio_dev *sdiodev,u32 addr,u8 regsz,void *data,bool write) {
@@ -282,7 +300,7 @@ static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,s32 retry =0 ;int ret; -if (sdiodev->state ==BRCMF_STATE_NOMEDIUM ) +if (sdiodev->state ==BRCMF_SDIOD_NOMEDIUM )return -ENOMEDIUM ;/*
@@ -308,7 +326,7 @@ static int brcmf_sdiod_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr, retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);if (ret == -ENOMEDIUM ) -brcmf_sdiod_nomedium_state (sdiodev); +brcmf_sdiod_change_state (sdiodev,BRCMF_SDIOD_NOMEDIUM );else if (ret !=0 ) {/* * SleepCSR register access can fail when
@@ -331,7 +349,7 @@ brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)int err =0 , i;u8 addr[3 ]; -if (sdiodev->state ==BRCMF_STATE_NOMEDIUM ) +if (sdiodev->state ==BRCMF_SDIOD_NOMEDIUM )return -ENOMEDIUM ; addr[0 ] = (address >>8 ) &SBSDIO_SBADDRLOW_MASK ;
@@ -460,7 +478,7 @@ static int brcmf_sdiod_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, err =sdio_readsb (sdiodev->func[fn], ((u8 *)(pkt->data)), addr, req_sz);if (err == -ENOMEDIUM ) -brcmf_sdiod_nomedium_state (sdiodev); +brcmf_sdiod_change_state (sdiodev,BRCMF_SDIOD_NOMEDIUM );return err; }
@@ -595,7 +613,7 @@ static int brcmf_sdiod_sglist_rw(struct brcmf_sdio_dev *sdiodev, uint fn, ret = mmc_cmd.error ? mmc_cmd.error : mmc_dat.error;if (ret == -ENOMEDIUM ) { -brcmf_sdiod_nomedium_state (sdiodev); +brcmf_sdiod_change_state (sdiodev,BRCMF_SDIOD_NOMEDIUM );break ; }else if (ret !=0 ) { brcmf_err("CMD53 sg block %s failed %d\n",
@@ -1050,6 +1068,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, bus_if->wowl_supported = true;#endif +brcmf_sdiod_change_state (sdiodev,BRCMF_SDIOD_DOWN ); sdiodev->sleeping = false;atomic_set (&sdiodev->suspend, false);init_waitqueue_head (&sdiodev->idle_wait);
drivers/net/wireless/brcm80211/brcmfmac/sdio.c +9 -9
@@ -1909,7 +1909,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) bus->rxpending = true;for (rd->seq_num = bus->rx_seq, rxleft = maxframes; - !bus->rxskip && rxleft && bus->sdiodev->state ==BRCMF_STATE_DATA ; + !bus->rxskip && rxleft && bus->sdiodev->state ==BRCMF_SDIOD_DATA ; rd->seq_num++, rxleft--) {/* Handle glomming separately */
@@ -2415,7 +2415,7 @@ static uint brcmf_sdio_sendfromq(struct brcmf_sdio *bus, uint maxframes) }/* Deflow-control stack if needed */ -if ((bus->sdiodev->state ==BRCMF_STATE_DATA ) && +if ((bus->sdiodev->state ==BRCMF_SDIOD_DATA ) && bus->txoff && (pktq_len (&bus->txq) <TXLOW )) { bus->txoff = false;brcmf_txflowblock (bus->sdiodev->dev, false);
@@ -2503,7 +2503,7 @@ static void brcmf_sdio_bus_stop(struct device *dev) bus->watchdog_tsk =NULL ; } -if (sdiodev->state !=BRCMF_STATE_NOMEDIUM ) { +if (sdiodev->state !=BRCMF_SDIOD_NOMEDIUM ) {sdio_claim_host (sdiodev->func[1 ]);/* Enable clock for device interrupts */
@@ -2755,7 +2755,7 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus)brcmf_sdio_sendfromq (bus, framecnt); } -if ((bus->sdiodev->state !=BRCMF_STATE_DATA ) || (err !=0 )) { +if ((bus->sdiodev->state !=BRCMF_SDIOD_DATA ) || (err !=0 )) {brcmf_err ("failed backplane access over SDIO, halting operation\n" );atomic_set (&bus->intstatus,0 ); } else if (atomic_read(&bus->intstatus) ||
@@ -3411,7 +3411,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus, }/* Allow full data communication using DPC from now on. */ - bus->sdiodev->state =BRCMF_STATE_DATA ; +brcmf_sdiod_change_state (bus->sdiodev,BRCMF_SDIOD_DATA ); bcmerror =0 ; err:
@@ -3557,7 +3557,7 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus)return ; } -if (bus->sdiodev->state !=BRCMF_STATE_DATA ) { +if (bus->sdiodev->state !=BRCMF_SDIOD_DATA ) {brcmf_err ("bus is down. we have nothing to do\n" );return ; }
@@ -3623,7 +3623,7 @@ static bool brcmf_sdio_bus_watchdog(struct brcmf_sdio *bus) }#ifdef DEBUG /* Poll for console output periodically */ -if (bus->sdiodev->state ==BRCMF_STATE_DATA && +if (bus->sdiodev->state ==BRCMF_SDIOD_DATA && bus->console_interval !=0 ) { bus->console.count +=BRCMF_WD_POLL_MS ;if (bus->console.count >= bus->console_interval) {
@@ -4242,7 +4242,7 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)destroy_workqueue (bus->brcmf_wq);if (bus->ci) { -if (bus->sdiodev->state !=BRCMF_STATE_NOMEDIUM ) { +if (bus->sdiodev->state !=BRCMF_SDIOD_NOMEDIUM ) {sdio_claim_host (bus->sdiodev->func[1 ]);brcmf_sdio_clkctl (bus,CLK_AVAIL , false);/* Leave the device in state where it is
@@ -4277,7 +4277,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, uint wdtick) }/* don't start the wd until fw is loaded */ -if (bus->sdiodev->state !=BRCMF_STATE_DATA ) +if (bus->sdiodev->state !=BRCMF_SDIOD_DATA )return ;if (wdtick) {
drivers/net/wireless/brcm80211/brcmfmac/sdio.h +15 -6
@@ -155,11 +155,17 @@/* watchdog polling interval in ms */ #define BRCMF_WD_POLL_MS 10 -/* The state of the bus */ -enum brcmf_sdio_state { -BRCMF_STATE_DOWN ,/* Device available, still initialising */ -BRCMF_STATE_DATA ,/* Ready for data transfers, DPC enabled */ -BRCMF_STATE_NOMEDIUM /* No medium access to dongle possible */ +/** +* enum brcmf_sdiod_state - the state of the bus. +* +* @BRCMF_SDIOD_DOWN: Device can be accessed, no DPC. +* @BRCMF_SDIOD_DATA: Ready for data transfers, DPC enabled. +* @BRCMF_SDIOD_NOMEDIUM: No medium access to dongle possible. +*/ +enum brcmf_sdiod_state { +BRCMF_SDIOD_DOWN , +BRCMF_SDIOD_DATA , +BRCMF_SDIOD_NOMEDIUM };struct brcmf_sdreg {
@@ -194,7 +200,7 @@ struct brcmf_sdio_dev {char fw_name[BRCMF_FW_PATH_LEN +BRCMF_FW_NAME_LEN ];char nvram_name[BRCMF_FW_PATH_LEN +BRCMF_FW_NAME_LEN ];bool wowl_enabled; -enum brcmf_sdio_state state; +enum brcmf_sdiod_state state; };/* sdio core registers */
@@ -345,4 +351,7 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus);void brcmf_sdio_wd_timer (struct brcmf_sdio *bus,uint wdtick);void brcmf_sdio_wowl_config (struct device *dev,bool enabled); +void brcmf_sdiod_change_state (struct brcmf_sdio_dev *sdiodev, +enum brcmf_sdiod_state state); +#endif /* BRCMFMAC_SDIO_H */
Signature · 1 line
1.9.1
Re: [1/6] brcmfmac: use helper function for changing SDIO state
Quoted 10 lines
Changing the SDIO state of the driver involves changing the bus interface state. Adding a helper function makes sure that knowledge is in one place.
Reviewed-by Hante Meuleman <[email protected]>Reviewed-by Daniel (Deognyoun) Kim <[email protected]>Reviewed-by Franky (Zhenhui) Lin <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Signed-off-by Arend van Spriel <[email protected]>
Thanks, 6 patches applied to wireless-drivers-next.git:
a1ce7a0d6a4f brcmfmac: use helper function for changing SDIO state ad5a52518aa5 brcmfmac: Remove error print for invalid key index. c7cd5d27d848 brcmfmac: add debugfs file containing revision info 9982464379e8 brcmfmac: make sdio suspend wait for threads to freeze a7b134a7676e brcmfmac: Dont sleep when ctrl frames to transmit. 661fa95ddb9e brcmfmac: Fix escan timer causing oops.
Kalle Valo
PATCH 2/6 brcmfmac: Remove error print for invalid key index.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
When a key is set or cleared with an unsupported key index then brcmfmac will print an error. With most wpa_supplicants this is happening a lot. The error print is confusing and not needed.
--- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +0 -1
@@ -2252,7 +2252,6 @@ brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,if (key_idx >=BRCMF_MAX_DEFAULT_KEYS ) {/* we ignore this key index in this case */ -brcmf_err ("invalid key index (%d)\n" , key_idx);return -EINVAL ; }
Signature · 1 line
1.9.1
PATCH 3/6 brcmfmac: add debugfs file containing revision info
In reply to Arend van SprielMake the revision info visible in debugfs. The new debugfs file is named 'revinfo'.
--- drivers/net/wireless/brcm80211/brcmfmac/core.c | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/core.c +30 -0
@@ -944,6 +944,34 @@ fail:return ret; } +static int brcmf_revinfo_read (struct seq_file *s,void *data) +{ +struct brcmf_bus *bus_if =dev_get_drvdata (s->private); +struct brcmf_rev_info *ri = &bus_if->drvr->revinfo; +char drev[BRCMU_DOTREV_LEN ]; +char brev[BRCMU_BOARDREV_LEN ]; + +seq_printf (s,"vendorid: 0x%04x\n" , ri->vendorid); +seq_printf (s,"deviceid: 0x%04x\n" , ri->deviceid); +seq_printf (s,"radiorev: %s\n" ,brcmu_dotrev_str (ri->radiorev, drev)); +seq_printf (s,"chipnum: %u (%x)\n" , ri->chipnum, ri->chipnum); +seq_printf (s,"chiprev: %u\n" , ri->chiprev); +seq_printf (s,"chippkg: %u\n" , ri->chippkg); +seq_printf (s,"corerev: %u\n" , ri->corerev); +seq_printf (s,"boardid: 0x%04x\n" , ri->boardid); +seq_printf (s,"boardvendor: 0x%04x\n" , ri->boardvendor); +seq_printf (s,"boardrev: %s\n" ,brcmu_boardrev_str (ri->boardrev, brev)); +seq_printf (s,"driverrev: %s\n" ,brcmu_dotrev_str (ri->driverrev, drev)); +seq_printf (s,"ucoderev: %u\n" , ri->ucoderev); +seq_printf (s,"bus: %u\n" , ri->bus); +seq_printf (s,"phytype: %u\n" , ri->phytype); +seq_printf (s,"phyrev: %u\n" , ri->phyrev); +seq_printf (s,"anarev: %u\n" , ri->anarev); +seq_printf (s,"nvramrev: %08x\n" , ri->nvramrev); + +return 0 ; +} +int brcmf_bus_start (struct device *dev) {int ret =-1 ;
@@ -974,6 +1002,8 @@ int brcmf_bus_start(struct device *dev)if (ret <0 ) goto fail; +brcmf_debugfs_add_entry (drvr,"revinfo" , brcmf_revinfo_read); +/* assure we have chipid before feature attach */ if (!bus_if->chip) { bus_if->chip = drvr->revinfo.chipnum;
Signature · 1 line
1.9.1
PATCH 4/6 brcmfmac: make sdio suspend wait for threads to freeze
In reply to Arend van SprielBorrowed the idea of the PM freezer to make sdio suspend wait for watchdog and DPC thread to freeze at a safe point in their thread routine. The suspend takes 20-25 msec.
--- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 125 ++++++++++++++++++++--- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 90 ++++++++-------- drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 32 ++++-- 3 files changed, 184 insertions(+), 63 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +108 -17
@@ -58,6 +58,14 @@#define BRCMF_DEFAULT_TXGLOM_SIZE 32/* max tx frames in glom chain */ #define BRCMF_DEFAULT_RXGLOM_SIZE 32/* max rx frames in glom chain */ +struct brcmf_sdiod_freezer { +atomic_t freezing; +atomic_t thread_count; +u32 frozen_count; +wait_queue_head_t thread_freeze; +struct completion resumed; +}; +static int brcmf_sdiod_txglomsz =BRCMF_DEFAULT_TXGLOM_SIZE ;module_param_named (txglomsz, brcmf_sdiod_txglomsz, int,0 );MODULE_PARM_DESC (txglomsz,"maximum tx packet chain size [SDIO]" );
@@ -895,6 +903,87 @@ static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev) sdiodev->txglomsz = brcmf_sdiod_txglomsz; } +#ifdef CONFIG_PM_SLEEP +static int brcmf_sdiod_freezer_attach (struct brcmf_sdio_dev *sdiodev) +{ + sdiodev->freezer =kzalloc (sizeof (*sdiodev->freezer),GFP_KERNEL ); +if (!sdiodev->freezer) +return -ENOMEM ; +atomic_set (&sdiodev->freezer->thread_count,0 ); +atomic_set (&sdiodev->freezer->freezing,0 ); +init_waitqueue_head (&sdiodev->freezer->thread_freeze); +init_completion (&sdiodev->freezer->resumed); +return 0 ; +} + +static void brcmf_sdiod_freezer_detach (struct brcmf_sdio_dev *sdiodev) +{ +if (sdiodev->freezer) { +WARN_ON (atomic_read (&sdiodev->freezer->freezing)); +kfree (sdiodev->freezer); + } +} + +static int brcmf_sdiod_freezer_on (struct brcmf_sdio_dev *sdiodev) +{ +atomic_t *expect = &sdiodev->freezer->thread_count; +int res =0 ; + + sdiodev->freezer->frozen_count =0 ; +reinit_completion (&sdiodev->freezer->resumed); +atomic_set (&sdiodev->freezer->freezing,1 ); +brcmf_sdio_trigger_dpc (sdiodev->bus); +wait_event (sdiodev->freezer->thread_freeze, +atomic_read (expect) == sdiodev->freezer->frozen_count); +sdio_claim_host (sdiodev->func[1 ]); + res =brcmf_sdio_sleep (sdiodev->bus, true); +sdio_release_host (sdiodev->func[1 ]); +return res; +} + +static void brcmf_sdiod_freezer_off (struct brcmf_sdio_dev *sdiodev) +{ +sdio_claim_host (sdiodev->func[1 ]); +brcmf_sdio_sleep (sdiodev->bus, false); +sdio_release_host (sdiodev->func[1 ]); +atomic_set (&sdiodev->freezer->freezing,0 ); +complete_all (&sdiodev->freezer->resumed); +} + +bool brcmf_sdiod_freezing (struct brcmf_sdio_dev *sdiodev) +{ +return atomic_read (&sdiodev->freezer->freezing); +} + +void brcmf_sdiod_try_freeze (struct brcmf_sdio_dev *sdiodev) +{ +if (!brcmf_sdiod_freezing (sdiodev)) +return ; + sdiodev->freezer->frozen_count++; +wake_up (&sdiodev->freezer->thread_freeze); +wait_for_completion (&sdiodev->freezer->resumed); +} + +void brcmf_sdiod_freezer_count (struct brcmf_sdio_dev *sdiodev) +{ +atomic_inc (&sdiodev->freezer->thread_count); +} + +void brcmf_sdiod_freezer_uncount (struct brcmf_sdio_dev *sdiodev) +{ +atomic_dec (&sdiodev->freezer->thread_count); +} +#else +static int brcmf_sdiod_freezer_attach (struct brcmf_sdio_dev *sdiodev) +{ +return 0 ; +} + +static void brcmf_sdiod_freezer_detach (struct brcmf_sdio_dev *sdiodev) +{ +} +#endif /* CONFIG_PM_SLEEP */ +static int brcmf_sdiod_remove (struct brcmf_sdio_dev *sdiodev) {if (sdiodev->bus) {
@@ -902,6 +991,8 @@ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev) sdiodev->bus =NULL ; } +brcmf_sdiod_freezer_detach (sdiodev); +/* Disable Function 2 */ sdio_claim_host (sdiodev->func[2 ]);sdio_disable_func (sdiodev->func[2 ]);
@@ -973,6 +1064,10 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)*/ brcmf_sdiod_sgtable_alloc (sdiodev); + ret =brcmf_sdiod_freezer_attach (sdiodev); +if (ret) + goto out; +/* try to attach to the target device */ sdiodev->bus =brcmf_sdio_probe (sdiodev);if (!sdiodev->bus) {
@@ -1069,9 +1164,6 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,#endif brcmf_sdiod_change_state (sdiodev,BRCMF_SDIOD_DOWN ); - sdiodev->sleeping = false; -atomic_set (&sdiodev->suspend, false); -init_waitqueue_head (&sdiodev->idle_wait);brcmf_dbg (SDIO ,"F2 found, calling brcmf_sdiod_probe...\n" ); err =brcmf_sdiod_probe (sdiodev);
@@ -1133,24 +1225,22 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled)#ifdef CONFIG_PM_SLEEP static int brcmf_ops_sdio_suspend (struct device *dev) { +struct sdio_func *func;struct brcmf_bus *bus_if;struct brcmf_sdio_dev *sdiodev;mmc_pm_flag_t sdio_flags; -brcmf_dbg (SDIO ,"Enter\n" ); + func = container_of(dev, struct sdio_func, dev); +brcmf_dbg (SDIO ,"Enter: F%d\n" , func->num); +if (func->num !=SDIO_FUNC_1 ) +return 0 ; + bus_if =dev_get_drvdata (dev); sdiodev = bus_if->bus_priv.sdio; -/* wait for watchdog to go idle */ -if (wait_event_timeout (sdiodev->idle_wait, sdiodev->sleeping, -msecs_to_jiffies (3 *BRCMF_WD_POLL_MS )) ==0 ) { -brcmf_err ("bus still active\n" ); -return -EBUSY ; - } -/* disable watchdog */ +brcmf_sdiod_freezer_on (sdiodev);brcmf_sdio_wd_timer (sdiodev->bus,0 ); -atomic_set (&sdiodev->suspend, true);if (sdiodev->wowl_enabled) { sdio_flags =MMC_PM_KEEP_POWER ;
@@ -1168,12 +1258,13 @@ static int brcmf_ops_sdio_resume(struct device *dev) {struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; + struct sdio_func *func = container_of(dev, struct sdio_func, dev); -brcmf_dbg (SDIO ,"Enter\n" ); -if (sdiodev->pdata && sdiodev->pdata->oob_irq_supported) -disable_irq_wake (sdiodev->pdata->oob_irq_nr); -brcmf_sdio_wd_timer (sdiodev->bus,BRCMF_WD_POLL_MS ); -atomic_set (&sdiodev->suspend, false); +brcmf_dbg (SDIO ,"Enter: F%d\n" , func->num); +if (func->num !=SDIO_FUNC_2 ) +return 0 ; + +brcmf_sdiod_freezer_off (sdiodev);return 0 ; }
drivers/net/wireless/brcm80211/brcmfmac/sdio.c +50 -40
191 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/sdio.h +26 -6
@@ -175,15 +175,13 @@ struct brcmf_sdreg { };struct brcmf_sdio ; +struct brcmf_sdiod_freezer ;struct brcmf_sdio_dev {struct sdio_func *func[SDIO_MAX_FUNCS ];u8 num_funcs;/* Supported funcs on client */ u32 sbwad;/* Save backplane window address */ struct brcmf_sdio *bus; -atomic_t suspend;/* suspend flag */ -bool sleeping; -wait_queue_head_t idle_wait;struct device *dev;struct brcmf_bus *bus_if;struct brcmfmac_sdio_platform_data *pdata;
@@ -201,6 +199,7 @@ struct brcmf_sdio_dev {char nvram_name[BRCMF_FW_PATH_LEN +BRCMF_FW_NAME_LEN ];bool wowl_enabled;enum brcmf_sdiod_state state; +struct brcmf_sdiod_freezer *freezer; };/* sdio core registers */
@@ -343,6 +342,28 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,/* Issue an abort to the specified function */ int brcmf_sdiod_abort (struct brcmf_sdio_dev *sdiodev,uint fn); +void brcmf_sdiod_change_state (struct brcmf_sdio_dev *sdiodev, +enum brcmf_sdiod_state state); +#ifdef CONFIG_PM_SLEEP +bool brcmf_sdiod_freezing (struct brcmf_sdio_dev *sdiodev); +void brcmf_sdiod_try_freeze (struct brcmf_sdio_dev *sdiodev); +void brcmf_sdiod_freezer_count (struct brcmf_sdio_dev *sdiodev); +void brcmf_sdiod_freezer_uncount (struct brcmf_sdio_dev *sdiodev); +#else +static inline bool brcmf_sdiod_freezing (struct brcmf_sdio_dev *sdiodev) +{ +return false; +} +static inline void brcmf_sdiod_try_freeze (struct brcmf_sdio_dev *sdiodev) +{ +} +static inline void brcmf_sdiod_freezer_count (struct brcmf_sdio_dev *sdiodev) +{ +} +static inline void brcmf_sdiod_freezer_uncount (struct brcmf_sdio_dev *sdiodev) +{ +} +#endif /* CONFIG_PM_SLEEP */ struct brcmf_sdio *brcmf_sdio_probe (struct brcmf_sdio_dev *sdiodev);void brcmf_sdio_remove (struct brcmf_sdio *bus);
@@ -350,8 +371,7 @@ void brcmf_sdio_isr(struct brcmf_sdio *bus);void brcmf_sdio_wd_timer (struct brcmf_sdio *bus,uint wdtick);void brcmf_sdio_wowl_config (struct device *dev,bool enabled); - -void brcmf_sdiod_change_state (struct brcmf_sdio_dev *sdiodev, -enum brcmf_sdiod_state state); +int brcmf_sdio_sleep (struct brcmf_sdio *bus,bool sleep); +void brcmf_sdio_trigger_dpc (struct brcmf_sdio *bus);#endif /* BRCMFMAC_SDIO_H */
Signature · 1 line
1.9.1
PATCH 5/6 brcmfmac: Dont sleep when ctrl frames to transmit.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
The SDIO watchdog will put the device in sleep mode when there is no activity for some time and nothing to do anymore. This check is incomplete and should also check if there is a control frame to transmit.
--- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/brcm80211/brcmfmac/sdio.c +1 -0
@@ -1027,6 +1027,7 @@ brcmf_sdio_bus_sleep(struct brcmf_sdio *bus, bool sleep, bool pendok)/* Don't sleep if something is pending */ if (atomic_read (&bus->intstatus) ||atomic_read (&bus->ipend) >0 || + bus->ctrl_frame_stat || (!atomic_read (&bus->fcstate) &&brcmu_pktq_mlen (&bus->txq, ~bus->flowcontrol) &&data_ok (bus))) {
Signature · 1 line
1.9.1
PATCH 6/6 brcmfmac: Fix escan timer causing oops.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
In some rare circumstances the escan protection timer can expire before the setup completed (due to long timeouts on IOCTL). This patch avoids this situation by setting the timer after the setup completed correctly.
--- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +4 -6
@@ -1050,10 +1050,6 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE ].vif) vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif; -/* Arm scan timeout timer */ -mod_timer (&cfg->escan_timeout, jiffies + -WL_ESCAN_TIMER_INTERVAL_MS *HZ /1000 ); - escan_req = false;if (request) {/* scan bss */
@@ -1112,12 +1108,14 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, } } +/* Arm scan timeout timer */ +mod_timer (&cfg->escan_timeout, jiffies + +WL_ESCAN_TIMER_INTERVAL_MS *HZ /1000 ); +return 0 ; scan_out:clear_bit (BRCMF_SCAN_STATUS_BUSY , &cfg->scan_status); -if (timer_pending (&cfg->escan_timeout)) -del_timer_sync (&cfg->escan_timeout); cfg->scan_request =NULL ;return err; }
Signature · 1 line
1.9.1