Commit 72bb2725 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

Revert "wifi: iwlwifi: add support for BE213" 



This reverts commit 16a8d9a7.

This device needs commit 75a3313f ("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: default avatarTodd Brandt <todd.e.brandt@intel.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220029


Fixes: 16a8d9a7 ("wifi: iwlwifi: add support for BE213")
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250420115541.581160ae3e4b.Icecc46baee8a797c00ad04fab92d7d1114b84829@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent abf078c0

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

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ const struct iwl_cfg_trans_params iwl_sc_trans_cfg = { 
	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_sp_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz";



const struct iwl_cfg iwl_cfg_sc = {

	.fw_name_mac = "sc",

	IWL_DEVICE_SC,

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

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ extern const char iwl_ax231_name[]; 
extern const char iwl_ax411_name[];

extern const char iwl_fm_name[];

extern const char iwl_wh_name[];

extern const char iwl_sp_name[];

extern const char iwl_gl_name[];

extern const char iwl_mtp_name[];

extern const char iwl_dr_name[];

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

+4 −8
Original line number Diff line number Diff line
@@ -944,8 +944,7 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, 
				       IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK);

		break;

	case NL80211_BAND_6GHZ:

		if (!trans->reduced_cap_sku &&

		    trans->bw_limit >= 320) {

		if (!trans->reduced_cap_sku) {

			iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |=

				IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;

			iftype_data->eht_cap.eht_cap_elem.phy_cap_info[1] |=
@@ -1099,18 +1098,15 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, 
		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &=

			~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;



	if (trans->bw_limit < 320 || trans->reduced_cap_sku) {

	if (trans->reduced_cap_sku) {

		memset(&iftype_data->eht_cap.eht_mcs_nss_supp.bw._320, 0,

		       sizeof(iftype_data->eht_cap.eht_mcs_nss_supp.bw._320));

		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &=

			~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK;

	}



	if (trans->reduced_cap_sku) {

		iftype_data->eht_cap.eht_mcs_nss_supp.bw._80.rx_tx_mcs13_max_nss = 0;

		iftype_data->eht_cap.eht_mcs_nss_supp.bw._160.rx_tx_mcs13_max_nss = 0;

		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[8] &=

			~IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA;

		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &=

			~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK;

	}

}

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

+3 −18
Original line number Diff line number Diff line
@@ -1187,13 +1187,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc, iwl_wh_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      160, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc, iwl_sp_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      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[] = { 
	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2, iwl_wh_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      160, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2, iwl_sp_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      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[] = { 
	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_wh_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      160, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_sp_name),



/* Dr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,