[PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
@ 2021-09-13 17:55 ` Jouni Malinen
  0 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 include/linux/ieee80211.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 694264503119..a1a7eda35cb5 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 
 #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
+#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
 
 /* 802.11ax HE PHY capabilities */
 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
@ 2021-09-13 17:55 ` Jouni Malinen
  0 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 include/linux/ieee80211.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 694264503119..a1a7eda35cb5 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 
 #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
+#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
 
 /* 802.11ax HE PHY capabilities */
 #define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02
-- 
2.25.1


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 2/3] ath11k: add 6 GHz params in peer assoc command
  2021-09-13 17:55 ` Jouni Malinen
@ 2021-09-13 17:55   ` Jouni Malinen
  -1 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Currently A-MPDU aggregation parameters are not being configured
during peer association for 6 GHz band. Hence, extract these
parameters from station's capabilities received in association
request and send to firmware. Without this, A-MPDU aggregation
is not happening in 6 GHz band.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 50 ++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 04a8f82e3a17..aba005241095 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1959,6 +1959,53 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
 		   arg->peer_bw_rxnss_override);
 }
 
+static void ath11k_peer_assoc_h_he_6ghz(struct ath11k *ar,
+					struct ieee80211_vif *vif,
+					struct ieee80211_sta *sta,
+					struct peer_assoc_params *arg)
+{
+	const struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
+	struct cfg80211_chan_def def;
+	enum nl80211_band band;
+	u8  ampdu_factor;
+
+	if (WARN_ON(ath11k_mac_vif_chan(vif, &def)))
+		return;
+
+	band = def.chan->band;
+
+	if (!arg->he_flag || band != NL80211_BAND_6GHZ || !sta->he_6ghz_capa.capa)
+		return;
+
+	if (sta->bandwidth == IEEE80211_STA_RX_BW_80)
+		arg->bw_80 = true;
+
+	if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
+		arg->bw_160 = true;
+
+	arg->peer_he_caps_6ghz = le16_to_cpu(sta->he_6ghz_capa.capa);
+	arg->peer_mpdu_density =
+		ath11k_parse_mpdudensity(FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START,
+						   arg->peer_he_caps_6ghz));
+
+	/* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of
+	 * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value
+	 * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE
+	 * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz
+	 * Band Capabilities element in the 6 GHz band.
+	 *
+	 * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and
+	 * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability.
+	 */
+	ampdu_factor = FIELD_GET(IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK,
+				 he_cap->he_cap_elem.mac_cap_info[3]) +
+			FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP,
+				  arg->peer_he_caps_6ghz);
+
+	arg->peer_max_mpdu = (1u << (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR +
+				     ampdu_factor)) - 1;
+}
+
 static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
 				     struct peer_assoc_params *arg)
 {
@@ -2248,6 +2295,7 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,
 	ath11k_peer_assoc_h_ht(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_vht(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_he(ar, vif, sta, arg);
+	ath11k_peer_assoc_h_he_6ghz(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_qos(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_smps(sta, arg);
 
@@ -7496,7 +7544,7 @@ static int __ath11k_mac_register(struct ath11k *ar)
 	if (cap->nss_ratio_enabled)
 		ieee80211_hw_set(ar->hw, SUPPORTS_VHT_EXT_NSS_BW);
 
-	if (ht_cap & WMI_HT_CAP_ENABLED) {
+	if ((ht_cap & WMI_HT_CAP_ENABLED) || ar->supports_6ghz) {
 		ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION);
 		ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW);
 		ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 2/3] ath11k: add 6 GHz params in peer assoc command
@ 2021-09-13 17:55   ` Jouni Malinen
  0 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Currently A-MPDU aggregation parameters are not being configured
during peer association for 6 GHz band. Hence, extract these
parameters from station's capabilities received in association
request and send to firmware. Without this, A-MPDU aggregation
is not happening in 6 GHz band.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 50 ++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 04a8f82e3a17..aba005241095 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1959,6 +1959,53 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
 		   arg->peer_bw_rxnss_override);
 }
 
+static void ath11k_peer_assoc_h_he_6ghz(struct ath11k *ar,
+					struct ieee80211_vif *vif,
+					struct ieee80211_sta *sta,
+					struct peer_assoc_params *arg)
+{
+	const struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;
+	struct cfg80211_chan_def def;
+	enum nl80211_band band;
+	u8  ampdu_factor;
+
+	if (WARN_ON(ath11k_mac_vif_chan(vif, &def)))
+		return;
+
+	band = def.chan->band;
+
+	if (!arg->he_flag || band != NL80211_BAND_6GHZ || !sta->he_6ghz_capa.capa)
+		return;
+
+	if (sta->bandwidth == IEEE80211_STA_RX_BW_80)
+		arg->bw_80 = true;
+
+	if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
+		arg->bw_160 = true;
+
+	arg->peer_he_caps_6ghz = le16_to_cpu(sta->he_6ghz_capa.capa);
+	arg->peer_mpdu_density =
+		ath11k_parse_mpdudensity(FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START,
+						   arg->peer_he_caps_6ghz));
+
+	/* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of
+	 * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value
+	 * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE
+	 * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz
+	 * Band Capabilities element in the 6 GHz band.
+	 *
+	 * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and
+	 * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability.
+	 */
+	ampdu_factor = FIELD_GET(IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK,
+				 he_cap->he_cap_elem.mac_cap_info[3]) +
+			FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP,
+				  arg->peer_he_caps_6ghz);
+
+	arg->peer_max_mpdu = (1u << (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR +
+				     ampdu_factor)) - 1;
+}
+
 static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
 				     struct peer_assoc_params *arg)
 {
@@ -2248,6 +2295,7 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,
 	ath11k_peer_assoc_h_ht(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_vht(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_he(ar, vif, sta, arg);
+	ath11k_peer_assoc_h_he_6ghz(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_qos(ar, vif, sta, arg);
 	ath11k_peer_assoc_h_smps(sta, arg);
 
@@ -7496,7 +7544,7 @@ static int __ath11k_mac_register(struct ath11k *ar)
 	if (cap->nss_ratio_enabled)
 		ieee80211_hw_set(ar->hw, SUPPORTS_VHT_EXT_NSS_BW);
 
-	if (ht_cap & WMI_HT_CAP_ENABLED) {
+	if ((ht_cap & WMI_HT_CAP_ENABLED) || ar->supports_6ghz) {
 		ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION);
 		ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW);
 		ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER);
-- 
2.25.1


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 3/3] ath11k: support SMPS configuration for 6 GHz
  2021-09-13 17:55 ` Jouni Malinen
@ 2021-09-13 17:55   ` Jouni Malinen
  -1 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Parse SMPS configuration from IEs and configure. Without this,
SMPS is not enabled for 6 GHz band.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 31 ++++++++++++++++++---------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index aba005241095..155ca6af1b45 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2012,11 +2012,16 @@ static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
 	const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
 	int smps;
 
-	if (!ht_cap->ht_supported)
+	if (!ht_cap->ht_supported && !sta->he_6ghz_capa.capa)
 		return;
 
-	smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
-	smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	if (ht_cap->ht_supported) {
+		smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
+		smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	} else {
+		smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
+				 le16_to_cpu(sta->he_6ghz_capa.capa));
+	}
 
 	switch (smps) {
 	case WLAN_HT_CAP_SM_PS_STATIC:
@@ -2304,15 +2309,20 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,
 
 static int ath11k_setup_peer_smps(struct ath11k *ar, struct ath11k_vif *arvif,
 				  const u8 *addr,
-				  const struct ieee80211_sta_ht_cap *ht_cap)
+				  const struct ieee80211_sta_ht_cap *ht_cap,
+				  u16 he_6ghz_capa)
 {
 	int smps;
 
-	if (!ht_cap->ht_supported)
+	if (!ht_cap->ht_supported && !he_6ghz_capa)
 		return 0;
 
-	smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
-	smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	if (ht_cap->ht_supported) {
+		smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
+		smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	} else {
+		smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, he_6ghz_capa);
+	}
 
 	if (smps >= ARRAY_SIZE(ath11k_smps_map))
 		return -EINVAL;
@@ -2366,7 +2376,8 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,
 	}
 
 	ret = ath11k_setup_peer_smps(ar, arvif, bss_conf->bssid,
-				     &ap_sta->ht_cap);
+				     &ap_sta->ht_cap,
+				     le16_to_cpu(ap_sta->he_6ghz_capa.capa));
 	if (ret) {
 		ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
 			    arvif->vdev_id, ret);
@@ -3656,7 +3667,7 @@ static int ath11k_station_assoc(struct ath11k *ar,
 		return 0;
 
 	ret = ath11k_setup_peer_smps(ar, arvif, sta->addr,
-				     &sta->ht_cap);
+				     &sta->ht_cap, le16_to_cpu(sta->he_6ghz_capa.capa));
 	if (ret) {
 		ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
 			    arvif->vdev_id, ret);
@@ -7559,7 +7570,7 @@ static int __ath11k_mac_register(struct ath11k *ar)
 	 * for each band for a dual band capable radio. It will be tricky to
 	 * handle it when the ht capability different for each band.
 	 */
-	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS)
+	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz)
 		ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
 
 	ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 3/3] ath11k: support SMPS configuration for 6 GHz
@ 2021-09-13 17:55   ` Jouni Malinen
  0 siblings, 0 replies; 14+ messages in thread
From: Jouni Malinen @ 2021-09-13 17:55 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>

Parse SMPS configuration from IEs and configure. Without this,
SMPS is not enabled for 6 GHz band.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1

Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 31 ++++++++++++++++++---------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index aba005241095..155ca6af1b45 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2012,11 +2012,16 @@ static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta,
 	const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
 	int smps;
 
-	if (!ht_cap->ht_supported)
+	if (!ht_cap->ht_supported && !sta->he_6ghz_capa.capa)
 		return;
 
-	smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
-	smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	if (ht_cap->ht_supported) {
+		smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
+		smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	} else {
+		smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
+				 le16_to_cpu(sta->he_6ghz_capa.capa));
+	}
 
 	switch (smps) {
 	case WLAN_HT_CAP_SM_PS_STATIC:
@@ -2304,15 +2309,20 @@ static void ath11k_peer_assoc_prepare(struct ath11k *ar,
 
 static int ath11k_setup_peer_smps(struct ath11k *ar, struct ath11k_vif *arvif,
 				  const u8 *addr,
-				  const struct ieee80211_sta_ht_cap *ht_cap)
+				  const struct ieee80211_sta_ht_cap *ht_cap,
+				  u16 he_6ghz_capa)
 {
 	int smps;
 
-	if (!ht_cap->ht_supported)
+	if (!ht_cap->ht_supported && !he_6ghz_capa)
 		return 0;
 
-	smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
-	smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	if (ht_cap->ht_supported) {
+		smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
+		smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
+	} else {
+		smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, he_6ghz_capa);
+	}
 
 	if (smps >= ARRAY_SIZE(ath11k_smps_map))
 		return -EINVAL;
@@ -2366,7 +2376,8 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,
 	}
 
 	ret = ath11k_setup_peer_smps(ar, arvif, bss_conf->bssid,
-				     &ap_sta->ht_cap);
+				     &ap_sta->ht_cap,
+				     le16_to_cpu(ap_sta->he_6ghz_capa.capa));
 	if (ret) {
 		ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
 			    arvif->vdev_id, ret);
@@ -3656,7 +3667,7 @@ static int ath11k_station_assoc(struct ath11k *ar,
 		return 0;
 
 	ret = ath11k_setup_peer_smps(ar, arvif, sta->addr,
-				     &sta->ht_cap);
+				     &sta->ht_cap, le16_to_cpu(sta->he_6ghz_capa.capa));
 	if (ret) {
 		ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
 			    arvif->vdev_id, ret);
@@ -7559,7 +7570,7 @@ static int __ath11k_mac_register(struct ath11k *ar)
 	 * for each band for a dual band capable radio. It will be tricky to
 	 * handle it when the ht capability different for each band.
 	 */
-	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS)
+	if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz)
 		ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
 
 	ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;
-- 
2.25.1


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
  2021-09-13 17:55 ` Jouni Malinen
@ 2021-09-16 15:10   ` Kalle Valo
  -1 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-16 15:10 UTC (permalink / raw)
  To: Johannes Berg
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Jouni Malinen <jouni@codeaurora.org> writes:

> From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>
> Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
>
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> ---
>  include/linux/ieee80211.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> index 694264503119..a1a7eda35cb5 100644
> --- a/include/linux/ieee80211.h
> +++ b/include/linux/ieee80211.h
> @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
>  
>  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
>  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
> +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13

Johannes, can I take this via my ath tree? I think that's the easiest as
the ath11k patches depend on this.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
@ 2021-09-16 15:10   ` Kalle Valo
  0 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-16 15:10 UTC (permalink / raw)
  To: Johannes Berg
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Jouni Malinen <jouni@codeaurora.org> writes:

> From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>
> Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
>
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> ---
>  include/linux/ieee80211.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> index 694264503119..a1a7eda35cb5 100644
> --- a/include/linux/ieee80211.h
> +++ b/include/linux/ieee80211.h
> @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
>  
>  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
>  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
> +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13

Johannes, can I take this via my ath tree? I think that's the easiest as
the ath11k patches depend on this.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
  2021-09-16 15:10   ` Kalle Valo
@ 2021-09-16 16:02     ` Johannes Berg
  -1 siblings, 0 replies; 14+ messages in thread
From: Johannes Berg @ 2021-09-16 16:02 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

On Thu, 2021-09-16 at 18:10 +0300, Kalle Valo wrote:
> Jouni Malinen <jouni@codeaurora.org> writes:
> 
> > From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> > 
> > Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> > 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
> > 
> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> > Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> > ---
> >  include/linux/ieee80211.h | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> > index 694264503119..a1a7eda35cb5 100644
> > --- a/include/linux/ieee80211.h
> > +++ b/include/linux/ieee80211.h
> > @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
> >  
> > 
> > 
> > 
> >  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
> >  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
> > +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
> 
> Johannes, can I take this via my ath tree? I think that's the easiest as
> the ath11k patches depend on this.
> 
Sure, looks fine.

Acked-by: Johannes Berg <johannes@sipsolutions.net>

johannes


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
@ 2021-09-16 16:02     ` Johannes Berg
  0 siblings, 0 replies; 14+ messages in thread
From: Johannes Berg @ 2021-09-16 16:02 UTC (permalink / raw)
  To: Kalle Valo; +Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

On Thu, 2021-09-16 at 18:10 +0300, Kalle Valo wrote:
> Jouni Malinen <jouni@codeaurora.org> writes:
> 
> > From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> > 
> > Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> > 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
> > 
> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> > Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> > ---
> >  include/linux/ieee80211.h | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> > index 694264503119..a1a7eda35cb5 100644
> > --- a/include/linux/ieee80211.h
> > +++ b/include/linux/ieee80211.h
> > @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
> >  
> > 
> > 
> > 
> >  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
> >  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
> > +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
> 
> Johannes, can I take this via my ath tree? I think that's the easiest as
> the ath11k patches depend on this.
> 
Sure, looks fine.

Acked-by: Johannes Berg <johannes@sipsolutions.net>

johannes


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
  2021-09-16 16:02     ` Johannes Berg
@ 2021-09-16 16:43       ` Kalle Valo
  -1 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-16 16:43 UTC (permalink / raw)
  To: Johannes Berg
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Johannes Berg <johannes@sipsolutions.net> writes:

> On Thu, 2021-09-16 at 18:10 +0300, Kalle Valo wrote:
>> Jouni Malinen <jouni@codeaurora.org> writes:
>> 
>> > From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>> > 
>> > Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
>> > 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
>> > 
>> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>> > Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
>> > ---
>> >  include/linux/ieee80211.h | 1 +
>> >  1 file changed, 1 insertion(+)
>> > 
>> > diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
>> > index 694264503119..a1a7eda35cb5 100644
>> > --- a/include/linux/ieee80211.h
>> > +++ b/include/linux/ieee80211.h
>> > @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
>> >  
>> > 
>> > 
>> > 
>> >  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
>> >  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
>> > +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
>> 
>> Johannes, can I take this via my ath tree? I think that's the easiest as
>> the ath11k patches depend on this.
>> 
> Sure, looks fine.
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>

Thanks! I assigned this to me on patchwork.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
@ 2021-09-16 16:43       ` Kalle Valo
  0 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-16 16:43 UTC (permalink / raw)
  To: Johannes Berg
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Johannes Berg <johannes@sipsolutions.net> writes:

> On Thu, 2021-09-16 at 18:10 +0300, Kalle Valo wrote:
>> Jouni Malinen <jouni@codeaurora.org> writes:
>> 
>> > From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>> > 
>> > Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
>> > 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
>> > 
>> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>> > Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
>> > ---
>> >  include/linux/ieee80211.h | 1 +
>> >  1 file changed, 1 insertion(+)
>> > 
>> > diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
>> > index 694264503119..a1a7eda35cb5 100644
>> > --- a/include/linux/ieee80211.h
>> > +++ b/include/linux/ieee80211.h
>> > @@ -2084,6 +2084,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
>> >  
>> > 
>> > 
>> > 
>> >  #define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20
>> >  #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16
>> > +#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13
>> 
>> Johannes, can I take this via my ath tree? I think that's the easiest as
>> the ath11k patches depend on this.
>> 
> Sure, looks fine.
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>

Thanks! I assigned this to me on patchwork.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
  2021-09-13 17:55 ` Jouni Malinen
                   ` (3 preceding siblings ...)
  (?)
@ 2021-09-28 14:00 ` Kalle Valo
  -1 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-28 14:00 UTC (permalink / raw)
  To: Jouni Malinen
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Jouni Malinen <jouni@codeaurora.org> wrote:

> Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
> 
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

3 patches applied to ath-next branch of ath.git, thanks.

62b8963cd84d ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
c3a7d7eb4c98 ath11k: add 6 GHz params in peer assoc command
6f4d70308e5e ath11k: support SMPS configuration for 6 GHz

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210913175510.193005-1-jouni@codeaurora.org/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
  2021-09-13 17:55 ` Jouni Malinen
                   ` (4 preceding siblings ...)
  (?)
@ 2021-09-28 14:00 ` Kalle Valo
  -1 siblings, 0 replies; 14+ messages in thread
From: Kalle Valo @ 2021-09-28 14:00 UTC (permalink / raw)
  To: Jouni Malinen
  Cc: ath11k, linux-wireless, Pradeep Kumar Chitrapu, Jouni Malinen

Jouni Malinen <jouni@codeaurora.org> wrote:

> Add IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR as per IEEE Std 802.11ax-2021,
> 9.4.2.263 to use for peer max A-MPDU factor in 6 GHz band.
> 
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

3 patches applied to ath-next branch of ath.git, thanks.

62b8963cd84d ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps
c3a7d7eb4c98 ath11k: add 6 GHz params in peer assoc command
6f4d70308e5e ath11k: support SMPS configuration for 6 GHz

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210913175510.193005-1-jouni@codeaurora.org/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-09-28 14:01 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13 17:55 [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps Jouni Malinen
2021-09-13 17:55 ` Jouni Malinen
2021-09-13 17:55 ` [PATCH 2/3] ath11k: add 6 GHz params in peer assoc command Jouni Malinen
2021-09-13 17:55   ` Jouni Malinen
2021-09-13 17:55 ` [PATCH 3/3] ath11k: support SMPS configuration for 6 GHz Jouni Malinen
2021-09-13 17:55   ` Jouni Malinen
2021-09-16 15:10 ` [PATCH 1/3] ieee80211: Add new A-MPDU factor macro for HE 6 GHz peer caps Kalle Valo
2021-09-16 15:10   ` Kalle Valo
2021-09-16 16:02   ` Johannes Berg
2021-09-16 16:02     ` Johannes Berg
2021-09-16 16:43     ` Kalle Valo
2021-09-16 16:43       ` Kalle Valo
2021-09-28 14:00 ` Kalle Valo
2021-09-28 14:00 ` Kalle Valo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.