hwmon: (peci/cputemp) Add Intel Sapphire Rapids support

Add support to read DTS for reading Intel Sapphire Rapids platform.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Iwona Winiarska <iwona.winiarska@intel.com>
Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com>
Link: https://lore.kernel.org/r/20230725104354.33920-2-Naresh.Solanki@9elements.com

diff --git a/drivers/hwmon/peci/cputemp.c b/drivers/hwmon/peci/cputemp.c
index e5b65a3..a812c15 100644 (file)
--- a/drivers/hwmon/peci/cputemp.c
+++ b/drivers/hwmon/peci/cputemp.c
@@ -363,6 +363,7 @@ static int init_core_mask(struct peci_cputemp *priv)
        switch (peci_dev->info.model) {
        case INTEL_FAM6_ICELAKE_X:
        case INTEL_FAM6_ICELAKE_D:
+       case INTEL_FAM6_SAPPHIRERAPIDS_X:
                ret = peci_ep_pci_local_read(peci_dev, 0, reg->bus, reg->dev,
                                             reg->func, reg->offset + 4, &data);
                if (ret)
@@ -531,6 +532,13 @@ static struct resolved_cores_reg resolved_cores_reg_icx = {
        .offset = 0xd0,
 };
 
+static struct resolved_cores_reg resolved_cores_reg_spr = {
+       .bus = 31,
+       .dev = 30,
+       .func = 6,
+       .offset = 0x80,
+};
+
 static const struct cpu_info cpu_hsx = {
        .reg            = &resolved_cores_reg_hsx,
        .min_peci_revision = 0x33,
@@ -549,6 +557,12 @@ static const struct cpu_info cpu_icx = {
        .thermal_margin_to_millidegree = &dts_ten_dot_six_to_millidegree,
 };
 
+static const struct cpu_info cpu_spr = {
+       .reg            = &resolved_cores_reg_spr,
+       .min_peci_revision = 0x40,
+       .thermal_margin_to_millidegree = &dts_ten_dot_six_to_millidegree,
+};
+
 static const struct auxiliary_device_id peci_cputemp_ids[] = {
        {
                .name = "peci_cpu.cputemp.hsx",
@@ -574,6 +588,10 @@ static const struct auxiliary_device_id peci_cputemp_ids[] = {
                .name = "peci_cpu.cputemp.icxd",
                .driver_data = (kernel_ulong_t)&cpu_icx,
        },
+       {
+               .name = "peci_cpu.cputemp.spr",
+               .driver_data = (kernel_ulong_t)&cpu_spr,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(auxiliary, peci_cputemp_ids);