mirror of
https://github.com/armbian/build.git
synced 2025-08-12 14:16:57 +02:00
f80117f21c
* Recycling of megous v5.16.4 patches The patches were sorted as far as possible. Some patches are renamed according to their place of application. The length of the patch name has been changed to improve readability using the `git format-patch --filename-max-length=75` method. The folder containing the patches will have the name `patches.name` and the corresponding file `series.name` for the convenience of processing and moving them upstream. But the control file remains `series.conf`. Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> * Add a series of armbian patches for 5.16 Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> * Remove patches whose fixes are already in the kernel Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
166 lines
7.5 KiB
Diff
166 lines
7.5 KiB
Diff
From fea554601c132f60760ef10b67f7309a9d4f9a78 Mon Sep 17 00:00:00 2001
|
|
From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
|
|
Date: Fri, 26 Nov 2021 10:48:19 +0100
|
|
Subject: [PATCH 282/446] ieee80211: change HE nominal packet padding value
|
|
defines
|
|
|
|
It's easier to use and understand, and to extend for EHT later,
|
|
if we use the values here instead of the shifted values.
|
|
|
|
Unfortunately, we need to add _POS so that we can use it in
|
|
places like iwlwifi/mvm where constants are needed.
|
|
|
|
While at it, fix the typo ("NOMIMAL") which also helps catch any
|
|
conflicts.
|
|
|
|
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
|
|
Link: https://lore.kernel.org/r/20211126104817.7c29a05b8eb5.I2ca9faf06e177e3035bec91e2ae53c2f91d41774@changeid
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
.../net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 ++++--
|
|
.../net/wireless/intel/iwlwifi/mvm/mac80211.c | 16 ++++++++--------
|
|
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 ++-
|
|
drivers/net/wireless/mediatek/mt76/mt7921/main.c | 3 ++-
|
|
include/linux/ieee80211.h | 11 ++++++-----
|
|
net/mac80211/debugfs_sta.c | 9 +++++----
|
|
6 files changed, 27 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
index f470f9aea..881ede4a4 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
@@ -607,7 +607,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {
|
|
.phy_cap_info[9] =
|
|
IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
|
|
IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,
|
|
+ (IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED <<
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS),
|
|
.phy_cap_info[10] =
|
|
IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF,
|
|
},
|
|
@@ -664,7 +665,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {
|
|
IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |
|
|
IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242,
|
|
.phy_cap_info[9] =
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED
|
|
+ << IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS,
|
|
},
|
|
/*
|
|
* Set default Tx/Rx HE MCS NSS Support field.
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
index 9c5c10908..6f00a0362 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
@@ -2165,24 +2165,24 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,
|
|
}
|
|
|
|
flags |= STA_CTXT_HE_PACKET_EXT;
|
|
- } else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] &
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {
|
|
+ } else if (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)
|
|
+ != IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED) {
|
|
int low_th = -1;
|
|
int high_th = -1;
|
|
|
|
/* Take the PPE thresholds from the nominal padding info */
|
|
- switch (sta->he_cap.he_cap_elem.phy_cap_info[9] &
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:
|
|
+ switch (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)) {
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US:
|
|
low_th = IWL_HE_PKT_EXT_NONE;
|
|
high_th = IWL_HE_PKT_EXT_NONE;
|
|
break;
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US:
|
|
low_th = IWL_HE_PKT_EXT_BPSK;
|
|
high_th = IWL_HE_PKT_EXT_NONE;
|
|
break;
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US:
|
|
low_th = IWL_HE_PKT_EXT_NONE;
|
|
high_th = IWL_HE_PKT_EXT_BPSK;
|
|
break;
|
|
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
|
|
index 4fa8e7ba9..d054cdecd 100644
|
|
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
|
|
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
|
|
@@ -853,7 +853,8 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
|
|
mt7915_gen_ppe_thresh(he_cap->ppe_thres, nss);
|
|
} else {
|
|
he_cap_elem->phy_cap_info[9] |=
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;
|
|
+ u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);
|
|
}
|
|
idx++;
|
|
}
|
|
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
|
|
index 8c55562c1..6fc6ce431 100644
|
|
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
|
|
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
|
|
@@ -140,7 +140,8 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,
|
|
mt7921_gen_ppe_thresh(he_cap->ppe_thres, nss);
|
|
} else {
|
|
he_cap_elem->phy_cap_info[9] |=
|
|
- IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;
|
|
+ u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);
|
|
}
|
|
|
|
if (band == NL80211_BAND_6GHZ) {
|
|
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
|
|
index 11d7af260..559b6c644 100644
|
|
--- a/include/linux/ieee80211.h
|
|
+++ b/include/linux/ieee80211.h
|
|
@@ -2258,11 +2258,12 @@ enum ieee80211_client_reg_power {
|
|
#define IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU 0x08
|
|
#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB 0x10
|
|
#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB 0x20
|
|
-#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US 0x00
|
|
-#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US 0x40
|
|
-#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US 0x80
|
|
-#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED 0xc0
|
|
-#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK 0xc0
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US 0x0
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US 0x1
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US 0x2
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED 0x3
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS 6
|
|
+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK 0xc0
|
|
|
|
#define IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF 0x01
|
|
|
|
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
|
|
index 481f01b0f..9479f2787 100644
|
|
--- a/net/mac80211/debugfs_sta.c
|
|
+++ b/net/mac80211/debugfs_sta.c
|
|
@@ -936,14 +936,15 @@ static ssize_t sta_he_capa_read(struct file *file, char __user *userbuf,
|
|
PFLAG(PHY, 9, RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,
|
|
"RX-FULL-BW-SU-USING-MU-WITH-NON-COMP-SIGB");
|
|
|
|
- switch (cap[9] & IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:
|
|
+ switch (u8_get_bits(cap[9],
|
|
+ IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)) {
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US:
|
|
PRINT("NOMINAL-PACKET-PADDING-0US");
|
|
break;
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US:
|
|
PRINT("NOMINAL-PACKET-PADDING-8US");
|
|
break;
|
|
- case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:
|
|
+ case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US:
|
|
PRINT("NOMINAL-PACKET-PADDING-16US");
|
|
break;
|
|
}
|
|
--
|
|
2.31.1
|
|
|