Commit 498d3eb5 authored by Oren Givon's avatar Oren Givon Committed by Kalle Valo
Browse files

iwlwifi: add support for hr1 RF ID 



The 22000 series FW that was meant to be used with hr is
also the FW that is used for hr1 and has a different RF ID.
Add support to load the hr FW when hr1 RF ID is detected.

Cc: stable@vger.kernel.org # 5.1+
Signed-off-by: default avatarOren Givon <oren.givon@intel.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 63d7ef36

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

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ enum { 
/* RF_ID value */

#define CSR_HW_RF_ID_TYPE_JF		(0x00105100)

#define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)

#define CSR_HW_RF_ID_TYPE_HR1		(0x0010c100)

#define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)

#define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)

#define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)

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

+5 −3
Original line number Diff line number Diff line
@@ -3575,9 +3575,11 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
			trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0;

		}

	} else if (cfg == &iwl_ax101_cfg_qu_hr) {

		if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

		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->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {

		     trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) ||

		    (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

		     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR1))) {

			trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;

		} 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)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE