2023-06-21 10:17:34

by Greenman, Gregory

[permalink] [raw]
Subject: [PATCH 04/18] wifi: iwlwifi: give Sc devices their own family

From: Johannes Berg <[email protected]>

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 <[email protected]>
Signed-off-by: Gregory Greenman <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 4 ++--
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index a294c88e6a65..296ac689d075 100644
--- 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 5c6ab5b9930b..ef5154cf114b 100644
--- 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,
};

/*
--
2.38.1