Commit b1bbc1a6 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: fix cfg structs for 22000 with different RF modules 



We have to choose different configuration and different firmwares
depending on the external RF module that is installed.  Since the
external module is not represented in the PCI IDs, we need to change
the configuration at runtime, after checking the RF ID of the module
installed.  We have a bit of a mess in the code that does this,
because it applies cfg's according to the RF ID only, ignoring the
integrated module that is in use.

Fix that for some devices by adding correct configurations for them
and not ignoring the integrated module's type when making the
decision.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8ea20d95

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

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x34F0, 0x0040, iwl22000_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x34F0, 0x0070, iwl22000_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x34F0, 0x0078, iwl22000_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x34F0, 0x0310, iwl22000_2ac_cfg_jf)},

	{IWL_PCI_DEVICE(0x34F0, 0x0310, iwl22000_2ax_cfg_hr)},

	{IWL_PCI_DEVICE(0x40C0, 0x0000, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40C0, 0x0010, iwl22560_2ax_cfg_su_cdb)},

	{IWL_PCI_DEVICE(0x40c0, 0x0090, iwl22560_2ax_cfg_su_cdb)},

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

+20 −2
Original line number Diff line number Diff line
@@ -3401,7 +3401,25 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
#if IS_ENABLED(CONFIG_IWLMVM)

	trans->hw_rf_id = iwl_read32(trans, CSR_HW_RF_ID);



	if (cfg == &iwl22000_2ax_cfg_hr) {

		if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {

			trans->cfg = &iwl22000_2ax_cfg_hr;

		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_JF)) {

			trans->cfg = &iwl22000_2ax_cfg_jf;

		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

			   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HRCDB)) {

			IWL_ERR(trans, "RF ID HRCDB is not supported\n");

			ret = -EINVAL;

			goto out_no_pci;

		} else {

			IWL_ERR(trans, "Unrecognized RF ID 0x%08x\n",

				CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id));

			ret = -EINVAL;

			goto out_no_pci;

		}

	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {

		u32 hw_status;

CRA Git | Maintained and supported by SUSTech CRA and CCSE