brcmfmac: IBSS fix and cleanup
v2 cover brcmfmac: IBSS fix and cleanup
This series provides following:
* fix IBSS which got broken over time.
* new USB id for bcm43242 dongle.
* arp offload configuration through inet notifier.
The series is intended for 4.5 kernel and applies to master branch of the wireless-drivers-next repository.
Arend van Spriel (2):
brcmfmac: no interface combination check for single interface
brcmfmac: add 43242 device id for LG dongle
Franky Lin (1):
brcmfmac: add arp offload ip address table configuration support
Hante Meuleman (9):
brcmfmac: Simplify scan timing configuration.
brcmfmac: Use local storage for ssid iovar.
brcmfmac: Remove some redundant cfg80211 data.
brcmfmac: Cleanup pmksa cache handling code.
brcmfmac: Make TDLS a detectable feature.
brcmfmac: Add support for PCIE 4350 revision 5 device.
brcmfmac: Fix IBSS setup.
brcmfmac: Change error print in debug print.
brcmfmac: Move scheduled scan related interface layer structs.
Kosuke Tatsukawa (1):
brcmfmac: fix waitqueue_active without memory barrier in brcmfmac
driver
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 233 ++++++++++----------- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 111 +--------- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 108 ++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- .../broadcom/brcm80211/brcmfmac/fwil_types.h | 105 ++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 3 +- .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 +- .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + .../broadcom/brcm80211/include/brcmu_wifi.h | 23 -- 13 files changed, 342 insertions(+), 268 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/13 brcmfmac: Simplify scan timing configuration
From: Hante Meuleman <[email protected]>
No need to pass timing configuration in local functions as they are static anyway.
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 31 +++++++++------------- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 4 --- 2 files changed, 12 insertions(+), 23 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +12 -19
@@ -91,6 +91,10 @@#define BRCMF_SCAN_JOIN_PASSIVE_DWELL_TIME_MS 400#define BRCMF_SCAN_JOIN_PROBE_INTERVAL_MS 20 +#define BRCMF_SCAN_CHANNEL_TIME 40 +#define BRCMF_SCAN_UNASSOC_TIME 40 +#define BRCMF_SCAN_PASSIVE_TIME 120 +#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
@@ -5357,37 +5361,27 @@ roam_setup_done: }static s32 -brcmf_dongle_scantime (struct brcmf_if *ifp,s32 scan_assoc_time, -s32 scan_unassoc_time,s32 scan_passive_time) +brcmf_dongle_scantime (struct brcmf_if *ifp) {s32 err =0 ; err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_SCAN_CHANNEL_TIME , - scan_assoc_time); +BRCMF_SCAN_CHANNEL_TIME );if (err) { -if (err == -EOPNOTSUPP ) -brcmf_dbg (INFO ,"Scan assoc time is not supported\n" ); -else -brcmf_err ("Scan assoc time error (%d)\n" , err); +brcmf_err ("Scan assoc time error (%d)\n" , err); goto dongle_scantime_out; } err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_SCAN_UNASSOC_TIME , - scan_unassoc_time); +BRCMF_SCAN_UNASSOC_TIME );if (err) { -if (err == -EOPNOTSUPP ) -brcmf_dbg (INFO ,"Scan unassoc time is not supported\n" ); -else -brcmf_err ("Scan unassoc time error (%d)\n" , err); +brcmf_err ("Scan unassoc time error (%d)\n" , err); goto dongle_scantime_out; } err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_SCAN_PASSIVE_TIME , - scan_passive_time); +BRCMF_SCAN_PASSIVE_TIME );if (err) { -if (err == -EOPNOTSUPP ) -brcmf_dbg (INFO ,"Scan passive time is not supported\n" ); -else -brcmf_err ("Scan passive time error (%d)\n" , err); +brcmf_err ("Scan passive time error (%d)\n" , err); goto dongle_scantime_out; }
@@ -6089,8 +6083,7 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)/* make sure RF is ready for work */ brcmf_fil_cmd_int_set (ifp,BRCMF_C_UP ,0 ); -brcmf_dongle_scantime (ifp,WL_SCAN_CHANNEL_TIME , -WL_SCAN_UNASSOC_TIME ,WL_SCAN_PASSIVE_TIME ); +brcmf_dongle_scantime (ifp); power_mode = cfg->pwr_save ?PM_FAST :PM_OFF ; err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_PM , power_mode);
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +0 -4
@@ -29,10 +29,6 @@#define WL_ROAM_TRIGGER_LEVEL -75#define WL_ROAM_DELTA 20 -#define WL_SCAN_CHANNEL_TIME 40 -#define WL_SCAN_UNASSOC_TIME 40 -#define WL_SCAN_PASSIVE_TIME 120 -#define WL_ESCAN_BUF_SIZE (1024 * 64)#define WL_ESCAN_TIMER_INTERVAL_MS 10000/* E-Scan timeout */
Signature · 1 line
1.9.1
Re: [V2,01/13] brcmfmac: Simplify scan timing configuration
Quoted 10 lines
From: Hante Meuleman <[email protected]>
No need to pass timing configuration in local functions as they are static anyway.
Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Signed-off-by Arend van Spriel <[email protected]>
Thanks, 12 patches applied to wireless-drivers-next.git:
1678ba8ed350 brcmfmac: Simplify scan timing configuration675f5d82a73f brcmfmac: Use local storage for ssid iovar4235edcdfc30 brcmfmac: Remove some redundant cfg80211 data6c404f34f2bd brcmfmac: Cleanup pmksa cache handling codea7b82d474171 brcmfmac: Make TDLS a detectable featurefdf345642297 brcmfmac: Add support for PCIE 4350 revision 5 device 353c46ac9e53 brcmfmac: no interface combination check for single interface b0a790883ed4 brcmfmac: Fix IBSS setupa7decc44a002 brcmfmac: fix waitqueue_active without memory barrier in brcmfmac driver 540313d8f954 brcmfmac: add 43242 device id for LG donglef3fb75038dd1 brcmfmac: Change error print in debug printa41286aee42f brcmfmac: Move scheduled scan related interface layer structs
Kalle Valo
PATCH v2 2/13 brcmfmac: Use local storage for ssid iovar
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 18 +++++++++--------- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.h | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +9 -9
@@ -1031,11 +1031,11 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif,struct brcmf_if *ifp = vif->ifp;struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct cfg80211_ssid *ssids; -struct brcmf_cfg80211_scan_req *sr = &cfg->scan_req_int;u32 passive_scan;bool escan_req;bool spec_scan;s32 err; +struct brcmf_ssid_le ssid_le;u32 SSID_len;brcmf_dbg (SCAN ,"START ESCAN\n" );
@@ -1088,13 +1088,13 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, }else {brcmf_dbg (SCAN ,"ssid \"%s\", ssid_len (%d)\n" , ssids->ssid, ssids->ssid_len); -memset (&sr->ssid_le,0 ,sizeof (sr->ssid_le)); - SSID_len =min_t (u8,sizeof (sr->ssid_le.SSID), ssids->ssid_len); - sr->ssid_le.SSID_len =cpu_to_le32 (0 ); +memset (&ssid_le,0 ,sizeof (ssid_le)); + SSID_len =min_t (u8,sizeof (ssid_le.SSID), ssids->ssid_len); + ssid_le.SSID_len =cpu_to_le32 (0 ); spec_scan = false;if (SSID_len) { -memcpy (sr->ssid_le.SSID, ssids->ssid, SSID_len); - sr->ssid_le.SSID_len =cpu_to_le32 (SSID_len); +memcpy (ssid_le.SSID, ssids->ssid, SSID_len); + ssid_le.SSID_len =cpu_to_le32 (SSID_len); spec_scan = true; }else brcmf_dbg (SCAN ,"Broadcast scan\n" );
@@ -1107,12 +1107,12 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, goto scan_out; }brcmf_scan_config_mpc (ifp,0 ); - err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SCAN , - &sr->ssid_le,sizeof (sr->ssid_le)); + err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SCAN , &ssid_le, +sizeof (ssid_le));if (err) {if (err == -EBUSY )brcmf_dbg (INFO ,"BUSY: scan for \"%s\" canceled\n" , - sr->ssid_le.SSID); + ssid_le.SSID);else brcmf_err ("WLC_SCAN error (%d)\n" , err);
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +0 -7
@@ -99,11 +99,6 @@ struct brcmf_cfg80211_conf {struct ieee80211_channel channel; }; -/* basic structure of scan request */ -struct brcmf_cfg80211_scan_req { -struct brcmf_ssid_le ssid_le; -}; -/* basic structure of information element */ struct brcmf_cfg80211_ie {u16 offset;
@@ -337,7 +332,6 @@ struct brcmf_cfg80211_vif_event {* @scan_request: cfg80211 scan request object. * @usr_sync: mainly for dongle up/down synchronization. * @bss_list: bss_list holding scanned ap information. -* @scan_req_int: internal scan request object. * @bss_info: bss information for cfg80211 layer. * @ie: information element object for internal purpose. * @conn_info: association info.
@@ -372,7 +366,6 @@ struct brcmf_cfg80211_info {struct brcmf_btcoex_info *btcoex;struct cfg80211_scan_request *scan_request;struct mutex usr_sync; -struct brcmf_cfg80211_scan_req scan_req_int;struct wl_cfg80211_bss_info *bss_info;struct brcmf_cfg80211_ie ie;struct brcmf_cfg80211_connect_info conn_info;
Signature · 1 line
1.9.1
PATCH v2 3/13 brcmfmac: Remove some redundant cfg80211 data
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h | 10 ---------- 2 files changed, 11 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +0 -1
@@ -5203,7 +5203,6 @@ static void brcmf_init_conf(struct brcmf_cfg80211_conf *conf) conf->rts_threshold = (u32)-1 ; conf->retry_short = (u32)-1 ; conf->retry_long = (u32)-1 ; - conf->tx_power =-1 ; }static void brcmf_register_event_handlers (struct brcmf_cfg80211_info *cfg)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +0 -10
@@ -95,14 +95,6 @@ struct brcmf_cfg80211_conf {u32 rts_threshold;u32 retry_short;u32 retry_long; -s32 tx_power; -struct ieee80211_channel channel; -}; - -/* basic structure of information element */ -struct brcmf_cfg80211_ie { -u16 offset; -u8 buf[WL_TLV_INFO_MAX ]; };/* security information with currently associated ap */
@@ -333,7 +325,6 @@ struct brcmf_cfg80211_vif_event {* @usr_sync: mainly for dongle up/down synchronization. * @bss_list: bss_list holding scanned ap information. * @bss_info: bss information for cfg80211 layer. -* @ie: information element object for internal purpose. * @conn_info: association info. * @pmk_list: wpa2 pmk list. * @scan_status: scan activity on the dongle.
@@ -367,7 +358,6 @@ struct brcmf_cfg80211_info {struct cfg80211_scan_request *scan_request;struct mutex usr_sync;struct wl_cfg80211_bss_info *bss_info; -struct brcmf_cfg80211_ie ie;struct brcmf_cfg80211_connect_info conn_info;struct brcmf_cfg80211_pmk_list *pmk_list;unsigned long scan_status;
Signature · 1 line
1.9.1
PATCH v2 4/13 brcmfmac: Cleanup pmksa cache handling code
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 131 +++++++++------------ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 9 +- .../broadcom/brcm80211/brcmfmac/fwil_types.h | 24 ++++ .../broadcom/brcm80211/include/brcmu_wifi.h | 23 ---- 4 files changed, 82 insertions(+), 105 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +57 -74
@@ -3223,26 +3223,22 @@ exit: }static __used s32 -brcmf_update_pmklist (struct net_device *ndev, -struct brcmf_cfg80211_pmk_list *pmk_list,s32 err) +brcmf_update_pmklist (struct brcmf_cfg80211_info *cfg,struct brcmf_if *ifp) { -int i, j; -u32 pmkid_len; +struct brcmf_pmk_list_le *pmk_list; +int i; +u32 npmk; +s32 err; - pmkid_len =le32_to_cpu (pmk_list->pmkids.npmkid); + pmk_list = &cfg->pmk_list; + npmk =le32_to_cpu (pmk_list->npmk); -brcmf_dbg (CONN ,"No of elements %d\n" , pmkid_len); -for (i =0 ; i < pmkid_len; i++) { -brcmf_dbg (CONN ,"PMKID[%d]: %pM =\n" , i, - &pmk_list->pmkids.pmkid[i].BSSID); -for (j =0 ; j <WLAN_PMKID_LEN ; j++) -brcmf_dbg (CONN ,"%02x\n" , - pmk_list->pmkids.pmkid[i].PMKID[j]); - } +brcmf_dbg (CONN ,"No of elements %d\n" , npmk); +for (i =0 ; i < npmk; i++) +brcmf_dbg (CONN ,"PMK[%d]: %pM\n" , i, &pmk_list->pmk[i].bssid); -if (!err) -brcmf_fil_iovar_data_set (netdev_priv (ndev),"pmkid_info" , - (char *)pmk_list,sizeof (*pmk_list)); + err =brcmf_fil_iovar_data_set (ifp,"pmkid_info" , pmk_list, +sizeof (*pmk_list));return err; }
@@ -3253,34 +3249,37 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev, {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_if *ifp =netdev_priv (ndev); -struct pmkid_list *pmkids = &cfg->pmk_list->pmkids; -s32 err =0 ; -u32 pmkid_len, i; +struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0 ]; +s32 err; +u32 npmk, i;brcmf_dbg (TRACE ,"Enter\n" );if (!check_vif_up (ifp->vif))return -EIO ; - pmkid_len =le32_to_cpu (pmkids->npmkid); -for (i =0 ; i < pmkid_len; i++) -if (!memcmp (pmksa->bssid, pmkids->pmkid[i].BSSID,ETH_ALEN )) + npmk =le32_to_cpu (cfg->pmk_list.npmk); +for (i =0 ; i < npmk; i++) +if (!memcmp (pmksa->bssid, pmk[i].bssid,ETH_ALEN ))break ; -if (i <WL_NUM_PMKIDS_MAX ) { -memcpy (pmkids->pmkid[i].BSSID, pmksa->bssid,ETH_ALEN ); -memcpy (pmkids->pmkid[i].PMKID, pmksa->pmkid,WLAN_PMKID_LEN ); -if (i == pmkid_len) { - pmkid_len++; - pmkids->npmkid =cpu_to_le32 (pmkid_len); +if (i <BRCMF_MAXPMKID ) { +memcpy (pmk[i].bssid, pmksa->bssid,ETH_ALEN ); +memcpy (pmk[i].pmkid, pmksa->pmkid,WLAN_PMKID_LEN ); +if (i == npmk) { + npmk++; + cfg->pmk_list.npmk =cpu_to_le32 (npmk); } - }else - err = -EINVAL ; + }else { +brcmf_err ("Too many PMKSA entries cached %d\n" , npmk); +return -EINVAL ; + } -brcmf_dbg (CONN ,"set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n" , - pmkids->pmkid[pmkid_len].BSSID); -for (i =0 ; i <WLAN_PMKID_LEN ; i++) -brcmf_dbg (CONN ,"%02x\n" , pmkids->pmkid[pmkid_len].PMKID[i]); +brcmf_dbg (CONN ,"set_pmksa - PMK bssid: %pM =\n" , pmk[npmk].bssid); +for (i =0 ; i <WLAN_PMKID_LEN ; i +=4 ) +brcmf_dbg (CONN ,"%02x %02x %02x %02x\n" , pmk[npmk].pmkid[i], + pmk[npmk].pmkid[i +1 ], pmk[npmk].pmkid[i +2 ], + pmk[npmk].pmkid[i +3 ]); - err =brcmf_update_pmklist (ndev, cfg->pmk_list, err); + err =brcmf_update_pmklist (cfg, ifp);brcmf_dbg (TRACE ,"Exit\n" );return err;
@@ -3288,50 +3287,39 @@ brcmf_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *ndev,static s32 brcmf_cfg80211_del_pmksa (struct wiphy *wiphy,struct net_device *ndev, -struct cfg80211_pmksa *pmksa) +struct cfg80211_pmksa *pmksa) {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_if *ifp =netdev_priv (ndev); -struct pmkid_list pmkid; -s32 err =0 ; -u32 pmkid_len, i; +struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0 ]; +s32 err; +u32 npmk, i;brcmf_dbg (TRACE ,"Enter\n" );if (!check_vif_up (ifp->vif))return -EIO ; -memcpy (&pmkid.pmkid[0 ].BSSID, pmksa->bssid,ETH_ALEN ); -memcpy (&pmkid.pmkid[0 ].PMKID, pmksa->pmkid,WLAN_PMKID_LEN ); +brcmf_dbg (CONN ,"del_pmksa - PMK bssid = %pM\n" , &pmksa->bssid); -brcmf_dbg (CONN ,"del_pmksa,IW_PMKSA_REMOVE - PMKID: %pM =\n" , - &pmkid.pmkid[0 ].BSSID); -for (i =0 ; i <WLAN_PMKID_LEN ; i++) -brcmf_dbg (CONN ,"%02x\n" , pmkid.pmkid[0 ].PMKID[i]); - - pmkid_len =le32_to_cpu (cfg->pmk_list->pmkids.npmkid); -for (i =0 ; i < pmkid_len; i++) -if (!memcmp - (pmksa->bssid, &cfg->pmk_list->pmkids.pmkid[i].BSSID, -ETH_ALEN )) + npmk =le32_to_cpu (cfg->pmk_list.npmk); +for (i =0 ; i < npmk; i++) +if (!memcmp (&pmksa->bssid, &pmk[i].bssid,ETH_ALEN ))break ; -if ((pmkid_len >0 ) - && (i < pmkid_len)) { -memset (&cfg->pmk_list->pmkids.pmkid[i],0 , -sizeof (struct pmkid )); -for (; i < (pmkid_len -1 ); i++) { -memcpy (&cfg->pmk_list->pmkids.pmkid[i].BSSID, - &cfg->pmk_list->pmkids.pmkid[i +1 ].BSSID, -ETH_ALEN ); -memcpy (&cfg->pmk_list->pmkids.pmkid[i].PMKID, - &cfg->pmk_list->pmkids.pmkid[i +1 ].PMKID, +if ((npmk >0 ) && (i < npmk)) { +for (; i < (npmk -1 ); i++) { +memcpy (&pmk[i].bssid, &pmk[i +1 ].bssid,ETH_ALEN ); +memcpy (&pmk[i].pmkid, &pmk[i +1 ].pmkid,WLAN_PMKID_LEN ); } - cfg->pmk_list->pmkids.npmkid =cpu_to_le32 (pmkid_len -1 ); - }else - err = -EINVAL ; +memset (&pmk[i],0 ,sizeof (*pmk)); + cfg->pmk_list.npmk =cpu_to_le32 (npmk -1 ); + }else { +brcmf_err ("Cache entry not found\n" ); +return -EINVAL ; + } - err =brcmf_update_pmklist (ndev, cfg->pmk_list, err); + err =brcmf_update_pmklist (cfg, ifp);brcmf_dbg (TRACE ,"Exit\n" );return err;
@@ -3343,14 +3331,14 @@ brcmf_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *ndev) {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_if *ifp =netdev_priv (ndev); -s32 err =0 ; +s32 err;brcmf_dbg (TRACE ,"Enter\n" );if (!check_vif_up (ifp->vif))return -EIO ; -memset (cfg->pmk_list,0 ,sizeof (*cfg->pmk_list)); - err =brcmf_update_pmklist (ndev, cfg->pmk_list, err); +memset (&cfg->pmk_list,0 ,sizeof (cfg->pmk_list)); + err =brcmf_update_pmklist (cfg, ifp);brcmf_dbg (TRACE ,"Exit\n" );return err;
@@ -5249,8 +5237,6 @@ static void brcmf_deinit_priv_mem(struct brcmf_cfg80211_info *cfg) cfg->escan_ioctl_buf =NULL ;kfree (cfg->extra_buf); cfg->extra_buf =NULL ; -kfree (cfg->pmk_list); - cfg->pmk_list =NULL ; }static s32 brcmf_init_priv_mem (struct brcmf_cfg80211_info *cfg)
@@ -5264,9 +5250,6 @@ static s32 brcmf_init_priv_mem(struct brcmf_cfg80211_info *cfg) cfg->extra_buf =kzalloc (WL_EXTRA_BUF_MAX ,GFP_KERNEL );if (!cfg->extra_buf) goto init_priv_mem_out; - cfg->pmk_list =kzalloc (sizeof (*cfg->pmk_list),GFP_KERNEL ); -if (!cfg->pmk_list) - goto init_priv_mem_out;return 0 ;
@@ -5971,7 +5954,7 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) wiphy->max_scan_ssids =WL_NUM_SCAN_MAX ; wiphy->max_scan_ie_len =BRCMF_SCAN_IE_LEN_MAX ; - wiphy->max_num_pmkids =WL_NUM_PMKIDS_MAX ; + wiphy->max_num_pmkids =BRCMF_MAXPMKID ; err =brcmf_setup_ifmodes (wiphy, ifp);if (err)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +1 -8
@@ -21,7 +21,6 @@#include <brcmu_d11.h> #define WL_NUM_SCAN_MAX 10 -#define WL_NUM_PMKIDS_MAX MAXPMKID#define WL_TLV_INFO_MAX 1024#define WL_BSS_INFO_MAX 2048#define WL_ASSOC_INFO_MAX 512/* assoc related fil max buf */
@@ -196,12 +195,6 @@ struct brcmf_cfg80211_assoc_ielen_le {__le32 resp_len; }; -/* wpa2 pmk list */ -struct brcmf_cfg80211_pmk_list { -struct pmkid_list pmkids; -struct pmkid foo[MAXPMKID -1 ]; -}; -/* dongle escan state */ enum wl_escan_state {WL_ESCAN_STATE_IDLE ,
@@ -359,7 +352,7 @@ struct brcmf_cfg80211_info {struct mutex usr_sync;struct wl_cfg80211_bss_info *bss_info;struct brcmf_cfg80211_connect_info conn_info; -struct brcmf_cfg80211_pmk_list *pmk_list; +struct brcmf_pmk_list_le pmk_list;unsigned long scan_status;struct brcmf_pub *pub;u32 channel;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +24 -0
@@ -126,6 +126,8 @@#define BRCMF_TXBF_SU_BFR_CAP BIT(0)#define BRCMF_TXBF_MU_BFR_CAP BIT(1) +#define BRCMF_MAXPMKID 16/* max # PMKID cache entries */ +/* join preference types for join_pref iovar */ enum brcmf_join_pref_types {BRCMF_JOIN_PREF_RSSI =1 ,
@@ -646,4 +648,26 @@ struct brcmf_wowl_wakeind_le { __le32 ucode_wakeind; }; +/** +* struct brcmf_pmksa - PMK Security Association +* +* @bssid: The AP's BSSID. +* @pmkid: he PMK material itself. +*/ +struct brcmf_pmksa { +u8 bssid[ETH_ALEN ]; +u8 pmkid[WLAN_PMKID_LEN ]; +}; + +/** +* struct brcmf_pmk_list_le - List of pmksa's. +* +* @npmk: Number of pmksa's. +* @pmk: PMK SA information. +*/ +struct brcmf_pmk_list_le { +__le32 npmk; +struct brcmf_pmksa pmk[BRCMF_MAXPMKID ]; +}; +#endif /* FWIL_TYPES_H_ */
drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h +0 -23
@@ -237,9 +237,6 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)#define WPA2_AUTH_RESERVED4 0x0400#define WPA2_AUTH_RESERVED5 0x0800 -/* pmkid */ -#define MAXPMKID 16 -#define DOT11_DEFAULT_RTS_LEN 2347#define DOT11_DEFAULT_FRAG_LEN 2346
@@ -251,24 +248,4 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)#define HT_CAP_RX_STBC_NO 0x0#define HT_CAP_RX_STBC_ONE_STREAM 0x1 -struct pmkid { -u8 BSSID[ETH_ALEN ]; -u8 PMKID[WLAN_PMKID_LEN ]; -}; - -struct pmkid_list { -__le32 npmkid; -struct pmkid pmkid[1 ]; -}; - -struct pmkid_cand { -u8 BSSID[ETH_ALEN ]; -u8 preauth; -}; - -struct pmkid_cand_list { -u32 npmkid_cand; -struct pmkid_cand pmkid_cand[1 ]; -}; -#endif /* _BRCMU_WIFI_H_ */
Signature · 1 line
1.9.1
PATCH v2 5/13 brcmfmac: Make TDLS a detectable feature
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 21 ++++++++++++--------- .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +++- 3 files changed, 16 insertions(+), 10 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +12 -9
@@ -5983,8 +5983,9 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) wiphy->n_cipher_suites =ARRAY_SIZE (__wl_cipher_suites); wiphy->flags |=WIPHY_FLAG_PS_ON_BY_DEFAULT |WIPHY_FLAG_OFFCHAN_TX | -WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | -WIPHY_FLAG_SUPPORTS_TDLS ; +WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL ; +if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_TDLS )) + wiphy->flags |=WIPHY_FLAG_SUPPORTS_TDLS ;if (!brcmf_roamoff) wiphy->flags |=WIPHY_FLAG_SUPPORTS_FW_ROAM ; wiphy->mgmt_stypes = brcmf_txrx_stypes;
@@ -6376,13 +6377,15 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, goto wiphy_unreg_out; } - err =brcmf_fil_iovar_int_set (ifp,"tdls_enable" ,1 ); -if (err) { -brcmf_dbg (INFO ,"TDLS not enabled (%d)\n" , err); - wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_TDLS ; - }else { -brcmf_fweh_register (cfg->pub,BRCMF_E_TDLS_PEER_EVENT , - brcmf_notify_tdls_peer_event); +if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_TDLS )) { + err =brcmf_fil_iovar_int_set (ifp,"tdls_enable" ,1 ); +if (err) { +brcmf_dbg (INFO ,"TDLS not enabled (%d)\n" , err); + wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_TDLS ; + }else { +brcmf_fweh_register (cfg->pub,BRCMF_E_TDLS_PEER_EVENT , + brcmf_notify_tdls_peer_event); + } }/* (re-) activate FWEH event handling */
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +1 -0
@@ -138,6 +138,7 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)brcmf_feat_iovar_int_set (ifp,BRCMF_FEAT_MBSS ,"mbss" ,0 );brcmf_feat_iovar_int_get (ifp,BRCMF_FEAT_P2P ,"p2p" );brcmf_feat_iovar_int_get (ifp,BRCMF_FEAT_RSDB ,"rsdb_mode" ); +brcmf_feat_iovar_int_get (ifp,BRCMF_FEAT_TDLS ,"tdls_enable" );if (brcmf_feature_disable) { brcmf_dbg(INFO, "Features: 0x%02x, disable: 0x%02x\n",
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +3 -1
@@ -25,6 +25,7 @@* WOWL: Wake-On-WLAN. * P2P: peer-to-peer * RSDB: Real Simultaneous Dual Band +* TDLS: Tunneled Direct Link Setup */ #define BRCMF_FEAT_LIST \ BRCMF_FEAT_DEF(MBSS) \
@@ -32,7 +33,8 @@ BRCMF_FEAT_DEF(PNO) \ BRCMF_FEAT_DEF(WOWL) \ BRCMF_FEAT_DEF(P2P) \ - BRCMF_FEAT_DEF(RSDB) + BRCMF_FEAT_DEF(RSDB) \ + BRCMF_FEAT_DEF(TDLS)/* * Quirks:
Signature · 1 line
1.9.1
PATCH v2 6/13 brcmfmac: Add support for PCIE 4350 revision 5 device
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5513
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +3 -1
@@ -46,6 +46,7 @@ enum brcmf_pcie_state {BRCMF_FW_NVRAM_DEF (43602 ,"brcmfmac43602-pcie.bin" ,"brcmfmac43602-pcie.txt" );BRCMF_FW_NVRAM_DEF (4350 ,"brcmfmac4350-pcie.bin" ,"brcmfmac4350-pcie.txt" ); +BRCMF_FW_NVRAM_DEF(4350C, "brcmfmac4350c2-pcie.bin", "brcmfmac4350c2-pcie.txt");BRCMF_FW_NVRAM_DEF (4356 ,"brcmfmac4356-pcie.bin" ,"brcmfmac4356-pcie.txt" );BRCMF_FW_NVRAM_DEF (43570 ,"brcmfmac43570-pcie.bin" ,"brcmfmac43570-pcie.txt" );BRCMF_FW_NVRAM_DEF (4358 ,"brcmfmac4358-pcie.bin" ,"brcmfmac4358-pcie.txt" );
@@ -56,7 +57,8 @@ BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {BRCMF_FW_NVRAM_ENTRY (BRCM_CC_43602_CHIP_ID ,0xFFFFFFFF ,43602 ), -BRCMF_FW_NVRAM_ENTRY (BRCM_CC_4350_CHIP_ID ,0xFFFFFFFF ,4350 ), + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C), +BRCMF_FW_NVRAM_ENTRY (BRCM_CC_4350_CHIP_ID ,0xFFFFFF00 ,4350 ),BRCMF_FW_NVRAM_ENTRY (BRCM_CC_4356_CHIP_ID ,0xFFFFFFFF ,4356 ),BRCMF_FW_NVRAM_ENTRY (BRCM_CC_43567_CHIP_ID ,0xFFFFFFFF ,43570 ),BRCMF_FW_NVRAM_ENTRY (BRCM_CC_43569_CHIP_ID ,0xFFFFFFFF ,43570 ),
Signature · 1 line
1.9.1
Re: [PATCH V2 06/13] brcmfmac: Add support for PCIE 4350 revision 5 device
Quoted 8 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Change-Id I72b519ec6a7ff0d36f076df06d042f0c5894142cReviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5513
Signed-off-by Arend van Spriel <[email protected]>
You forgot this one. But I'll fix it before I apply it, unless I forget it :)
Signature · 1 line
Kalle Valo
PATCH v2 7/13 brcmfmac: no interface combination check for single interface
In reply to Arend van SprielThe interface combinations are intended for use-case in which the driver handles multiple interface concurrently. This means that the combinations do not need to be checked when there is only a single interface active.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +11 -3
@@ -396,15 +396,23 @@ static int brcmf_vif_change_validate(struct brcmf_cfg80211_info *cfg, {int iftype_num[NUM_NL80211_IFTYPES ];struct brcmf_cfg80211_vif *pos; +bool check_combos = false; +int ret =0 ;memset (&iftype_num[0 ],0 ,sizeof (iftype_num));list_for_each_entry (pos, &cfg->vif_list, list) -if (pos == vif) +if (pos == vif) { iftype_num[new_type]++; -else + }else { +/* concurrent interfaces so need check combinations */ + check_combos = true; iftype_num[pos->wdev.iftype]++; + } -return cfg80211_check_combinations (cfg->wiphy,1 ,0 , iftype_num); +if (check_combos) + ret =cfg80211_check_combinations (cfg->wiphy,1 ,0 , iftype_num); + +return ret; } static int brcmf_vif_add_validate(struct brcmf_cfg80211_info *cfg,
Signature · 1 line
1.9.1
PATCH v2 8/13 brcmfmac: Fix IBSS setup
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
IBSS got broken over time. Disconnect events should not be given for IBSS mode and connect events for IBSS need to have channel information.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +9 -8
@@ -1273,17 +1273,17 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)brcmf_dbg (TRACE ,"Enter\n" ); -if (test_bit (BRCMF_VIF_STATUS_CONNECTED , &vif->sme_state)) { +if (test_and_clear_bit (BRCMF_VIF_STATUS_CONNECTED , &vif->sme_state)) {brcmf_dbg (INFO ,"Call WLC_DISASSOC to stop excess roaming\n " ); err =brcmf_fil_cmd_data_set (vif->ifp,BRCMF_C_DISASSOC ,NULL ,0 );if (err) {brcmf_err ("WLC_DISASSOC failed (%d)\n" , err); } -clear_bit (BRCMF_VIF_STATUS_CONNECTED , &vif->sme_state); -cfg80211_disconnected (vif->wdev.netdev, reason,NULL ,0 , - true,GFP_KERNEL ); - +if ((vif->wdev.iftype ==NL80211_IFTYPE_STATION ) || + (vif->wdev.iftype ==NL80211_IFTYPE_P2P_CLIENT )) +cfg80211_disconnected (vif->wdev.netdev, reason,NULL ,0 , + true,GFP_KERNEL ); }clear_bit (BRCMF_VIF_STATUS_CONNECTING , &vif->sme_state);clear_bit (BRCMF_SCAN_STATUS_SUPPRESS , &cfg->scan_status);
@@ -2697,8 +2697,8 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)return err; } -static s32 wl_inform_ibss (struct brcmf_cfg80211_info *cfg, -struct net_device *ndev,const u8 *bssid) +static s32 brcmf_inform_ibss (struct brcmf_cfg80211_info *cfg, +struct net_device *ndev,const u8 *bssid) {struct wiphy *wiphy =cfg_to_wiphy (cfg);struct ieee80211_channel *notify_channel;
@@ -2743,6 +2743,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg, band = wiphy->bands[IEEE80211_BAND_5GHZ ]; freq =ieee80211_channel_to_frequency (ch.chnum, band->band); + cfg->channel = freq; notify_channel =ieee80211_get_channel (wiphy, freq); notify_capability =le16_to_cpu (bi->capability);
@@ -5071,9 +5072,9 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, }else if (brcmf_is_linkup (e)) {brcmf_dbg (CONN ,"Linkup\n" );if (brcmf_is_ibssmode (ifp->vif)) { +brcmf_inform_ibss (cfg, ndev, e->addr); chan =ieee80211_get_channel (cfg->wiphy, cfg->channel);memcpy (profile->bssid, e->addr,ETH_ALEN ); -wl_inform_ibss (cfg, ndev, e->addr);cfg80211_ibss_joined (ndev, e->addr, chan,GFP_KERNEL );clear_bit (BRCMF_VIF_STATUS_CONNECTING , &ifp->vif->sme_state);
Signature · 1 line
1.9.1
PATCH v2 9/13 brcmfmac: fix waitqueue_active without memory barrier in brcmfmac driver
In reply to Arend van SprielFrom: Kosuke Tatsukawa <[email protected]>
brcmf_msgbuf_ioctl_resp_wake() seems to be missing a memory barrier which might cause the waker to not notice the waiter and miss sending a wake_up as in the following figure.
brcmf_msgbuf_ioctl_resp_wake brcmf_msgbuf_ioctl_resp_wait
------------------------------------------------------------------------
if (waitqueue_active(&msgbuf->ioctl_resp_wait))
/* The CPU might reorder the test for
the waitqueue up here, before
prior writes complete */
/* wait_event_timeout */
/* __wait_event_timeout */ /* ___wait_event */ prepare_to_wait_event(&wq, &__wait, state); if (msgbuf->ctl_completed) ...
msgbuf->ctl_completed = true;
schedule_timeout(__ret))
------------------------------------------------------------------------
There are three other place in drivers/net/wireless/brcm80211/brcmfmac/ which have similar code. The attached patch removes the call to waitqueue_active() leaving just wake_up() behind. This fixes the problem because the call to spin_lock_irqsave() in wake_up() will be an ACQUIRE operation.
I found this issue when I was looking through the linux source code for places calling waitqueue_active() before wake_up*(), but without preceding memory barriers, after sending a patch to fix a similar issue in drivers/tty/n_tty.c (Details about the original issue can be found here: https://lkml.org/lkml/2015/9/28/849).
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 3 +-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 ++---- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +1 -2
@@ -473,8 +473,7 @@ static int brcmf_msgbuf_ioctl_resp_wait(struct brcmf_msgbuf *msgbuf)static void brcmf_msgbuf_ioctl_resp_wake (struct brcmf_msgbuf *msgbuf) { msgbuf->ctl_completed = true; -if (waitqueue_active (&msgbuf->ioctl_resp_wait)) -wake_up (&msgbuf->ioctl_resp_wait); +wake_up (&msgbuf->ioctl_resp_wait); }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -4
@@ -1678,8 +1678,7 @@ static int brcmf_sdio_dcmd_resp_wait(struct brcmf_sdio *bus, uint *condition,static int brcmf_sdio_dcmd_resp_wake (struct brcmf_sdio *bus) { -if (waitqueue_active (&bus->dcmd_resp_wait)) -wake_up_interruptible (&bus->dcmd_resp_wait); +wake_up_interruptible (&bus->dcmd_resp_wait);return 0 ; }
@@ -2003,8 +2002,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)static void brcmf_sdio_wait_event_wakeup (struct brcmf_sdio *bus) { -if (waitqueue_active (&bus->ctrl_wait)) -wake_up_interruptible (&bus->ctrl_wait); +wake_up_interruptible (&bus->ctrl_wait);return ; }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +1 -2
@@ -196,8 +196,7 @@ static int brcmf_usb_ioctl_resp_wait(struct brcmf_usbdev_info *devinfo)static void brcmf_usb_ioctl_resp_wake (struct brcmf_usbdev_info *devinfo) { -if (waitqueue_active (&devinfo->ioctl_resp_wait)) -wake_up (&devinfo->ioctl_resp_wait); +wake_up (&devinfo->ioctl_resp_wait); } static void
Signature · 1 line
1.9.1
PATCH v2 10/13 brcmfmac: add 43242 device id for LG dongle
In reply to Arend van SprielGot a hint on IRC that a 43242 dongle for LG smart TV's works with brcmfmac:
Quoted 8 lines
Hello - I recently got a LG AN-WF500 wireless dongle for LG's SmartTVs. From the information I gathered it uses a Broadcom chipset BCM43242. The device should have been supported by brcmfmac kernel driver if it used USB IDs 0a5c:bd1f.
My device however identifies itself as "ID 043e:3101 LG Electronics USA, Inc.". I then tried adding the USB ID to the driver with
"echo "043e 3101" >/sys/bus/usb/drivers/brcmfmac/new_id" and it just works. The kernel provides the following information.
Quoted 6 lines
[15958.851291] usb 3-1.1.3: new high-speed USB device number 53 using ehci-pci [15958.946723] usb 3-1.1.3: New USB device found, idVendor=043e, idProduct=3101 [15958.946728] usb 3-1.1.3: New USB device strings: Mfr=1, Product=4, SerialNumber=3 [15958.946731] usb 3-1.1.3: Product: Composite Wireless Adapter [15958.946733] usb 3-1.1.3: Manufacturer: Broadcom [15958.946735] usb 3-1.1.3: SerialNumber: 28458
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 1 + drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +1 -0
@@ -1452,6 +1452,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {BRCMF_USB_DEVICE (BRCM_USB_43236_DEVICE_ID ),BRCMF_USB_DEVICE (BRCM_USB_43242_DEVICE_ID ),BRCMF_USB_DEVICE (BRCM_USB_43569_DEVICE_ID ), + { USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) },/* special entry for device with firmware loaded and running */ BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID), { /* end: all zeroes */ }
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +2 -0
@@ -21,6 +21,7 @@#include <linux/mmc/sdio_ids.h> #define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c +#define BRCM_USB_VENDOR_ID_LG 0x043e#define BRCM_PCIE_VENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM/* Chipcommon Core Chip IDs */
@@ -57,6 +58,7 @@#define BRCM_USB_43143_DEVICE_ID 0xbd1e#define BRCM_USB_43236_DEVICE_ID 0xbd17#define BRCM_USB_43242_DEVICE_ID 0xbd1f +#define BRCM_USB_43242_LG_DEVICE_ID 0x3101#define BRCM_USB_43569_DEVICE_ID 0xbd27#define BRCM_USB_BCMFW_DEVICE_ID 0x0bdc
Signature · 1 line
1.9.1
PATCH v2 11/13 brcmfmac: Change error print in debug print
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
The pcie suspend and resume routines contain some error prints, which should have been debug prints.
Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5581
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -2
@@ -1875,7 +1875,7 @@ static int brcmf_pcie_pm_enter_D3(struct device *dev)struct brcmf_pciedev_info *devinfo;struct brcmf_bus *bus; -brcmf_err ("Enter\n" ); +brcmf_dbg (PCIE ,"Enter\n" ); bus =dev_get_drvdata (dev); devinfo = bus->bus_priv.pcie->devinfo;
@@ -1906,7 +1906,7 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev)struct pci_dev *pdev;int err; -brcmf_err ("Enter\n" ); +brcmf_dbg (PCIE ,"Enter\n" ); bus =dev_get_drvdata (dev); devinfo = bus->bus_priv.pcie->devinfo;
Signature · 1 line
1.9.1
Re: [PATCH V2 11/13] brcmfmac: Change error print in debug print
Quoted 5 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
The pcie suspend and resume routines contain some error prints, which should have been debug prints.
Quoted 7 lines
Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Change-Id Ibafe5d38301ee8f5e86889259ddeaea4dcae4ceeReviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5581
Reviewed-by brcm80211 ci <[email protected]>Signed-off-by Arend van Spriel <[email protected]>
I'll fix this one also.
Signature · 1 line
Kalle Valo
Re: [PATCH V2 11/13] brcmfmac: Change error print in debug print
Quoted 15 lines · Kalle Valo
Quoted 5 lines · Arend van Spriel
From: Hante Meuleman <[email protected]>
The pcie suspend and resume routines contain some error prints, which should have been debug prints.
Quoted 7 lines
Reviewed-by Arend Van Spriel <[email protected]>Reviewed-by Pieter-Paul Giesberts <[email protected]>Signed-off-by Hante Meuleman <[email protected]>Change-Id Ibafe5d38301ee8f5e86889259ddeaea4dcae4ceeReviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5581
Reviewed-by brcm80211 ci <[email protected]>Signed-off-by Arend van Spriel <[email protected]>
Quoted 1 line
I'll fix this one also.
Thanks, Kalle
I could blame gedit, but that is a bit lame. Sorry for the inconvenience.
Regards,
Arend
PATCH v2 12/13 brcmfmac: Move scheduled scan related interface layer structs
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
All interface layer related to scheduled scan are moved in fwil_types.h
--- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 81 ---------------------- .../broadcom/brcm80211/brcmfmac/fwil_types.h | 81 ++++++++++++++++++++++ 2 files changed, 81 insertions(+), 81 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +0 -81
@@ -211,87 +211,6 @@ struct escan_info { };/** -* struct brcmf_pno_param_le - PNO scan configuration parameters -* -* @version: PNO parameters version. -* @scan_freq: scan frequency. -* @lost_network_timeout: #sec. to declare discovered network as lost. -* @flags: Bit field to control features of PFN such as sort criteria auto -* enable switch and background scan. -* @rssi_margin: Margin to avoid jitter for choosing a PFN based on RSSI sort -* criteria. -* @bestn: number of best networks in each scan. -* @mscan: number of scans recorded. -* @repeat: minimum number of scan intervals before scan frequency changes -* in adaptive scan. -* @exp: exponent of 2 for maximum scan interval. -* @slow_freq: slow scan period. -*/ -struct brcmf_pno_param_le { -__le32 version; -__le32 scan_freq; -__le32 lost_network_timeout; -__le16 flags; -__le16 rssi_margin; -u8 bestn; -u8 mscan; -u8 repeat; -u8 exp; -__le32 slow_freq; -}; - -/** -* struct brcmf_pno_net_param_le - scan parameters per preferred network. -* -* @ssid: ssid name and its length. -* @flags: bit2: hidden. -* @infra: BSS vs IBSS. -* @auth: Open vs Closed. -* @wpa_auth: WPA type. -* @wsec: wsec value. -*/ -struct brcmf_pno_net_param_le { -struct brcmf_ssid_le ssid; -__le32 flags; -__le32 infra; -__le32 auth; -__le32 wpa_auth; -__le32 wsec; -}; - -/** -* struct brcmf_pno_net_info_le - information per found network. -* -* @bssid: BSS network identifier. -* @channel: channel number only. -* @SSID_len: length of ssid. -* @SSID: ssid characters. -* @RSSI: receive signal strength (in dBm). -* @timestamp: age in seconds. -*/ -struct brcmf_pno_net_info_le { -u8 bssid[ETH_ALEN ]; -u8 channel; -u8 SSID_len; -u8 SSID[32 ]; -__le16 RSSI; -__le16 timestamp; -}; - -/** -* struct brcmf_pno_scanresults_le - result returned in PNO NET FOUND event. -* -* @version: PNO version identifier. -* @status: indicates completion status of PNO scan. -* @count: amount of brcmf_pno_net_info_le entries appended. -*/ -struct brcmf_pno_scanresults_le { -__le32 version; -__le32 status; -__le32 count; -}; - -/** * struct brcmf_cfg80211_vif_event - virtual interface event information. * * @vif_wq: waitqueue awaiting interface event from firmware.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +81 -0
85 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 13/13 brcmfmac: add arp offload ip address table configuration support
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
Obtain ipv4 address through inetaddr notification for ARP offload host ip table configuration.
--- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 108 +++++++++++++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + 2 files changed, 110 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +108 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/etherdevice.h> #include <linux/module.h> +#include <linux/inetdevice.h> #include <net/cfg80211.h> #include <net/rtnetlink.h> #include <brcmu_utils.h>
@@ -620,6 +621,8 @@ static int brcmf_netdev_stop(struct net_device *ndev)brcmf_cfg80211_down (ndev); +brcmf_fil_iovar_data_set (ifp,"arp_hostip_clear" ,NULL ,0 ); +brcmf_net_setcarrier (ifp, false);return 0 ;
@@ -940,6 +943,98 @@ int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)return available ? bsscfgidx : -ENOMEM ; } +#ifdef CONFIG_INET +#define ARPOL_MAX_ENTRIES 8 +static int brcmf_inetaddr_changed (struct notifier_block *nb, +unsigned long action,void *data) +{ + struct brcmf_pub *drvr = container_of(nb, struct brcmf_pub, + inetaddr_notifier); +struct in_ifaddr *ifa = data; +struct net_device *ndev = ifa->ifa_dev->dev; +struct brcmf_if *ifp; +int idx, i, ret; +u32 val; +u32 addr_table[ARPOL_MAX_ENTRIES ] = {0 }; + +/* Find out if the notification is meant for us */ +for (idx =0 ; idx <BRCMF_MAX_IFS ; idx++) { + ifp = drvr->iflist[idx]; +if (ifp && ifp->ndev == ndev) +break ; +if (idx ==BRCMF_MAX_IFS -1 ) +return NOTIFY_DONE ; + } + +/* check if arp offload is supported */ + ret =brcmf_fil_iovar_int_get (ifp,"arpoe" , &val); +if (ret) +return NOTIFY_OK ; + +/* old version only support primary index */ + ret =brcmf_fil_iovar_int_get (ifp,"arp_version" , &val); +if (ret) + val =1 ; +if (val ==1 ) + ifp = drvr->iflist[0 ]; + +/* retrieve the table from firmware */ + ret =brcmf_fil_iovar_data_get (ifp,"arp_hostip" , addr_table, +sizeof (addr_table)); +if (ret) { +brcmf_err ("fail to get arp ip table err:%d\n" , ret); +return NOTIFY_OK ; + } + +for (i =0 ; i <ARPOL_MAX_ENTRIES ; i++) +if (ifa->ifa_address == addr_table[i]) +break ; + +switch (action) { +case NETDEV_UP : +if (i ==ARPOL_MAX_ENTRIES ) { +brcmf_dbg (TRACE ,"add %pI4 to arp table\n" , + &ifa->ifa_address); +/* set it directly */ + ret =brcmf_fil_iovar_int_set (ifp,"arp_hostip" , + ifa->ifa_address); +if (ret) +brcmf_err ("add arp ip err %d\n" , ret); + } +break ; +case NETDEV_DOWN : +if (i <ARPOL_MAX_ENTRIES ) { + addr_table[i] =0 ; +brcmf_dbg (TRACE ,"remove %pI4 from arp table\n" , + &ifa->ifa_address); +/* clear the table in firmware */ + ret =brcmf_fil_iovar_data_set (ifp,"arp_hostip_clear" , +NULL ,0 ); +if (ret) { +brcmf_err ("fail to clear arp ip table err:%d\n" , + ret); +return NOTIFY_OK ; + } +for (i =0 ; i <ARPOL_MAX_ENTRIES ; i++) { +if (addr_table[i] !=0 ) { +brcmf_fil_iovar_int_set (ifp, +"arp_hostip" , + addr_table[i]); +if (ret) +brcmf_err ("add arp ip err %d\n" , + ret); + } + } + } +break ; +default : +break ; + } + +return NOTIFY_OK ; +} +#endif +int brcmf_attach (struct device *dev) {struct brcmf_pub *drvr =NULL ;
@@ -1068,6 +1163,15 @@ int brcmf_bus_start(struct device *dev)if (p2p_ifp) ret =brcmf_net_p2p_attach (p2p_ifp); } + +if (ret) + goto fail; + +#ifdef CONFIG_INET + drvr->inetaddr_notifier.notifier_call = brcmf_inetaddr_changed; + ret =register_inetaddr_notifier (&drvr->inetaddr_notifier); +#endif + fail:if (ret <0 ) {brcmf_err ("failed: %d\n" , ret);
@@ -1133,6 +1237,10 @@ void brcmf_detach(struct device *dev)if (drvr ==NULL )return ; +#ifdef CONFIG_INET +unregister_inetaddr_notifier (&drvr->inetaddr_notifier); +#endif +/* stop firmware event handling */ brcmf_fweh_detach (drvr);if (drvr->config)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +2 -0
@@ -141,6 +141,8 @@ struct brcmf_pub {#ifdef DEBUG struct dentry *dbgfs_dir;#endif + +struct notifier_block inetaddr_notifier; };/* forward declarations */
Signature · 1 line
1.9.1
Re: [PATCH V2 13/13] brcmfmac: add arp offload ip address table configuration support
Quoted 4 lines · Arend van Spriel
From: Franky Lin <[email protected]>
Obtain ipv4 address through inetaddr notification for ARP offload host ip table configuration.
Turns out this patch has a sparse warning, ie. would not work on big-endian system. We have a fix for that. Should I mark this patch as dropped in patchwork?
Regards,
Arend
Quoted 168 lines
Signed-off-by Franky Lin <[email protected]>Signed-off-by Arend van Spriel <[email protected]>--- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 108 +++++++++++++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + 2 files changed, 110 insertions(+)drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +108
-0@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/etherdevice.h> #include <linux/module.h> +#include <linux/inetdevice.h> #include <net/cfg80211.h> #include <net/rtnetlink.h> #include <brcmu_utils.h> @@ -620,6 +621,8 @@ static int brcmf_netdev_stop(struct net_device *ndev)brcmf_cfg80211_down (ndev); +brcmf_fil_iovar_data_set (ifp,"arp_hostip_clear" ,NULL ,0 ); +brcmf_net_setcarrier (ifp, false);return 0 ;@@ -940,6 +943,98 @@ int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)return available ? bsscfgidx : -ENOMEM ; } +#ifdef CONFIG_INET +#define ARPOL_MAX_ENTRIES 8 +static int brcmf_inetaddr_changed (struct notifier_block *nb, +unsigned long action,void *data) +{ + struct brcmf_pub *drvr = container_of(nb, struct brcmf_pub, + inetaddr_notifier); +struct in_ifaddr *ifa = data; +struct net_device *ndev = ifa->ifa_dev->dev; +struct brcmf_if *ifp; +int idx, i, ret; +u32 val; +u32 addr_table[ARPOL_MAX_ENTRIES ] = {0 }; + +/* Find out if the notification is meant for us */ +for (idx =0 ; idx <BRCMF_MAX_IFS ; idx++) { + ifp = drvr->iflist[idx]; +if (ifp && ifp->ndev == ndev) +break ; +if (idx ==BRCMF_MAX_IFS -1 ) +return NOTIFY_DONE ; + } + +/* check if arp offload is supported */ + ret =brcmf_fil_iovar_int_get (ifp,"arpoe" , &val); +if (ret) +return NOTIFY_OK ; + +/* old version only support primary index */ + ret =brcmf_fil_iovar_int_get (ifp,"arp_version" , &val); +if (ret) + val =1 ; +if (val ==1 ) + ifp = drvr->iflist[0 ]; + +/* retrieve the table from firmware */ + ret =brcmf_fil_iovar_data_get (ifp,"arp_hostip" , addr_table, +sizeof (addr_table)); +if (ret) { +brcmf_err ("fail to get arp ip table err:%d\n" , ret); +return NOTIFY_OK ; + } + +for (i =0 ; i <ARPOL_MAX_ENTRIES ; i++) +if (ifa->ifa_address == addr_table[i]) +break ; + +switch (action) { +case NETDEV_UP : +if (i ==ARPOL_MAX_ENTRIES ) { +brcmf_dbg (TRACE ,"add %pI4 to arp table\n" , + &ifa->ifa_address); +/* set it directly */ + ret =brcmf_fil_iovar_int_set (ifp,"arp_hostip" , + ifa->ifa_address); +if (ret) +brcmf_err ("add arp ip err %d\n" , ret); + } +break ; +case NETDEV_DOWN : +if (i <ARPOL_MAX_ENTRIES ) { + addr_table[i] =0 ; +brcmf_dbg (TRACE ,"remove %pI4 from arp table\n" , + &ifa->ifa_address); +/* clear the table in firmware */ + ret =brcmf_fil_iovar_data_set (ifp,"arp_hostip_clear" , +NULL ,0 ); +if (ret) { +brcmf_err ("fail to clear arp ip table err:%d\n" , + ret); +return NOTIFY_OK ; + } +for (i =0 ; i <ARPOL_MAX_ENTRIES ; i++) { +if (addr_table[i] !=0 ) { +brcmf_fil_iovar_int_set (ifp, +"arp_hostip" , + addr_table[i]); +if (ret) +brcmf_err ("add arp ip err %d\n" , + ret); + } + } + } +break ; +default : +break ; + } + +return NOTIFY_OK ; +} +#endif +int brcmf_attach (struct device *dev) {struct brcmf_pub *drvr =NULL ;@@ -1068,6 +1163,15 @@ int brcmf_bus_start(struct device *dev)if (p2p_ifp) ret =brcmf_net_p2p_attach (p2p_ifp); } + +if (ret) + goto fail; + +#ifdef CONFIG_INET + drvr->inetaddr_notifier.notifier_call = brcmf_inetaddr_changed; + ret =register_inetaddr_notifier (&drvr->inetaddr_notifier); +#endif + fail:if (ret <0 ) {brcmf_err ("failed: %d\n" , ret);@@ -1133,6 +1237,10 @@ void brcmf_detach(struct device *dev)if (drvr ==NULL )return ; +#ifdef CONFIG_INET +unregister_inetaddr_notifier (&drvr->inetaddr_notifier); +#endif +/* stop firmware event handling */ brcmf_fweh_detach (drvr);if (drvr->config)drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +2
-0@@ -141,6 +141,8 @@ struct brcmf_pub {#ifdef DEBUG struct dentry *dbgfs_dir;#endif + +struct notifier_block inetaddr_notifier; };/* forward declarations */
Re: [PATCH V2 13/13] brcmfmac: add arp offload ip address table configuration support
Quoted 9 lines · Arend van Spriel
Quoted 4 lines · Arend van Spriel
From: Franky Lin <[email protected]>
Obtain ipv4 address through inetaddr notification for ARP offload host ip table configuration.
Turns out this patch has a sparse warning, ie. would not work on big-endian system. We have a fix for that. Should I mark this patch as dropped in patchwork?
Yeah, that's the best way. For example you could use state "Changes Requested" and then it automatically gets dropped from my queue.
Signature · 1 line
Kalle Valo
Re: [PATCH V2 13/13] brcmfmac: add arp offload ip address table configuration support
Quoted 8 lines · Kalle Valo
Quoted 6 lines · Arend van Spriel
Quoted 4 lines · Arend van Spriel
From: Franky Lin <[email protected]>
Obtain ipv4 address through inetaddr notification for ARP offload host ip table configuration.
Quoted 6 lines
Quoted 3 lines
Turns out this patch has a sparse warning, ie. would not work on big-endian system. We have a fix for that. Should I mark this patch as dropped in patchwork?
Yeah, that's the best way. For example you could use state "Changes Requested" and then it automatically gets dropped from my queue.
will do that.
Thanks,
Arend