Add support for new channels on 60GHz band
v5 cover Add support for new channels on 60GHz band
The following set of patches add support for new channels on 60GHz band and EDMG channels:
Changelog:
V5:
- Addressed to comments from the community
- Added enum for bw_config
- Updated nla_policy to NLA_POLICY_RANGE()
V4:
- Addressed to comments from the community
- Updated comments and variable name
V3:
- Addressed to comments from the community
- Added 60G check for verifying some EDMG cases are relevant
- Used the ieee80211_sta_edmg_cap struct as the edmg channel configuration
- Updated nla_policy to NLA_POLICY_RANGE()
V2
- Addressed to comments from the community
- Align to latest Spec release
Alexei Avshalom Lazar (2):
nl80211: Add support for EDMG channels
wil6210: Add EDMG channel support
drivers/net/wireless/ath/wil6210/cfg80211.c | 205 +++++++++++++++++++++++++-- drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 + drivers/net/wireless/ath/wil6210/txrx_edma.h | 6 + drivers/net/wireless/ath/wil6210/wil6210.h | 8 +- drivers/net/wireless/ath/wil6210/wmi.c | 5 +- drivers/net/wireless/ath/wil6210/wmi.h | 30 +++- include/net/cfg80211.h | 86 ++++++++++- include/uapi/linux/nl80211.h | 24 ++++ net/wireless/chan.c | 159 +++++++++++++++++++++ net/wireless/nl80211.c | 37 +++++ net/wireless/util.c | 42 +++++- 11 files changed, 585 insertions(+), 19 deletions(-)
Signature · 1 line
1.9.1
PATCH v5 1/2 nl80211: Add support for EDMG channels
802.11ay specification defines Enhanced Directional Multi-Gigabit (EDMG) STA and AP which allow channel bonding of 2 channels and more. Introduce NL80211_ATTR_WIPHY_EDMG_CHANNELS, NL80211_ATTR_WIPHY_EDMG_BW_CONFIG, NL80211_BAND_ATTR_EDMG_CHANNELS, NL80211_BAND_ATTR_EDMG_BW_CONFIG and RATE_INFO_FLAGS_EDMG that needed for enabling and configuring EDMG support. Driver is expected to report its EDMG capabilities: whether EDMG is supported and the supported EDMG channels.
Bitrate calculation is enhanced to take into account EDMG support according to the 802.11ay specification.
The kernel uses NL80211_BAND_ATTR_EDMG_CHANNELS and NL80211_BAND_ATTR_EDMG_BW_CONFIG attributes in order to publish the EDMG capabilities to the userspace. NL80211_BAND_ATTR_EDMG_CHANNELS is a bitmap field that indicates the 2.16 GHz channel(s) that are allowed to be used.
If NL80211_BAND_ATTR_EDMG_CHANNELS is not set then EDMG not supported. NL80211_BAND_ATTR_EDMG_BW_CONFIG represent the allowed channel bandwidth configurations. NL80211_ATTR_WIPHY_EDMG_CHANNELS and NL80211_ATTR_WIPHY_EDMG_BW_CONFIG will be used by the userspace for AP configuration and connect command.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 +- include/net/cfg80211.h | 86 ++++++++++++++- include/uapi/linux/nl80211.h | 24 +++++ net/wireless/chan.c | 159 ++++++++++++++++++++++++++++ net/wireless/nl80211.c | 37 +++++++ net/wireless/util.c | 42 +++++++- 6 files changed, 344 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +1 -1
@@ -346,7 +346,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,BIT_ULL (NL80211_STA_INFO_RX_DROP_MISC ) |BIT_ULL (NL80211_STA_INFO_TX_FAILED ); - sinfo->txrate.flags =RATE_INFO_FLAGS_60G ; + sinfo->txrate.flags =RATE_INFO_FLAGS_DMG ; sinfo->txrate.mcs =le16_to_cpu (reply.evt.bf_mcs); sinfo->rxrate.mcs = stats->last_mcs_rx; sinfo->rx_bytes = stats->rx_bytes;
include/net/cfg80211.h +84 -2
159 lines not on this page · raw message
include/uapi/linux/nl80211.h +24 -0
@@ -52,6 +52,11 @@#define NL80211_MULTICAST_GROUP_NAN "nan"#define NL80211_MULTICAST_GROUP_TESTMODE "testmode" +#define NL80211_EDMG_BW_CONFIG_MIN 4 +#define NL80211_EDMG_BW_CONFIG_MAX 15 +#define NL80211_EDMG_CHANNELS_MIN 1 +#define NL80211_EDMG_CHANNELS_MAX 0x3c/* 0b00111100 */ +/** * DOC: Station handling *
@@ -2324,6 +2329,13 @@ enum nl80211_commands {* should be picking up the lowest tx power, either tx power per-interface * or per-station. * +* @NL80211_ATTR_WIPHY_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz +* channel(s) that are allowed to be used for EDMG transmissions. +* Defined by IEEE P802.11ay/D4.0 section 9.4.2.251. +* @NL80211_ATTR_WIPHY_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes +* the allowed channel bandwidth configurations. +* Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13. +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2777,6 +2789,9 @@ enum nl80211_attrs {NL80211_ATTR_STA_TX_POWER_SETTING ,NL80211_ATTR_STA_TX_POWER , +NL80211_ATTR_WIPHY_EDMG_CHANNELS , +NL80211_ATTR_WIPHY_EDMG_BW_CONFIG , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -3385,6 +3400,12 @@ enum nl80211_band_iftype_attr {* @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using * attributes from &enum nl80211_band_iftype_attr +* @NL80211_BAND_ATTR_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz +* channel(s) that are allowed to be used for EDMG transmissions. +* Defined by IEEE P802.11ay/D4.0 section 9.4.2.251. +* @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes +* the allowed channel bandwidth configurations. +* Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13. * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined * @__NL80211_BAND_ATTR_AFTER_LAST: internal use */
@@ -3402,6 +3423,9 @@ enum nl80211_band_attr {NL80211_BAND_ATTR_VHT_CAPA ,NL80211_BAND_ATTR_IFTYPE_DATA , +NL80211_BAND_ATTR_EDMG_CHANNELS , +NL80211_BAND_ATTR_EDMG_BW_CONFIG , +/* keep last */ __NL80211_BAND_ATTR_AFTER_LAST,NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST -1
net/wireless/chan.c +159 -0
201 lines not on this page · raw message
net/wireless/nl80211.c +37 -0
@@ -288,6 +288,13 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_ATTR_WIPHY_FREQ] = { .type = NLA_U32 }, [NL80211_ATTR_WIPHY_CHANNEL_TYPE] = { .type = NLA_U32 }, + [NL80211_ATTR_WIPHY_EDMG_CHANNELS ] =NLA_POLICY_RANGE (NLA_U8 , +NL80211_EDMG_CHANNELS_MIN , + NL80211_EDMG_CHANNELS_MAX), + [NL80211_ATTR_WIPHY_EDMG_BW_CONFIG ] =NLA_POLICY_RANGE (NLA_U8 , +NL80211_EDMG_BW_CONFIG_MIN , + NL80211_EDMG_BW_CONFIG_MAX), + [NL80211_ATTR_CHANNEL_WIDTH] = { .type = NLA_U32 }, [NL80211_ATTR_CENTER_FREQ1] = { .type = NLA_U32 }, [NL80211_ATTR_CENTER_FREQ2] = { .type = NLA_U32 },
@@ -1501,6 +1508,15 @@ static int nl80211_send_band_rateinfo(struct sk_buff *msg,nla_nest_end (msg, nl_iftype_data); } +/* add EDMG info */ +if (sband->edmg_cap.channels && + (nla_put_u8 (msg,NL80211_BAND_ATTR_EDMG_CHANNELS , + sband->edmg_cap.channels) || +nla_put_u8 (msg,NL80211_BAND_ATTR_EDMG_BW_CONFIG , + sband->edmg_cap.bw_config))) + +return -ENOBUFS ; +/* add bitrates */ nl_rates =nla_nest_start (msg,NL80211_BAND_ATTR_RATES );if (!nl_rates)
@@ -2560,6 +2576,18 @@ int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,nla_get_u32 (attrs[NL80211_ATTR_CENTER_FREQ2 ]); } +if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS ]) { + chandef->edmg.channels = +nla_get_u8 (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS ]); + +if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG ]) + chandef->edmg.bw_config = +nla_get_u8 (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG ]); + }else { + chandef->edmg.bw_config =0 ; + chandef->edmg.channels =0 ; + } +if (!cfg80211_chandef_valid (chandef)) {NL_SET_ERR_MSG (extack,"invalid channel definition" );return -EINVAL ;
@@ -9699,6 +9727,15 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS ]) { + connect.edmg.channels = +nla_get_u8 (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS ]); + +if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG ]) + connect.edmg.bw_config = +nla_get_u8 (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG ]); + } +if (connect.privacy && info->attrs[NL80211_ATTR_KEYS ]) { connkeys =nl80211_parse_connkeys (rdev, info,NULL );if (IS_ERR (connkeys))
net/wireless/util.c +39 -3
60 lines not on this page · raw message
Signature · 1 line
1.9.1
Johannes Berg
maintainerRe: [PATCH v5 1/2] nl80211: Add support for EDMG channels
Hi Alexei,
I'm not exactly sure why, but this breaks practically all connectivity on 2.4 and 5 GHz channels (at least in hwsim tests).
Please check and resubmit.
It'd also be good to reformat the commit log a bit, maybe adding paragraphs, it's a bit of a "wall of text".
Thanks,
johannes
Re: [PATCH v5 1/2] nl80211: Add support for EDMG channels
Quoted 6 lines · Johannes Berg
Hi Alexei,
I'm not exactly sure why, but this breaks practically all connectivity on 2.4 and 5 GHz channels (at least in hwsim tests).
Please check and resubmit.
Sorry for this issue, we have run hwsim test through wpa_supplicant and catch small issue that caused the tests to fail - fix raised. Can you please share with us how you run the hwsim, you also used the wpa_supplicant unit tests or some other tool?
Quoted 3 lines
It'd also be good to reformat the commit log a bit, maybe adding paragraphs, it's a bit of a "wall of text".
Done.
Quoted 3 lines
Thanks,
johannes
Signature · 4 lines
Alexei Lazar Qualcomm Israel, on behalf of Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum a Linux Foundation Collaborative Project
Johannes Berg
maintainerRe: [PATCH v5 1/2] nl80211: Add support for EDMG channels
Quoted 6 lines · Alexei Lazar
Quoted 5 lines · Johannes Berg
Hi Alexei,
I'm not exactly sure why, but this breaks practically all connectivity on 2.4 and 5 GHz channels (at least in hwsim tests).
Quoted 6 lines
Quoted 1 line
Please check and resubmit.
Sorry for this issue, we have run hwsim test through
wpa_supplicantand catch small issue that caused the tests to fail - fix raised. Can you please share with us how you run the hwsim, you also used thewpa_supplicantunit tests or some other tool?
Yes, I keep saying "hwsim tests" when really I mean the hostap hwsim- based tests...
johannes
PATCH v5 2/2 wil6210: Add EDMG channel support
In reply to Alexei Avshalom LazarAdd support for Enhanced Directional Multi-Gigabit (EDMG) channels 9-11. wil6210 reports it's EDMG capabilities (that are also based on FW capability) to cfg80211 by filling wiphy->bands[NL80211_BAND_60GHZ]->edmg_cap.
wil6210 handles edmg.channels and edmg.bw_config requested in connect and start_ap operations.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 205 +++++++++++++++++++++++++-- drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 + drivers/net/wireless/ath/wil6210/txrx_edma.h | 6 + drivers/net/wireless/ath/wil6210/wil6210.h | 8 +- drivers/net/wireless/ath/wil6210/wmi.c | 5 +- drivers/net/wireless/ath/wil6210/wmi.h | 30 +++- 6 files changed, 242 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +197 -8
@@ -25,6 +25,22 @@#define WIL_MAX_ROC_DURATION_MS 5000 +#define WIL_EDMG_CHANNEL_9_SUBCHANNELS (BIT(0) | BIT(1)) +#define WIL_EDMG_CHANNEL_10_SUBCHANNELS (BIT(1) | BIT(2)) +#define WIL_EDMG_CHANNEL_11_SUBCHANNELS (BIT(2) | BIT(3)) + +/* WIL_EDMG_BW_CONFIGURATION define the allowed channel bandwidth +* configurations as defined by IEEE 802.11 section 9.4.2.251, Table 13. +* The value 5 allowing CB1 and CB2 of adjacent channels. +*/ +#define WIL_EDMG_BW_CONFIGURATION 5 + +/* WIL_EDMG_CHANNELS is a bitmap that indicates the 2.16 GHz channel(s) that +* are allowed to be used for EDMG transmissions in the BSS as defined by +* IEEE 802.11 section 9.4.2.251. +*/ +#define WIL_EDMG_CHANNELS (BIT(0) | BIT(1) | BIT(2) | BIT(3)) +bool disable_ap_sme;module_param (disable_ap_sme, bool,0444 );MODULE_PARM_DESC (disable_ap_sme," let user space handle AP mode SME" );
@@ -51,6 +67,39 @@ CHAN60G(4, 0), }; +/* Rx channel bonding mode */ +enum wil_rx_cb_mode { +WIL_RX_CB_MODE_DMG , +WIL_RX_CB_MODE_EDMG , +WIL_RX_CB_MODE_WIDE , +}; + +static int wil_rx_cb_mode_to_n_bonded (u8 cb_mode) +{ +switch (cb_mode) { +case WIL_RX_CB_MODE_DMG : +case WIL_RX_CB_MODE_EDMG : +return 1 ; +case WIL_RX_CB_MODE_WIDE : +return 2 ; +default : +return 1 ; + } +} + +static int wil_tx_cb_mode_to_n_bonded (u8 cb_mode) +{ +switch (cb_mode) { +case WMI_TX_MODE_DMG : +case WMI_TX_MODE_EDMG_CB1 : +return 1 ; +case WMI_TX_MODE_EDMG_CB2 : +return 2 ; +default : +return 1 ; + } +} +static void wil_memdup_ie (u8 **pdst,size_t *pdst_len,const u8 *src,size_t src_len) {
@@ -82,6 +131,12 @@ void update_supported_bands(struct wil6210_priv *wil) wiphy->bands[NL80211_BAND_60GHZ ]->n_channels =wil_num_supported_channels (wil); + +if (test_bit (WMI_FW_CAPABILITY_CHANNEL_BONDING , wil->fw_capabilities)) + wiphy->bands[NL80211_BAND_60GHZ ]->edmg_cap.channels = +WIL_EDMG_CHANNELS ; + wiphy->bands[NL80211_BAND_60GHZ ]->edmg_cap.bw_config = +WIL_EDMG_BW_CONFIGURATION ; }/* Vendor id to be used in vendor specific command and events
@@ -296,6 +351,86 @@ int wil_iftype_nl2wmi(enum nl80211_iftype type)return -EOPNOTSUPP ; } +int wil_spec2wmi_ch (u8 spec_ch,u8 *wmi_ch) +{ +switch (spec_ch) { +case 1 : + *wmi_ch =WMI_CHANNEL_1 ; +break ; +case 2 : + *wmi_ch =WMI_CHANNEL_2 ; +break ; +case 3 : + *wmi_ch =WMI_CHANNEL_3 ; +break ; +case 4 : + *wmi_ch =WMI_CHANNEL_4 ; +break ; +case 5 : + *wmi_ch =WMI_CHANNEL_5 ; +break ; +case 6 : + *wmi_ch =WMI_CHANNEL_6 ; +break ; +case 9 : + *wmi_ch =WMI_CHANNEL_9 ; +break ; +case 10 : + *wmi_ch =WMI_CHANNEL_10 ; +break ; +case 11 : + *wmi_ch =WMI_CHANNEL_11 ; +break ; +case 12 : + *wmi_ch =WMI_CHANNEL_12 ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +int wil_wmi2spec_ch (u8 wmi_ch,u8 *spec_ch) +{ +switch (wmi_ch) { +case WMI_CHANNEL_1 : + *spec_ch =1 ; +break ; +case WMI_CHANNEL_2 : + *spec_ch =2 ; +break ; +case WMI_CHANNEL_3 : + *spec_ch =3 ; +break ; +case WMI_CHANNEL_4 : + *spec_ch =4 ; +break ; +case WMI_CHANNEL_5 : + *spec_ch =5 ; +break ; +case WMI_CHANNEL_6 : + *spec_ch =6 ; +break ; +case WMI_CHANNEL_9 : + *spec_ch =9 ; +break ; +case WMI_CHANNEL_10 : + *spec_ch =10 ; +break ; +case WMI_CHANNEL_11 : + *spec_ch =11 ; +break ; +case WMI_CHANNEL_12 : + *spec_ch =12 ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +int wil_cid_fill_sinfo (struct wil6210_vif *vif,int cid,struct station_info *sinfo) {
@@ -310,6 +445,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid, }__packed reply;struct wil_net_stats *stats = &wil->sta[cid].stats;int rc; +u8 txflag =RATE_INFO_FLAGS_DMG ;memset (&reply,0 ,sizeof (reply));
@@ -322,7 +458,8 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid," MCS %d TSF 0x%016llx\n" " BF status 0x%08x RSSI %d SQI %d%%\n" " Tx Tpt %d goodput %d Rx goodput %d\n" -" Sectors(rx:tx) my %d:%d peer %d:%d\n""}\n" , +" Sectors(rx:tx) my %d:%d peer %d:%d\n" +" Tx mode %d}\n" , cid, vif->mid,le16_to_cpu (reply.evt.bf_mcs),le64_to_cpu (reply.evt.tsf), reply.evt.status, reply.evt.rssi,
@@ -333,7 +470,8 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,le16_to_cpu (reply.evt.my_rx_sector),le16_to_cpu (reply.evt.my_tx_sector),le16_to_cpu (reply.evt.other_rx_sector), - le16_to_cpu(reply.evt.other_tx_sector)); +le16_to_cpu (reply.evt.other_tx_sector), + reply.evt.tx_mode); sinfo->generation = wil->sinfo_gen;
@@ -346,9 +484,16 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,BIT_ULL (NL80211_STA_INFO_RX_DROP_MISC ) |BIT_ULL (NL80211_STA_INFO_TX_FAILED ); - sinfo->txrate.flags =RATE_INFO_FLAGS_DMG ; +if (wil->use_enhanced_dma_hw && reply.evt.tx_mode !=WMI_TX_MODE_DMG ) + txflag =RATE_INFO_FLAGS_EDMG ; + + sinfo->txrate.flags = txflag; sinfo->txrate.mcs =le16_to_cpu (reply.evt.bf_mcs); sinfo->rxrate.mcs = stats->last_mcs_rx; + sinfo->txrate.n_bonded_ch = +wil_tx_cb_mode_to_n_bonded (reply.evt.tx_mode); + sinfo->rxrate.n_bonded_ch = +wil_rx_cb_mode_to_n_bonded (stats->last_cb_mode_rx); sinfo->rx_bytes = stats->rx_bytes; sinfo->rx_packets = stats->rx_packets; sinfo->rx_dropped_misc = stats->rx_dropped;
@@ -1006,6 +1151,33 @@ static int wil_ft_connect(struct wiphy *wiphy,return rc; } +static int wil_get_wmi_edmg_channel (struct wil6210_priv *wil,u8 edmg_bw_config, +u8 edmg_channels,u8 *wmi_ch) +{ +if (!edmg_bw_config) { + *wmi_ch =0 ; +return 0 ; + }else if (edmg_bw_config ==WIL_EDMG_BW_CONFIGURATION ) { +/* convert from edmg channel bitmap into edmg channel number */ +switch (edmg_channels) { +case WIL_EDMG_CHANNEL_9_SUBCHANNELS : +return wil_spec2wmi_ch (9 , wmi_ch); +case WIL_EDMG_CHANNEL_10_SUBCHANNELS : +return wil_spec2wmi_ch (10 , wmi_ch); +case WIL_EDMG_CHANNEL_11_SUBCHANNELS : +return wil_spec2wmi_ch (11 , wmi_ch); +default : +wil_err (wil,"Unsupported edmg channel bitmap 0x%x\n" , + edmg_channels); +return -EINVAL ; + } + }else { +wil_err (wil,"Unsupported EDMG BW configuration %d\n" , + edmg_bw_config); +return -EINVAL ; + } +} +static int wil_cfg80211_connect (struct wiphy *wiphy,struct net_device *ndev,struct cfg80211_connect_params *sme)
@@ -1151,6 +1323,11 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,memcpy (conn.ssid, ssid_eid+2 , conn.ssid_len); conn.channel = ch -1 ; + rc =wil_get_wmi_edmg_channel (wil, sme->edmg.bw_config, + sme->edmg.channels, &conn.edmg_channel); +if (rc <0 ) +return rc; +ether_addr_copy (conn.bssid, bss->bssid);ether_addr_copy (conn.dst_mac, bss->bssid);
@@ -1707,7 +1884,7 @@ static int _wil_cfg80211_set_ies(struct wil6210_vif *vif,static int _wil_cfg80211_start_ap (struct wiphy *wiphy,struct net_device *ndev,const u8 *ssid,size_t ssid_len,u32 privacy, -int bi,u8 chan, +int bi,u8 chan,u8 wmi_edmg_channel,struct cfg80211_beacon_data *bcon,u8 hidden_ssid,u32 pbss) {
@@ -1770,6 +1947,7 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy, vif->privacy = privacy; vif->channel = chan; + vif->wmi_edmg_channel = wmi_edmg_channel; vif->hidden_ssid = hidden_ssid; vif->pbss = pbss; vif->bi = bi;
@@ -1780,7 +1958,8 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,if (!wil_has_other_active_ifaces (wil, ndev, false, true))wil6210_bus_request (wil,WIL_MAX_BUS_REQUEST_KBPS ); - rc =wmi_pcp_start (vif, bi, wmi_nettype, chan, hidden_ssid, is_go); + rc =wmi_pcp_start (vif, bi, wmi_nettype, chan, wmi_edmg_channel, + hidden_ssid, is_go);if (rc) goto err_pcp_start;
@@ -1832,7 +2011,8 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil) rc =_wil_cfg80211_start_ap (wiphy, ndev, vif->ssid, vif->ssid_len, vif->privacy, vif->bi, - vif->channel, &bcon, + vif->channel, + vif->wmi_edmg_channel, &bcon, vif->hidden_ssid, vif->pbss);if (rc) {wil_err (wil,"vif %d recovery failed (%d)\n" , i, rc);
@@ -1882,7 +2062,8 @@ static int wil_cfg80211_change_beacon(struct wiphy *wiphy, rc =_wil_cfg80211_start_ap (wiphy, ndev, vif->ssid, vif->ssid_len, privacy, wdev->beacon_interval, - vif->channel, bcon, + vif->channel, + vif->wmi_edmg_channel, bcon, vif->hidden_ssid, vif->pbss); }else {
@@ -1901,10 +2082,17 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,struct ieee80211_channel *channel = info->chandef.chan;struct cfg80211_beacon_data *bcon = &info->beacon;struct cfg80211_crypto_settings *crypto = &info->crypto; +u8 wmi_edmg_channel;u8 hidden_ssid;wil_dbg_misc (wil,"start_ap\n" ); + rc =wil_get_wmi_edmg_channel (wil, info->chandef.edmg.bw_config, + info->chandef.edmg.channels, + &wmi_edmg_channel); +if (rc <0 ) +return rc; +if (!channel) {wil_err (wil,"AP: No channel???\n" );return -EINVAL ;
@@ -1944,7 +2132,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, rc =_wil_cfg80211_start_ap (wiphy, ndev, info->ssid, info->ssid_len, info->privacy, info->beacon_interval, channel->hw_value, - bcon, hidden_ssid, info->pbss); + wmi_edmg_channel, bcon, hidden_ssid, + info->pbss);return rc; }
drivers/net/wireless/ath/wil6210/txrx_edma.c +2 -0
@@ -1006,6 +1006,8 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil, stats->rx_per_mcs[stats->last_mcs_rx]++; } + stats->last_cb_mode_rx =wil_rx_status_get_cb_mode (msg); +if (!wil->use_rx_hw_reordering && !wil->use_compressed_rx_status &&wil_check_bar (wil, msg, cid, skb, stats) == -EAGAIN ) {kfree_skb (skb);
drivers/net/wireless/ath/wil6210/txrx_edma.h +6 -0
@@ -366,6 +366,12 @@ static inline u8 wil_rx_status_get_mcs(void *msg) 16, 21); } +static inline u8 wil_rx_status_get_cb_mode (void *msg) +{ +return WIL_GET_BITS (((struct wil_rx_status_compressed *)msg)->d1, +22 ,23 ); +} +static inline u16 wil_rx_status_get_flow_id (void *msg) { return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d0,
drivers/net/wireless/ath/wil6210/wil6210.h +7 -1
@@ -590,6 +590,7 @@ struct wil_net_stats {unsigned long rx_amsdu_error;/* eDMA specific */ unsigned long rx_csum_err;u16 last_mcs_rx; +u8 last_cb_mode_rx;u64 rx_per_mcs[WIL_MCS_MAX +1 ];u32 ft_roams;/* relevant in STA mode */ };
@@ -851,6 +852,7 @@ struct wil6210_vif {DECLARE_BITMAP (status, wil_vif_status_last);u32 privacy;/* secure connection? */ u16 channel;/* relevant in AP mode */ +u8 wmi_edmg_channel;/* relevant in AP mode */ u8 hidden_ssid;/* relevant in AP mode */ u32 ap_isolate;/* no intra-BSS communication */ bool pbss;
@@ -1313,7 +1315,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,int wmi_set_mac_address (struct wil6210_priv *wil,void *addr);int wmi_pcp_start (struct wil6210_vif *vif,int bi,u8 wmi_nettype,u8 chan, -u8 hidden_ssid,u8 is_go); +u8 edmg_chan,u8 hidden_ssid,u8 is_go);int wmi_pcp_stop (struct wil6210_vif *vif);int wmi_led_cfg (struct wil6210_priv *wil,bool enable);int wmi_abort_scan (struct wil6210_vif *vif);
@@ -1389,6 +1391,10 @@ int wmi_start_sched_scan(struct wil6210_priv *wil,int wmi_mgmt_tx_ext (struct wil6210_vif *vif,const u8 *buf,size_t len,u8 channel,u16 duration_ms); +int wil_wmi2spec_ch (u8 wmi_ch,u8 *spec_ch); +int wil_spec2wmi_ch (u8 spec_ch,u8 *wmi_ch); +void wil_update_supported_bands (struct wil6210_priv *wil); +int reverse_memcmp (const void *cs,const void *ct,size_t count);/* WMI for enhanced DMA */
drivers/net/wireless/ath/wil6210/wmi.c +3 -2
@@ -2123,8 +2123,8 @@ int wmi_led_cfg(struct wil6210_priv *wil, bool enable)return rc; } -int wmi_pcp_start (struct wil6210_vif *vif, -int bi,u8 wmi_nettype,u8 chan,u8 hidden_ssid,u8 is_go) +int wmi_pcp_start (struct wil6210_vif *vif,int bi,u8 wmi_nettype, +u8 chan,u8 wmi_edmg_chan,u8 hidden_ssid,u8 is_go) {struct wil6210_priv *wil =vif_to_wil (vif);int rc;
@@ -2134,6 +2134,7 @@ int wmi_pcp_start(struct wil6210_vif *vif, .network_type = wmi_nettype, .disable_sec_offload = 1, .channel = chan - 1, + .edmg_channel = wmi_edmg_chan, .pcp_max_assoc_sta = max_assoc_sta, .hidden_ssid = hidden_ssid, .is_go = is_go,
drivers/net/wireless/ath/wil6210/wmi.h +27 -3
@@ -95,6 +95,7 @@ enum wmi_fw_capability {WMI_FW_CAPABILITY_SET_SILENT_RSSI_TABLE =13 ,WMI_FW_CAPABILITY_LO_POWER_CALIB_FROM_OTP =14 ,WMI_FW_CAPABILITY_PNO =15 , +WMI_FW_CAPABILITY_CHANNEL_BONDING =17 ,WMI_FW_CAPABILITY_REF_CLOCK_CONTROL =18 ,WMI_FW_CAPABILITY_AP_SME_OFFLOAD_NONE =19 , WMI_FW_CAPABILITY_MULTI_VIFS = 20,
@@ -355,6 +356,19 @@ enum wmi_connect_ctrl_flag_bits {#define WMI_MAX_SSID_LEN (32) +enum wmi_channel { +WMI_CHANNEL_1 =0x00 , +WMI_CHANNEL_2 =0x01 , +WMI_CHANNEL_3 =0x02 , +WMI_CHANNEL_4 =0x03 , +WMI_CHANNEL_5 =0x04 , +WMI_CHANNEL_6 =0x05 , +WMI_CHANNEL_9 =0x06 , +WMI_CHANNEL_10 =0x07 , +WMI_CHANNEL_11 =0x08 , +WMI_CHANNEL_12 =0x09 , +}; +/* WMI_CONNECT_CMDID */ struct wmi_connect_cmd {u8 network_type;
@@ -366,8 +380,12 @@ struct wmi_connect_cmd {u8 group_crypto_len;u8 ssid_len;u8 ssid[WMI_MAX_SSID_LEN ]; +/* enum wmi_channel WMI_CHANNEL_1..WMI_CHANNEL_6; for EDMG this is +* the primary channel number +*/ u8 channel; -u8 reserved0; +/* enum wmi_channel WMI_CHANNEL_9..WMI_CHANNEL_12 */ +u8 edmg_channel;u8 bssid[WMI_MAC_LEN ];__le32 ctrl_flags;u8 dst_mac[WMI_MAC_LEN ];
@@ -2267,7 +2285,9 @@ struct wmi_notify_req_done_event {__le32 status;__le64 tsf;s8 rssi; -u8 reserved0[3 ]; +/* enum wmi_edmg_tx_mode */ +u8 tx_mode; +u8 reserved0[2 ];__le32 tx_tpt;__le32 tx_goodput;__le32 rx_goodput;
@@ -2283,8 +2303,12 @@ struct wmi_notify_req_done_event {/* WMI_CONNECT_EVENTID */ struct wmi_connect_event { +/* enum wmi_channel WMI_CHANNEL_1..WMI_CHANNEL_6; for EDMG this is +* the primary channel number +*/ u8 channel; -u8 reserved0; +/* enum wmi_channel WMI_CHANNEL_9..WMI_CHANNEL_12 */ +u8 edmg_channel;u8 bssid[WMI_MAC_LEN ];__le16 listen_interval;__le16 beacon_interval;
Signature · 1 line
1.9.1