Commit 9b45ba39 authored by Somashekhar(Som)'s avatar Somashekhar(Som) Committed by Johannes Berg
Browse files

wifi: iwlwifi: pcie: Add support for new device ids 



Add support for new device-ids 0x2730 and 0x272F.

Signed-off-by: default avatarSomashekhar(Som) <somashekhar.puttagangaiah@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20241226174257.6a0db60436e7.I50a66544dde6c88acd9abe4b31badab96ef04cfc@changeid


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

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ iwlwifi-objs += pcie/ctxt-info.o pcie/ctxt-info-gen3.o 
iwlwifi-objs		+= pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o cfg/bz.o cfg/sc.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o cfg/bz.o cfg/sc.o cfg/dr.o

iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

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

0 → 100644
+167 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2024 Intel Corporation

 */

#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-prph.h"

#include "fw/api/txq.h"



/* Highest firmware API version supported */

#define IWL_DR_UCODE_API_MAX	96



/* Lowest firmware API version supported */

#define IWL_DR_UCODE_API_MIN	96



/* NVM versions */

#define IWL_DR_NVM_VERSION		0x0a1d



/* Memory offsets and lengths */

#define IWL_DR_DCCM_OFFSET		0x800000 /* LMAC1 */

#define IWL_DR_DCCM_LEN			0x10000 /* LMAC1 */

#define IWL_DR_DCCM2_OFFSET		0x880000

#define IWL_DR_DCCM2_LEN		0x8000

#define IWL_DR_SMEM_OFFSET		0x400000

#define IWL_DR_SMEM_LEN			0xD0000



#define IWL_DR_A_PE_A_FW_PRE		"iwlwifi-dr-a0-pe-a0"

#define IWL_BR_A_PET_A_FW_PRE		"iwlwifi-br-a0-petc-a0"

#define IWL_BR_A_PE_A_FW_PRE		"iwlwifi-br-a0-pe-a0"



#define IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(api) \

	IWL_DR_A_PE_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BR_A_PET_A_FW_MODULE_FIRMWARE(api) \

	IWL_BR_A_PET_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BR_A_PE_A_FW_MODULE_FIRMWARE(api) \

	IWL_BR_A_PE_A_FW_PRE "-" __stringify(api) ".ucode"



static const struct iwl_base_params iwl_dr_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = true,

	.pcie_l1_allowed = true,

};



#define IWL_DEVICE_DR_COMMON						\

	.ucode_api_max = IWL_DR_UCODE_API_MAX,			\

	.ucode_api_min = IWL_DR_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = 10,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL_DR_DCCM_OFFSET,				\

	.dccm_len = IWL_DR_DCCM_LEN,					\

	.dccm2_offset = IWL_DR_DCCM2_OFFSET,				\

	.dccm2_len = IWL_DR_DCCM2_LEN,				\

	.smem_offset = IWL_DR_SMEM_OFFSET,				\

	.smem_len = IWL_DR_SMEM_LEN,					\

	.apmg_not_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = 0x30,					\

	.nvm_ver = IWL_DR_NVM_VERSION,				\

	.trans.rf_id = true,						\

	.trans.gen2 = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0xD0000,				\

	.d3_debug_data_base_addr = 0x401000,				\

	.d3_debug_data_length = 60 * 1024,				\

	.mon_smem_regs = {						\

		.write_ptr = {						\

			.addr = LDBG_M2S_BUF_WPTR,			\

			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,		\

	},								\

		.cycle_cnt = {						\

			.addr = LDBG_M2S_BUF_WRAP_CNT,			\

			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\

		},							\

	},								\

	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_DR,			\

	.trans.base_params = &iwl_dr_base_params,			\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,			\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\

			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,	\

		},							\

		.cycle_cnt = {						\

			.addr = DBGC_DBGBUF_WRAP_AROUND,		\

			.mask = 0xffffffff,				\

		},							\

		.cur_frag = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\

			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,		\

		},							\

	},								\

	.mon_dbgi_regs = {						\

		.write_ptr = {						\

			.addr = DBGI_SRAM_FIFO_POINTERS,		\

			.mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK,	\

		},							\

	}



#define IWL_DEVICE_DR							\

	IWL_DEVICE_DR_COMMON,						\

	.uhb_supported = true,						\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.num_rbds = IWL_NUM_RBDS_DR_EHT,				\

	.ht_params = &iwl_22000_ht_params



/*

 * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an

 * A-MPDU, with additional overhead to account for processing time.

 */

#define IWL_NUM_RBDS_DR_EHT		(512 * 16)



const struct iwl_cfg_trans_params iwl_dr_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_DR,

	.base_params = &iwl_dr_base_params,

	.mq_rx_supported = true,

	.rf_id = true,

	.gen2 = true,

	.integrated = true,

	.umac_prph_offset = 0x300000,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_dr_name[] = "Intel(R) TBD Dr device";



const struct iwl_cfg iwl_cfg_dr = {

	.fw_name_mac = "dr",

	IWL_DEVICE_DR,

};



const struct iwl_cfg_trans_params iwl_br_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_DR,

	.base_params = &iwl_dr_base_params,

	.mq_rx_supported = true,

	.rf_id = true,

	.gen2 = true,

	.integrated = true,

	.umac_prph_offset = 0x300000,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_br_name[] = "Intel(R) TBD Br device";



const struct iwl_cfg iwl_cfg_br = {

	.fw_name_mac = "br",

	IWL_DEVICE_DR,

};



MODULE_FIRMWARE(IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BR_A_PET_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX));

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

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum iwl_device_family { 
	IWL_DEVICE_FAMILY_AX210,

	IWL_DEVICE_FAMILY_BZ,

	IWL_DEVICE_FAMILY_SC,

	IWL_DEVICE_FAMILY_DR,

};



/*
@@ -424,6 +425,8 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_SC2		0x49

#define IWL_CFG_MAC_TYPE_SC2F		0x4A

#define IWL_CFG_MAC_TYPE_BZ_W		0x4B

#define IWL_CFG_MAC_TYPE_BR		0x4C

#define IWL_CFG_MAC_TYPE_DR		0x4D



#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108
@@ -434,6 +437,7 @@ struct iwl_cfg { 
#define IWL_CFG_RF_TYPE_GF		0x10D

#define IWL_CFG_RF_TYPE_FM		0x112

#define IWL_CFG_RF_TYPE_WH		0x113

#define IWL_CFG_RF_TYPE_PE		0x114



#define IWL_CFG_RF_ID_TH		0x1

#define IWL_CFG_RF_ID_TH1		0x1
@@ -506,6 +510,8 @@ extern const struct iwl_cfg_trans_params iwl_ma_trans_cfg; 
extern const struct iwl_cfg_trans_params iwl_bz_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_gl_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_sc_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_dr_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_br_trans_cfg;

extern const char iwl9162_name[];

extern const char iwl9260_name[];

extern const char iwl9260_1_name[];
@@ -551,6 +557,8 @@ extern const char iwl_mtp_name[]; 
extern const char iwl_sc_name[];

extern const char iwl_sc2_name[];

extern const char iwl_sc2f_name[];

extern const char iwl_dr_name[];

extern const char iwl_br_name[];

#if IS_ENABLED(CONFIG_IWLDVM)

extern const struct iwl_cfg iwl5300_agn_cfg;

extern const struct iwl_cfg iwl5100_agn_cfg;
@@ -658,6 +666,8 @@ extern const struct iwl_cfg iwl_cfg_gl; 
extern const struct iwl_cfg iwl_cfg_sc;

extern const struct iwl_cfg iwl_cfg_sc2;

extern const struct iwl_cfg iwl_cfg_sc2f;

extern const struct iwl_cfg iwl_cfg_dr;

extern const struct iwl_cfg iwl_cfg_br;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+16 −0
Original line number Diff line number Diff line
@@ -540,6 +540,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0xE340, PCI_ANY_ID, iwl_sc_trans_cfg)},

	{IWL_PCI_DEVICE(0xD340, PCI_ANY_ID, iwl_sc_trans_cfg)},

	{IWL_PCI_DEVICE(0x6E70, PCI_ANY_ID, iwl_sc_trans_cfg)},



/* Dr devices */

	{IWL_PCI_DEVICE(0x272F, PCI_ANY_ID, iwl_dr_trans_cfg)},

#endif /* CONFIG_IWLMVM */



	{0}
@@ -1182,6 +1185,19 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_sc2f_name),

/* Dr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_DR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_dr, iwl_dr_name),



/* Br */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_br, iwl_br_name),

#endif /* CONFIG_IWLMVM */

};

EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table);