Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8babe12b authored by Johannes Berg's avatar Johannes Berg Committed by Sasha Levin
Browse files

iwlwifi: pcie: support 7265-D devices 



[ Upstream commit 3fd0d3c170ad6ba8b64e16938f699d0b43cc782e ]

Identify 7265-D devices using the hardware revision (they have the
same PCI IDs as 7265) and change the configuration for them taking
the differences (currently only the firmware image) into account.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent f96fe7e5

drivers/net/wireless/iwlwifi/iwl-7000.c

+34 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define IWL7265D_FW_PRE "iwlwifi-7265D-"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {
@@ -267,6 +270,37 @@ const struct iwl_cfg iwl7265_n_cfg = { 
	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265d_n_cfg = {

	.name = "Intel(R) Wireless N 7265",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7265_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

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

+3 −0
Original line number Diff line number Diff line
@@ -346,6 +346,9 @@ extern const struct iwl_cfg iwl3165_2ac_cfg; 
extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl7265d_2ac_cfg;

extern const struct iwl_cfg iwl7265d_2n_cfg;

extern const struct iwl_cfg iwl7265d_n_cfg;

extern const struct iwl_cfg iwl8260_2n_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

drivers/net/wireless/iwlwifi/iwl-csr.h

+18 −17
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ enum { 
#define CSR_HW_REV_TYPE_2x00		(0x0000100)

#define CSR_HW_REV_TYPE_105		(0x0000110)

#define CSR_HW_REV_TYPE_135		(0x0000120)

#define CSR_HW_REV_TYPE_7265D		(0x0000210)

#define CSR_HW_REV_TYPE_NONE		(0x00001F0)



/* EEPROM REG */

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

+20 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev) {} 
static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);

	const struct iwl_cfg *cfg_7265d __maybe_unused = NULL;

	struct iwl_trans *iwl_trans;

	struct iwl_trans_pcie *trans_pcie;

	int ret;
@@ -511,6 +512,25 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (IS_ERR(iwl_trans))

		return PTR_ERR(iwl_trans);



#if IS_ENABLED(CONFIG_IWLMVM)

	/*

	 * special-case 7265D, it has the same PCI IDs.

	 *

	 * Note that because we already pass the cfg to the transport above,

	 * all the parameters that the transport uses must, until that is

	 * changed, be identical to the ones in the 7265D configuration.

	 */

	if (cfg == &iwl7265_2ac_cfg)

		cfg_7265d = &iwl7265d_2ac_cfg;

	else if (cfg == &iwl7265_2n_cfg)

		cfg_7265d = &iwl7265d_2n_cfg;

	else if (cfg == &iwl7265_n_cfg)

		cfg_7265d = &iwl7265d_n_cfg;

	if (cfg_7265d &&

	    (iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)

		cfg = cfg_7265d;

#endif



	pci_set_drvdata(pdev, iwl_trans);



	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans);