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: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.a9c04b1e9d13.Ibf258d5e6370d8840a2560282988a1c26377c410@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index a4df67ff21bad7c913e8d32b1eafc4405393790d..4511d7fb2279ff8258bdc039c54da1c66ef411ad 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -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)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index c9e5bda8f0b77f87af161cb1d596022d738fc7b1..a4a4772330cf5cf9a5a080ee55491a7abf216af5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -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;
        }