platform/x86: ISST: Add support for MSR 0x54

To map Linux CPU numbering scheme to hardware CPU numbering scheme
MSR 0x53 is getting used. But for new generation of CPUs, this MSR
is not valid. Since this is model specific MSR, this is possible.

A new MSR 0x54 is defined for this purpose. User space can use the
API version to distinguish format from MSR 0x53.

Intel speed select utility is updated to use the new format based
on the API version.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Pragya Tanwar <pragya.tanwar@intel.com>
Link: https://lore.kernel.org/r/20230308070642.1727167-2-srinivas.pandruvada@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
index 19e6715..e0572a2 100644 (file)
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
@@ -19,9 +19,13 @@
 #include <linux/uaccess.h>
 #include <uapi/linux/isst_if.h>
 
+#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
+
 #include "isst_if_common.h"
 
 #define MSR_THREAD_ID_INFO     0x53
+#define MSR_PM_LOGICAL_ID      0x54
 #define MSR_CPU_BUS_NUMBER     0x128
 
 static struct isst_if_cmd_cb punit_callbacks[ISST_IF_DEV_MAX];
@@ -31,6 +35,7 @@ static int punit_msr_white_list[] = {
        MSR_CONFIG_TDP_CONTROL,
        MSR_TURBO_RATIO_LIMIT1,
        MSR_TURBO_RATIO_LIMIT2,
+       MSR_PM_LOGICAL_ID,
 };
 
 struct isst_valid_cmd_ranges {
@@ -73,6 +78,8 @@ struct isst_cmd {
        u32 param;
 };
 
+static bool isst_hpm_support;
+
 static DECLARE_HASHTABLE(isst_hash, 8);
 static DEFINE_MUTEX(isst_hash_lock);
 
@@ -411,11 +418,20 @@ static int isst_if_cpu_online(unsigned int cpu)
                isst_cpu_info[cpu].pci_dev[1] = _isst_if_get_pci_dev(cpu, 1, 30, 1);
        }
 
+       if (isst_hpm_support) {
+
+               ret = rdmsrl_safe(MSR_PM_LOGICAL_ID, &data);
+               if (!ret)
+                       goto set_punit_id;
+       }
+
        ret = rdmsrl_safe(MSR_THREAD_ID_INFO, &data);
        if (ret) {
                isst_cpu_info[cpu].punit_cpu_id = -1;
                return ret;
        }
+
+set_punit_id:
        isst_cpu_info[cpu].punit_cpu_id = data;
 
        isst_restore_msr_local(cpu);
@@ -704,6 +720,12 @@ static struct miscdevice isst_if_char_driver = {
        .fops           = &isst_if_char_driver_ops,
 };
 
+static const struct x86_cpu_id hpm_cpu_ids[] = {
+       X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X,     NULL),
+       X86_MATCH_INTEL_FAM6_MODEL(SIERRAFOREST_X,      NULL),
+       {}
+};
+
 static int isst_misc_reg(void)
 {
        mutex_lock(&punit_misc_dev_reg_lock);
@@ -711,6 +733,12 @@ static int isst_misc_reg(void)
                goto unlock_exit;
 
        if (!misc_usage_count) {
+               const struct x86_cpu_id *id;
+
+               id = x86_match_cpu(hpm_cpu_ids);
+               if (id)
+                       isst_hpm_support = true;
+
                misc_device_ret = isst_if_cpu_info_init();
                if (misc_device_ret)
                        goto unlock_exit;