Skip to content

Commit 72bb272

Browse files
Miriam-Racheljmberg-intel
Miriam-Rachel
authored and
jmberg-intel
committed
Revert "wifi: iwlwifi: add support for BE213"
This reverts commit 16a8d9a. This device needs commit 75a3313 ("wifi: iwlwifi: make no_160 more generic"), which has a bug and is being reverted until it is fixed. Since this device wasn't shipped yet it is ok to not support it. Reported-by: Todd Brandt <todd.e.brandt@intel.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220029 Fixes: 16a8d9a ("wifi: iwlwifi: add support for BE213") Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20250420115541.581160ae3e4b.Icecc46baee8a797c00ad04fab92d7d1114b84829@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent abf078c commit 72bb272

4 files changed

Lines changed: 7 additions & 29 deletions

File tree

‎drivers/net/wireless/intel/iwlwifi/cfg/sc.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ const struct iwl_cfg_trans_params iwl_sc_trans_cfg = {
142142
.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,
143143
};
144144

145-
const char iwl_sp_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz";
146-
147145
const struct iwl_cfg iwl_cfg_sc = {
148146
.fw_name_mac = "sc",
149147
IWL_DEVICE_SC,

‎drivers/net/wireless/intel/iwlwifi/iwl-config.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ extern const char iwl_ax231_name[];
550550
extern const char iwl_ax411_name[];
551551
extern const char iwl_fm_name[];
552552
extern const char iwl_wh_name[];
553-
extern const char iwl_sp_name[];
554553
extern const char iwl_gl_name[];
555554
extern const char iwl_mtp_name[];
556555
extern const char iwl_dr_name[];

‎drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,7 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
944944
IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK);
945945
break;
946946
case NL80211_BAND_6GHZ:
947-
if (!trans->reduced_cap_sku &&
948-
trans->bw_limit >= 320) {
947+
if (!trans->reduced_cap_sku) {
949948
iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |=
950949
IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
951950
iftype_data->eht_cap.eht_cap_elem.phy_cap_info[1] |=
@@ -1099,18 +1098,15 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
10991098
iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &=
11001099
~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
11011100

1102-
if (trans->bw_limit < 320 || trans->reduced_cap_sku) {
1101+
if (trans->reduced_cap_sku) {
11031102
memset(&iftype_data->eht_cap.eht_mcs_nss_supp.bw._320, 0,
11041103
sizeof(iftype_data->eht_cap.eht_mcs_nss_supp.bw._320));
1105-
iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &=
1106-
~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK;
1107-
}
1108-
1109-
if (trans->reduced_cap_sku) {
11101104
iftype_data->eht_cap.eht_mcs_nss_supp.bw._80.rx_tx_mcs13_max_nss = 0;
11111105
iftype_data->eht_cap.eht_mcs_nss_supp.bw._160.rx_tx_mcs13_max_nss = 0;
11121106
iftype_data->eht_cap.eht_cap_elem.phy_cap_info[8] &=
11131107
~IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA;
1108+
iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &=
1109+
~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK;
11141110
}
11151111
}
11161112

‎drivers/net/wireless/intel/iwlwifi/pcie/drv.c‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,13 +1187,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
11871187
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
11881188
IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,
11891189
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1190-
IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,
1190+
IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,
11911191
iwl_cfg_sc, iwl_wh_name),
1192-
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1193-
IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,
1194-
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1195-
160, IWL_CFG_ANY, IWL_CFG_ANY,
1196-
iwl_cfg_sc, iwl_sp_name),
11971192
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
11981193
IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,
11991194
IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1207,13 +1202,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
12071202
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
12081203
IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,
12091204
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1210-
IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,
1205+
IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,
12111206
iwl_cfg_sc2, iwl_wh_name),
1212-
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1213-
IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,
1214-
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1215-
160, IWL_CFG_ANY, IWL_CFG_ANY,
1216-
iwl_cfg_sc2, iwl_sp_name),
12171207
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
12181208
IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,
12191209
IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1227,13 +1217,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
12271217
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
12281218
IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,
12291219
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1230-
IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,
1220+
IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,
12311221
iwl_cfg_sc2f, iwl_wh_name),
1232-
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1233-
IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,
1234-
IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,
1235-
160, IWL_CFG_ANY, IWL_CFG_ANY,
1236-
iwl_cfg_sc2f, iwl_sp_name),
12371222

12381223
/* Dr */
12391224
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

0 commit comments

Comments
 (0)