brcmfmac: add DPP feature support
v2 cover brcmfmac: add DPP feature support
Add DPP(Device Provisioning Protocol) feature support in this patch series.
Kurt Lee (2):
ieee80211: Add definition for WFA DPP
brcmfmac: Support DPP feature
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 150 ++++++++++-------- .../broadcom/brcm80211/brcmfmac/p2p.c | 81 ++++++++-- .../broadcom/brcm80211/brcmfmac/p2p.h | 4 +- .../broadcom/brcm80211/include/brcmu_wifi.h | 2 + include/linux/ieee80211.h | 3 + 5 files changed, 160 insertions(+), 80 deletions(-)
Signature · 1 line
2.25.0
PATCH v2 1/2 ieee80211: Add definition for WFA DPP
From: Kurt Lee <[email protected]>
Add Wi-Fi Alliance definition for DPP (Device Provisioning Protocol).
--- include/linux/ieee80211.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/ieee80211.h +3 -0
@@ -3417,6 +3417,8 @@ struct ieee80211_multiple_bssid_configuration {#define WLAN_AKM_SUITE_FT_PSK_SHA384 SUITE(0x000FAC, 19)#define WLAN_AKM_SUITE_PSK_SHA384 SUITE(0x000FAC, 20) +#define WLAN_AKM_SUITE_WFA_DPP SUITE(WLAN_OUI_WFA, 2) +#define WLAN_MAX_KEY_LEN 32#define WLAN_PMK_NAME_LEN 16
@@ -3427,6 +3429,7 @@ struct ieee80211_multiple_bssid_configuration {#define WLAN_OUI_WFA 0x506f9a#define WLAN_OUI_TYPE_WFA_P2P 9 +#define WLAN_OUI_TYPE_WFA_DPP 0x1A#define WLAN_OUI_MICROSOFT 0x0050f2#define WLAN_OUI_TYPE_MICROSOFT_WPA 1#define WLAN_OUI_TYPE_MICROSOFT_WMM 2
Signature · 1 line
2.25.0
PATCH v2 2/2 brcmfmac: Support DPP feature
In reply to Wright FengFrom: Kurt Lee <[email protected]>
Let driver parse DPP(Device Provisioning Protocol) frames from upper layer and do corresponding configuration to firmware.
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 150 ++++++++++-------- .../broadcom/brcm80211/brcmfmac/p2p.c | 81 ++++++++-- .../broadcom/brcm80211/brcmfmac/p2p.h | 4 +- .../broadcom/brcm80211/include/brcmu_wifi.h | 2 + 4 files changed, 157 insertions(+), 80 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +86 -64
@@ -1815,6 +1815,9 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) val =WPA2_AUTH_PSK |WPA2_AUTH_FT ; profile->is_ft = true;break ; +case WLAN_AKM_SUITE_WFA_DPP : + val =WFA_AUTH_DPP ; +break ;default :bphy_err (drvr,"invalid cipher group (%d)\n" , sme->crypto.cipher_group);
@@ -2113,43 +2116,50 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, goto done; } -if (sme->crypto.psk && - profile->use_fwsup !=BRCMF_PROFILE_FWSUP_SAE ) { -if (WARN_ON (profile->use_fwsup !=BRCMF_PROFILE_FWSUP_NONE )) { - err = -EINVAL ; - goto done; +if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_FWSUP )) { +if (sme->crypto.psk) { +if (profile->use_fwsup !=BRCMF_PROFILE_FWSUP_SAE ) { +if (WARN_ON (profile->use_fwsup != +BRCMF_PROFILE_FWSUP_NONE )) { + err = -EINVAL ; + goto done; + } +brcmf_dbg (INFO ,"using PSK offload\n" ); + profile->use_fwsup =BRCMF_PROFILE_FWSUP_PSK ; + } + }else { + profile->use_fwsup =BRCMF_PROFILE_FWSUP_NONE ; } -brcmf_dbg (INFO ,"using PSK offload\n" ); - profile->use_fwsup =BRCMF_PROFILE_FWSUP_PSK ; - } -if (profile->use_fwsup !=BRCMF_PROFILE_FWSUP_NONE ) { -/* enable firmware supplicant for this interface */ - err =brcmf_fil_iovar_int_set (ifp,"sup_wpa" ,1 ); -if (err <0 ) { -bphy_err (drvr,"failed to enable fw supplicant\n" ); - goto done; +if (profile->use_fwsup !=BRCMF_PROFILE_FWSUP_NONE ) { +/* enable firmware supplicant for this interface */ + err =brcmf_fil_iovar_int_set (ifp,"sup_wpa" ,1 ); +if (err <0 ) { +bphy_err (drvr,"failed to enable fw supplicant\n" ); + goto done; + } + }else { + err =brcmf_fil_iovar_int_set (ifp,"sup_wpa" ,0 ); } - } -if (profile->use_fwsup ==BRCMF_PROFILE_FWSUP_PSK ) - err =brcmf_set_pmk (ifp, sme->crypto.psk, -BRCMF_WSEC_MAX_PSK_LEN ); -else if (profile->use_fwsup ==BRCMF_PROFILE_FWSUP_SAE ) { -/* clean up user-space RSNE */ -if (brcmf_fil_iovar_data_set (ifp,"wpaie" ,NULL ,0 )) { -bphy_err (drvr,"failed to clean up user-space RSNE\n" ); - goto done; - } - err =brcmf_set_sae_password (ifp, sme->crypto.sae_pwd, - sme->crypto.sae_pwd_len); -if (!err && sme->crypto.psk) +if (profile->use_fwsup ==BRCMF_PROFILE_FWSUP_PSK ) err =brcmf_set_pmk (ifp, sme->crypto.psk,BRCMF_WSEC_MAX_PSK_LEN ); +else if (profile->use_fwsup ==BRCMF_PROFILE_FWSUP_SAE ) { +/* clean up user-space RSNE */ +if (brcmf_fil_iovar_data_set (ifp,"wpaie" ,NULL ,0 )) { +bphy_err (drvr,"failed to clean up user-space RSNE\n" ); + goto done; + } + err =brcmf_set_sae_password (ifp, sme->crypto.sae_pwd, + sme->crypto.sae_pwd_len); +if (!err && sme->crypto.psk) + err =brcmf_set_pmk (ifp, sme->crypto.psk, +BRCMF_WSEC_MAX_PSK_LEN ); + } +if (err) + goto done; } -if (err) - goto done; -/* Join with specific BSSID and cached SSID * If SSID is zero join based on BSSID only */
@@ -4101,6 +4111,13 @@ static bool brcmf_valid_wpa_oui(u8 *oui, bool is_rsn_ie)return (memcmp (oui,WPA_OUI ,TLV_OUI_LEN ) ==0 ); } +static bool brcmf_valid_dpp_suite (u8 *oui) +{ +u32 akm_suite = (*(oui +3 )) | (*(oui +2 ) <<8 ) | (*(oui +1 ) <<16 ) | (*(oui) <<24 ); + +return (akm_suite ==WLAN_AKM_SUITE_WFA_DPP ); +} + static s32 brcmf_configure_wpaie(struct brcmf_if *ifp, const struct brcmf_vs_tlv *wpa_ie,
@@ -4214,43 +4231,47 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, goto exit; }for (i =0 ; i < count; i++) { -if (!brcmf_valid_wpa_oui (&data[offset], is_rsn_ie)) { +if (brcmf_valid_dpp_suite (&data[offset])) { + wpa_auth |=WFA_AUTH_DPP ; + offset +=TLV_OUI_LEN ; + }else if (brcmf_valid_wpa_oui (&data[offset], is_rsn_ie)) { + offset +=TLV_OUI_LEN ; +switch (data[offset]) { +case RSN_AKM_NONE : +brcmf_dbg (TRACE ,"RSN_AKM_NONE\n" ); + wpa_auth |=WPA_AUTH_NONE ; +break ; +case RSN_AKM_UNSPECIFIED : +brcmf_dbg (TRACE ,"RSN_AKM_UNSPECIFIED\n" ); + is_rsn_ie ? + (wpa_auth |=WPA2_AUTH_UNSPECIFIED ) : + (wpa_auth |=WPA_AUTH_UNSPECIFIED ); +break ; +case RSN_AKM_PSK : +brcmf_dbg (TRACE ,"RSN_AKM_PSK\n" ); + is_rsn_ie ? (wpa_auth |=WPA2_AUTH_PSK ) : + (wpa_auth |=WPA_AUTH_PSK ); +break ; +case RSN_AKM_SHA256_PSK : +brcmf_dbg (TRACE ,"RSN_AKM_MFP_PSK\n" ); + wpa_auth |=WPA2_AUTH_PSK_SHA256 ; +break ; +case RSN_AKM_SHA256_1X : +brcmf_dbg (TRACE ,"RSN_AKM_MFP_1X\n" ); + wpa_auth |=WPA2_AUTH_1X_SHA256 ; +break ; +case RSN_AKM_SAE : +brcmf_dbg (TRACE ,"RSN_AKM_SAE\n" ); + wpa_auth |=WPA3_AUTH_SAE_PSK ; +break ; +default : +bphy_err (drvr,"Invalid key mgmt info\n" ); + } + }else { err = -EINVAL ;bphy_err (drvr,"ivalid OUI\n" ); goto exit; } - offset +=TLV_OUI_LEN ; -switch (data[offset]) { -case RSN_AKM_NONE : -brcmf_dbg (TRACE ,"RSN_AKM_NONE\n" ); - wpa_auth |=WPA_AUTH_NONE ; -break ; -case RSN_AKM_UNSPECIFIED : -brcmf_dbg (TRACE ,"RSN_AKM_UNSPECIFIED\n" ); - is_rsn_ie ? (wpa_auth |=WPA2_AUTH_UNSPECIFIED ) : - (wpa_auth |=WPA_AUTH_UNSPECIFIED ); -break ; -case RSN_AKM_PSK : -brcmf_dbg (TRACE ,"RSN_AKM_PSK\n" ); - is_rsn_ie ? (wpa_auth |=WPA2_AUTH_PSK ) : - (wpa_auth |=WPA_AUTH_PSK ); -break ; -case RSN_AKM_SHA256_PSK : -brcmf_dbg (TRACE ,"RSN_AKM_MFP_PSK\n" ); - wpa_auth |=WPA2_AUTH_PSK_SHA256 ; -break ; -case RSN_AKM_SHA256_1X : -brcmf_dbg (TRACE ,"RSN_AKM_MFP_1X\n" ); - wpa_auth |=WPA2_AUTH_1X_SHA256 ; -break ; -case RSN_AKM_SAE : -brcmf_dbg (TRACE ,"RSN_AKM_SAE\n" ); - wpa_auth |=WPA3_AUTH_SAE_PSK ; -break ; -default : -bphy_err (drvr,"Invalid key mgmt info\n" ); - } - offset++; } mfp =BRCMF_MFP_NONE ;
@@ -4269,6 +4290,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp,*/ if (!(wpa_auth & (WPA2_AUTH_PSK_SHA256 |WPA2_AUTH_1X_SHA256 | +WFA_AUTH_DPP |WPA3_AUTH_SAE_PSK ))) { err = -EINVAL ; goto exit;
@@ -5181,7 +5203,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, *cookie, le16_to_cpu(action_frame->len), freq); ack =brcmf_p2p_send_action_frame (cfg,cfg_to_ndev (cfg), - af_params); + af_params, vif);cfg80211_mgmt_tx_status (wdev, *cookie, buf, len, ack,GFP_KERNEL );
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +66 -15
174 lines not on this page · raw message
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h +3 -1
@@ -138,6 +138,7 @@ struct brcmf_p2p_info {bool block_gon_req_tx;bool p2pdev_dynamically;bool wait_for_offchan_complete; +struct wireless_dev *remin_on_channel_wdev; };s32 brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg,bool p2pdev_forced);
@@ -170,7 +171,8 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp, void *data);bool brcmf_p2p_send_action_frame (struct brcmf_cfg80211_info *cfg,struct net_device *ndev, -struct brcmf_fil_af_params_le *af_params); +struct brcmf_fil_af_params_le *af_params, +struct brcmf_cfg80211_vif *vif);bool brcmf_p2p_scan_finding_common_channel (struct brcmf_cfg80211_info *cfg,struct brcmf_bss_info_le *bi); s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h +2 -0
@@ -233,6 +233,8 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)#define WPA3_AUTH_SAE_PSK 0x40000/* SAE with 4-way handshake */ +#define WFA_AUTH_DPP 0x200000/* WFA DPP AUTH */ +#define DOT11_DEFAULT_RTS_LEN 2347#define DOT11_DEFAULT_FRAG_LEN 2346
Signature · 1 line
2.25.0
Re: [PATCH v2 2/2] brcmfmac: Support DPP feature
Quoted 7 lines · Wright Feng
From: Kurt Lee <[email protected]>
Let driver parse DPP(Device Provisioning Protocol) frames from upper layer and do corresponding configuration to firmware.
Signed-off-by Kurt Lee <[email protected]>Signed-off-by Wright Feng <[email protected]>
Failed to apply:
Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c'
error: Failed to merge in the changes.
Applying: brcmfmac: Support DPP feature
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c Patch failed at 0001 brcmfmac: Support DPP feature
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Changes Requested.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches