wifi: iwlwifi: remove support of A0 version of FM RF

Remove the support for A0 step of latest wifi-7
FM RF as it is no longer supported.

Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130444.269d55ffbc8e.I4740f32c3d95d4474a82cc153891c92b9bc465db@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index 73736f7..8d5f9dc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -36,12 +36,10 @@
 #define IWL_MA_A_GF_A_FW_PRE           "iwlwifi-ma-a0-gf-a0"
 #define IWL_MA_A_GF4_A_FW_PRE          "iwlwifi-ma-a0-gf4-a0"
 #define IWL_MA_A_MR_A_FW_PRE           "iwlwifi-ma-a0-mr-a0"
-#define IWL_MA_A_FM_A_FW_PRE           "iwlwifi-ma-a0-fm-a0"
 #define IWL_MA_B_HR_B_FW_PRE           "iwlwifi-ma-b0-hr-b0"
 #define IWL_MA_B_GF_A_FW_PRE           "iwlwifi-ma-b0-gf-a0"
 #define IWL_MA_B_GF4_A_FW_PRE          "iwlwifi-ma-b0-gf4-a0"
 #define IWL_MA_B_MR_A_FW_PRE           "iwlwifi-ma-b0-mr-a0"
-#define IWL_MA_B_FM_A_FW_PRE           "iwlwifi-ma-b0-fm-a0"
 
 #define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \
        IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
@@ -59,8 +57,6 @@
        IWL_MA_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \
        IWL_MA_A_MR_A_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(api)          \
-       IWL_MA_A_FM_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(api)          \
        IWL_MA_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_MA_B_GF_A_FW_MODULE_FIRMWARE(api)          \
@@ -69,8 +65,6 @@
        IWL_MA_B_GF4_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_MA_B_MR_A_FW_MODULE_FIRMWARE(api) \
        IWL_MA_B_MR_A_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL_MA_B_FM_A_FW_MODULE_FIRMWARE(api)          \
-       IWL_MA_B_FM_A_FW_PRE "-" __stringify(api) ".ucode"
 
 static const struct iwl_base_params iwl_ax210_base_params = {
        .eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -301,9 +295,7 @@ MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_B_GF_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_B_GF4_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_MA_B_MR_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_MA_B_FM_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index c15dcd9..b9893b2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -29,12 +29,9 @@
 #define IWL_BZ_A_HR_B_FW_PRE           "iwlwifi-bz-a0-hr-b0"
 #define IWL_BZ_A_GF_A_FW_PRE           "iwlwifi-bz-a0-gf-a0"
 #define IWL_BZ_A_GF4_A_FW_PRE          "iwlwifi-bz-a0-gf4-a0"
-#define IWL_BZ_A_FM_A_FW_PRE           "iwlwifi-bz-a0-fm-a0"
-#define IWL_BZ_A_FM4_A_FW_PRE          "iwlwifi-bz-a0-fm4-a0"
 #define IWL_BZ_A_FM_B_FW_PRE           "iwlwifi-bz-a0-fm-b0"
 #define IWL_BZ_A_FM_C_FW_PRE           "iwlwifi-bz-a0-fm-c0"
 #define IWL_BZ_A_FM4_B_FW_PRE          "iwlwifi-bz-a0-fm4-b0"
-#define IWL_GL_A_FM_A_FW_PRE           "iwlwifi-gl-a0-fm-a0"
 #define IWL_GL_B_FM_B_FW_PRE           "iwlwifi-gl-b0-fm-b0"
 #define IWL_GL_C_FM_C_FW_PRE           "iwlwifi-gl-c0-fm-c0"
 
@@ -44,18 +41,12 @@
        IWL_BZ_A_GF_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \
        IWL_BZ_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \
-       IWL_BZ_A_FM_A_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL_BZ_A_FM4_A_MODULE_FIRMWARE(api) \
-       IWL_BZ_A_FM4_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_BZ_A_FM_B_MODULE_FIRMWARE(api) \
        IWL_BZ_A_FM_B_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_BZ_A_FM_C_MODULE_FIRMWARE(api) \
-               IWL_BZ_A_FM_C_FW_PRE "-" __stringify(api) ".ucode"
+       IWL_BZ_A_FM_C_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_BZ_A_FM4_B_MODULE_FIRMWARE(api) \
        IWL_BZ_A_FM4_B_FW_PRE "-" __stringify(api) ".ucode"
-#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \
-       IWL_GL_A_FM_A_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_GL_B_FM_B_MODULE_FIRMWARE(api) \
        IWL_GL_B_FM_B_FW_PRE "-" __stringify(api) ".ucode"
 #define IWL_GL_C_FM_C_MODULE_FIRMWARE(api) \
@@ -73,13 +64,6 @@ static const struct iwl_base_params iwl_bz_base_params = {
        .pcie_l1_allowed = true,
 };
 
-static const struct iwl_ht_params iwl_gl_a_ht_params = {
-       .stbc = false, /* we explicitly disable STBC for GL step A */
-       .ldpc = true,
-       .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ) |
-                     BIT(NL80211_BAND_6GHZ),
-};
-
 #define IWL_DEVICE_BZ_COMMON                                           \
        .ucode_api_max = IWL_BZ_UCODE_API_MAX,                  \
        .ucode_api_min = IWL_BZ_UCODE_API_MIN,                  \
@@ -180,14 +164,6 @@ const struct iwl_cfg iwl_cfg_bz = {
        .num_rbds = IWL_NUM_RBDS_BZ_HE,
 };
 
-const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = {
-       .fw_name_pre = IWL_GL_A_FM_A_FW_PRE,
-       .uhb_supported = true,
-       IWL_DEVICE_GL_A,
-       .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,
-       .num_rbds = IWL_NUM_RBDS_BZ_HE,
-};
-
 const struct iwl_cfg iwl_cfg_gl = {
        .fw_name_mac = "gl",
        .uhb_supported = true,
@@ -200,12 +176,8 @@ const struct iwl_cfg iwl_cfg_gl = {
 MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BZ_A_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BZ_A_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
-
-MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_GL_C_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 1c0cfbb..742096c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -640,7 +640,6 @@ extern const struct iwl_cfg iwl_cfg_so_a0_ms_a0;
 extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;
 
 extern const struct iwl_cfg iwl_cfg_bz;
-extern const struct iwl_cfg iwl_cfg_gl_a0_fm_a0;
 extern const struct iwl_cfg iwl_cfg_gl;
 
 extern const struct iwl_cfg iwl_cfg_sc;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index d3e0ea6..f46cafb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1008,11 +1008,6 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
                      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,
                      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,
                      iwl_cfg_gl, iwl_bz_name),
-       _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_MAC_TYPE_GL, SILICON_A_STEP,
-                     IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_A_STEP,
-                     IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,
-                     iwl_cfg_gl_a0_fm_a0, iwl_bz_name),
 
 /* SoF with JF2 */
        _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,