wifi: iwlwifi: give Sc devices their own family

They're not the same as Bz or any prior ones, and there's
already one place in the driver that would erroneously
assign a workaround to A-step Sc devices if they're just
treated as a version of Bz. Fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.e98272ddb808.If18577b2393f631d1bfaa931287cae106fa32438@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index a294c88..296ac68 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
@@ -96,7 +96,7 @@ static const struct iwl_base_params iwl_sc_base_params = {
                },                                                      \
        },                                                              \
        .trans.umac_prph_offset = 0x300000,                             \
-       .trans.device_family = IWL_DEVICE_FAMILY_BZ,                    \
+       .trans.device_family = IWL_DEVICE_FAMILY_SC,                    \
        .trans.base_params = &iwl_sc_base_params,                       \
        .min_txq_size = 128,                                            \
        .gp2_reg_addr = 0xd02c68,                                       \
@@ -135,7 +135,7 @@ static const struct iwl_base_params iwl_sc_base_params = {
 #define IWL_NUM_RBDS_SC_HE             4096
 
 const struct iwl_cfg_trans_params iwl_sc_trans_cfg = {
-       .device_family = IWL_DEVICE_FAMILY_BZ,
+       .device_family = IWL_DEVICE_FAMILY_SC,
        .base_params = &iwl_sc_base_params,
        .mq_rx_supported = true,
        .rf_id = true,

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 5c6ab5b..ef5154c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -35,6 +35,7 @@ enum iwl_device_family {
        IWL_DEVICE_FAMILY_22000,
        IWL_DEVICE_FAMILY_AX210,
        IWL_DEVICE_FAMILY_BZ,
+       IWL_DEVICE_FAMILY_SC,
 };
 
 /*