brcmfmac: fix several driver issues
cover brcmfmac: fix several driver issues
This modest number of patches fixes issues found during testing of AP mode that were introduced couple of kernel releases back. Better fixing it late than never. Even more so for the download fix.
This series is intended for v3.9 kernel. The patches apply to the master branch in the wireless repository.
Franky Lin (1):
brcmfmac: do not proceed if fail to download nvram to dongle
Hante Meuleman (3):
brcmfmac: fix tkip mic tx/rx ap swap bug.
brcmfmac: fix stopping AP.
brcmfmac: fix returning cipher_suite for get_key operation.
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 46 +++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/4 brcmfmac: fix tkip mic tx/rx ap swap bug.
From: Hante Meuleman <[email protected]>
tx and rx michael tkip keys are always swapped in case being configured per mac. This is wrong for AP. The swap should only be done for STA mode.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +6 -3
@@ -1891,8 +1891,10 @@ static s32 brcmf_add_keyext(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx, const u8 *mac_addr, struct key_params *params) { + struct brcmf_if *ifp = netdev_priv(ndev);struct brcmf_wsec_key key;s32 err =0 ; +u8 keybuf[8 ];memset (&key,0 ,sizeof (key)); key.index = (u32 ) key_idx;
@@ -1916,8 +1918,9 @@ brcmf_add_keyext(struct wiphy *wiphy, struct net_device *ndev,brcmf_dbg (CONN ,"Setting the key index %d\n" , key.index);memcpy (key.data, params->key, key.len); -if (params->cipher ==WLAN_CIPHER_SUITE_TKIP ) { -u8 keybuf[8 ]; +if ((ifp->vif->mode !=WL_MODE_AP ) && + (params->cipher ==WLAN_CIPHER_SUITE_TKIP )) { +brcmf_dbg (CONN ,"Swapping RX/TX MIC key\n" );memcpy (keybuf, &key.data[24 ],sizeof (keybuf));memcpy (&key.data[24 ], &key.data[16 ],sizeof (keybuf));memcpy (&key.data[16 ], keybuf,sizeof (keybuf));
@@ -2013,7 +2016,7 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,break ;case WLAN_CIPHER_SUITE_TKIP :if (ifp->vif->mode !=WL_MODE_AP ) { -brcmf_dbg (CONN ,"Swapping key\n" ); +brcmf_dbg (CONN ,"Swapping RX/TX MIC key\n" );memcpy (keybuf, &key.data[24 ],sizeof (keybuf));memcpy (&key.data[24 ], &key.data[16 ],sizeof (keybuf));memcpy (&key.data[16 ], keybuf,sizeof (keybuf));
Signature · 1 line
1.7.10.4
PATCH 2/4 brcmfmac: fix stopping AP.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
on stop_ap the dongle was not properly shutdown. As a result it was not possible to restart AP or STA after AP operation without restarting the device. This patch will fix that.
--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +15 -10
@@ -3827,8 +3827,9 @@ exit:static int brcmf_cfg80211_stop_ap (struct wiphy *wiphy,struct net_device *ndev) {struct brcmf_if *ifp =netdev_priv (ndev); -s32 err = -EPERM ; +s32 err;struct brcmf_fil_bss_enable_le bss_enable; +struct brcmf_join_params join_params;brcmf_dbg (TRACE ,"Enter\n" );
@@ -3836,16 +3837,21 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)/* Due to most likely deauths outstanding we sleep */ /* first to make sure they get processed by fw. */ msleep (400 ); - err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_AP ,0 ); -if (err <0 ) { -brcmf_err ("setting AP mode failed %d\n" , err); - goto exit; - } + +memset (&join_params,0 ,sizeof (join_params)); + err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SET_SSID , + &join_params,sizeof (join_params)); +if (err <0 ) +brcmf_err ("SET SSID error (%d)\n" , err); err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_UP ,0 ); -if (err <0 ) { +if (err <0 )brcmf_err ("BRCMF_C_UP error %d\n" , err); - goto exit; - } + err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_AP ,0 ); +if (err <0 ) +brcmf_err ("setting AP mode failed %d\n" , err); + err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_INFRA ,0 ); +if (err <0 ) +brcmf_err ("setting INFRA mode failed %d\n" , err); }else { bss_enable.bsscfg_idx =cpu_to_le32 (ifp->bssidx); bss_enable.enable =cpu_to_le32 (0 );
@@ -3858,7 +3864,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)set_bit (BRCMF_VIF_STATUS_AP_CREATING , &ifp->vif->sme_state);clear_bit (BRCMF_VIF_STATUS_AP_CREATED , &ifp->vif->sme_state); -exit:return err; }
Signature · 1 line
1.7.10.4
PATCH 3/4 brcmfmac: fix returning cipher_suite for get_key operation.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
When multiple cipher suites have been programmed then the lowest suite is to be retured. This fixes issue when AP mode is using CCMP and TKIP WPA combination where rekeying will fail.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +4 -8
@@ -2121,8 +2121,7 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, err = -EAGAIN ; goto done; } -switch (wsec & ~SES_OW_ENABLED ) { -case WEP_ENABLED : +if (wsec &WEP_ENABLED ) { sec = &profile->sec;if (sec->cipher_pairwise &WLAN_CIPHER_SUITE_WEP40 ) { params.cipher =WLAN_CIPHER_SUITE_WEP40 ;
@@ -2131,16 +2130,13 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, params.cipher =WLAN_CIPHER_SUITE_WEP104 ;brcmf_dbg (CONN ,"WLAN_CIPHER_SUITE_WEP104\n" ); } -break ; -case TKIP_ENABLED : + }else if (wsec &TKIP_ENABLED ) { params.cipher =WLAN_CIPHER_SUITE_TKIP ;brcmf_dbg (CONN ,"WLAN_CIPHER_SUITE_TKIP\n" ); -break ; -case AES_ENABLED : + }else if (wsec &AES_ENABLED ) { params.cipher =WLAN_CIPHER_SUITE_AES_CMAC ;brcmf_dbg (CONN ,"WLAN_CIPHER_SUITE_AES_CMAC\n" ); -break ; -default : + }else {brcmf_err ("Invalid algo (0x%x)\n" , wsec); err = -EINVAL ; goto done;
Signature · 1 line
1.7.10.4
PATCH 4/4 brcmfmac: do not proceed if fail to download nvram to dongle
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Nvram contains critical initialization parameter for firmware to run. Host driver should not proceed if nvram fails to be downloaded to dongle.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +3 -3
@@ -3317,15 +3317,15 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) goto err; } -/* External image takes precedence if specified */ if (brcmf_sdbrcm_download_code_file (bus)) {brcmf_err ("dongle image file download failed\n" ); goto err; } -/* External nvram takes precedence if specified */ -if (brcmf_sdbrcm_download_nvram (bus)) +if (brcmf_sdbrcm_download_nvram (bus)) {brcmf_err ("dongle nvram file download failed\n" ); + goto err; + }/* Take arm out of reset */ if (brcmf_sdbrcm_download_state (bus, false)) {
Signature · 1 line
1.7.10.4