Commit 1c022d01 authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: iwlwifi: Add rf_mapping of new wifi7 devices 



Add the CSR register details for new wifi7 devices and
correctly set rf_name for devices with FM and WP radios.

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.a9c04b1e9d13.Ibf258d5e6370d8840a2560282988a1c26377c410@changeid


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

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

+2 −0
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ enum { 
#define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)

#define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)

#define CSR_HW_RF_ID_TYPE_MS		(0x00111000)

#define CSR_HW_RF_ID_TYPE_FM		(0x00112000)

#define CSR_HW_RF_ID_TYPE_WP		(0x00113000)



/* HW_RF CHIP STEP  */

#define CSR_HW_RF_STEP(_val) (((_val) >> 8) & 0xF)

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

+10 −0
Original line number Diff line number Diff line
@@ -290,6 +290,16 @@ static void iwl_pcie_get_rf_name(struct iwl_trans *trans) 
	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_MS):

		pos = scnprintf(buf, buflen, "MS");

		break;

	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_FM):

		pos = scnprintf(buf, buflen, "FM");

		break;

	case CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_WP):

		if (SILICON_Z_STEP ==

		    CSR_HW_RFID_STEP(trans->hw_rf_id))

			pos = scnprintf(buf, buflen, "WHTC");

		else

			pos = scnprintf(buf, buflen, "WH");

		break;

	default:

		return;

	}