Commit 5afe98b2 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.e98272ddb808.If18577b2393f631d1bfaa931287cae106fa32438@changeid


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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ static const struct iwl_base_params iwl_sc_base_params = { 
		},							\

		},							\

	},								\

	},								\

	.trans.umac_prph_offset = 0x300000,				\

	.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,			\

	.trans.base_params = &iwl_sc_base_params,			\

	.min_txq_size = 128,						\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.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

#define IWL_NUM_RBDS_SC_HE		4096





const struct iwl_cfg_trans_params iwl_sc_trans_cfg = {

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,

	.base_params = &iwl_sc_base_params,

	.mq_rx_supported = true,

	.mq_rx_supported = true,

	.rf_id = true,

	.rf_id = true,

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ enum iwl_device_family { 
	IWL_DEVICE_FAMILY_22000,

	IWL_DEVICE_FAMILY_22000,

	IWL_DEVICE_FAMILY_AX210,

	IWL_DEVICE_FAMILY_AX210,

	IWL_DEVICE_FAMILY_BZ,

	IWL_DEVICE_FAMILY_BZ,

	IWL_DEVICE_FAMILY_SC,

};

};





/*

/*