peci, hwmon: Switch to new Intel CPU model defines

Update peci subsystem to use the same vendor-family-model
combined definition that core x86 code uses.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Iwona Winiarska <iwona.winiarska@intel.com>
Link: https://lore.kernel.org/r/20240529171920.62571-1-tony.luck@intel.com
Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com>

diff --git a/drivers/hwmon/peci/cputemp.c b/drivers/hwmon/peci/cputemp.c
index a812c15948d91810c56a6aa0e6eb7853b244a2ad..5a682195b98f4c37b5801c64ea55b57bbb9933b1 100644 (file)
--- a/drivers/hwmon/peci/cputemp.c
+++ b/drivers/hwmon/peci/cputemp.c
@@ -360,10 +360,10 @@ static int init_core_mask(struct peci_cputemp *priv)
        int ret;
 
        /* Get the RESOLVED_CORES register value */
-       switch (peci_dev->info.model) {
-       case INTEL_FAM6_ICELAKE_X:
-       case INTEL_FAM6_ICELAKE_D:
-       case INTEL_FAM6_SAPPHIRERAPIDS_X:
+       switch (peci_dev->info.x86_vfm) {
+       case INTEL_ICELAKE_X:
+       case INTEL_ICELAKE_D:
+       case INTEL_SAPPHIRERAPIDS_X:
                ret = peci_ep_pci_local_read(peci_dev, 0, reg->bus, reg->dev,
                                             reg->func, reg->offset + 4, &data);
                if (ret)

diff --git a/drivers/peci/core.c b/drivers/peci/core.c
index 8f8bda2f2a62e47f1096ad3a1ab610a91739a026..8ff3e5d225aee22090c00c48ed78106dde6c9bef 100644 (file)
--- a/drivers/peci/core.c
+++ b/drivers/peci/core.c
@@ -163,9 +163,8 @@ EXPORT_SYMBOL_NS_GPL(devm_peci_controller_add, PECI);
 static const struct peci_device_id *
 peci_bus_match_device_id(const struct peci_device_id *id, struct peci_device *device)
 {
-       while (id->family != 0) {
-               if (id->family == device->info.family &&
-                   id->model == device->info.model)
+       while (id->x86_vfm != 0) {
+               if (id->x86_vfm == device->info.x86_vfm)
                        return id;
                id++;
        }

diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c
index bd990acd92b8c5374a10afb2033cd7114ae88d79..152bbd8e717a60eada8547aadbe52eec113fa6b9 100644 (file)
--- a/drivers/peci/cpu.c
+++ b/drivers/peci/cpu.c
@@ -294,38 +294,31 @@ peci_cpu_probe(struct peci_device *device, const struct peci_device_id *id)
 
 static const struct peci_device_id peci_cpu_device_ids[] = {
        { /* Haswell Xeon */
-               .family = 6,
-               .model  = INTEL_FAM6_HASWELL_X,
+               .x86_vfm = INTEL_HASWELL_X,
                .data   = "hsx",
        },
        { /* Broadwell Xeon */
-               .family = 6,
-               .model  = INTEL_FAM6_BROADWELL_X,
+               .x86_vfm = INTEL_BROADWELL_X,
                .data   = "bdx",
        },
        { /* Broadwell Xeon D */
-               .family = 6,
-               .model  = INTEL_FAM6_BROADWELL_D,
+               .x86_vfm = INTEL_BROADWELL_D,
                .data   = "bdxd",
        },
        { /* Skylake Xeon */
-               .family = 6,
-               .model  = INTEL_FAM6_SKYLAKE_X,
+               .x86_vfm = INTEL_SKYLAKE_X,
                .data   = "skx",
        },
        { /* Icelake Xeon */
-               .family = 6,
-               .model  = INTEL_FAM6_ICELAKE_X,
+               .x86_vfm = INTEL_ICELAKE_X,
                .data   = "icx",
        },
        { /* Icelake Xeon D */
-               .family = 6,
-               .model  = INTEL_FAM6_ICELAKE_D,
+               .x86_vfm = INTEL_ICELAKE_D,
                .data   = "icxd",
        },
        { /* Sapphire Rapids Xeon */
-               .family = 6,
-               .model  = INTEL_FAM6_SAPPHIRERAPIDS_X,
+               .x86_vfm = INTEL_SAPPHIRERAPIDS_X,
                .data   = "spr",
        },
        { }

diff --git a/drivers/peci/device.c b/drivers/peci/device.c
index ee01f03c29b79252345d81972593280c7c85aed1..37ca7dd61807c7db5d0ccf684883b05b64d97cb1 100644 (file)
--- a/drivers/peci/device.c
+++ b/drivers/peci/device.c
@@ -100,8 +100,7 @@ static int peci_device_info_init(struct peci_device *device)
        if (ret)
                return ret;
 
-       device->info.family = peci_x86_cpu_family(cpu_id);
-       device->info.model = peci_x86_cpu_model(cpu_id);
+       device->info.x86_vfm = IFM(peci_x86_cpu_family(cpu_id), peci_x86_cpu_model(cpu_id));
 
        ret = peci_get_revision(device, &revision);
        if (ret)

diff --git a/drivers/peci/internal.h b/drivers/peci/internal.h
index 506bafcccbbf954443e4f57d5118d243bd255761..7a4f6eae2f90f6b4462446c948a3937feb62d254 100644 (file)
--- a/drivers/peci/internal.h
+++ b/drivers/peci/internal.h
@@ -66,13 +66,11 @@ struct peci_request *peci_xfer_ep_mmio64_readl(struct peci_device *device, u8 ba
 /**
  * struct peci_device_id - PECI device data to match
  * @data: pointer to driver private data specific to device
- * @family: device family
- * @model: device model
+ * @x86_vfm: device vendor-family-model
  */
 struct peci_device_id {
        const void *data;
-       u16 family;
-       u8 model;
+       u32 x86_vfm;
 };
 
 extern const struct device_type peci_device_type;

diff --git a/include/linux/peci-cpu.h b/include/linux/peci-cpu.h
index ff8ae9c26c8004641a6ed8f31684f6480b83cdc4..601cdd086bf6585ef7d452878fc7d8ab501ea6bb 100644 (file)
--- a/include/linux/peci-cpu.h
+++ b/include/linux/peci-cpu.h
@@ -6,6 +6,30 @@
 
 #include <linux/types.h>
 
+/* Copied from x86 <asm/processor.h> */
+#define X86_VENDOR_INTEL       0
+
+/* Copied from x86 <asm/cpu_device_id.h> */
+#define VFM_MODEL_BIT  0
+#define VFM_FAMILY_BIT 8
+#define VFM_VENDOR_BIT 16
+#define VFM_RSVD_BIT   24
+
+#define        VFM_MODEL_MASK  GENMASK(VFM_FAMILY_BIT - 1, VFM_MODEL_BIT)
+#define        VFM_FAMILY_MASK GENMASK(VFM_VENDOR_BIT - 1, VFM_FAMILY_BIT)
+#define        VFM_VENDOR_MASK GENMASK(VFM_RSVD_BIT - 1, VFM_VENDOR_BIT)
+
+#define VFM_MODEL(vfm) (((vfm) & VFM_MODEL_MASK) >> VFM_MODEL_BIT)
+#define VFM_FAMILY(vfm)        (((vfm) & VFM_FAMILY_MASK) >> VFM_FAMILY_BIT)
+#define VFM_VENDOR(vfm)        (((vfm) & VFM_VENDOR_MASK) >> VFM_VENDOR_BIT)
+
+#define        VFM_MAKE(_vendor, _family, _model) (    \
+       ((_model) << VFM_MODEL_BIT) |           \
+       ((_family) << VFM_FAMILY_BIT) |         \
+       ((_vendor) << VFM_VENDOR_BIT)           \
+)
+/* End of copied code */
+
 #include "../../arch/x86/include/asm/intel-family.h"
 
 #define PECI_PCS_PKG_ID                        0  /* Package Identifier Read */

diff --git a/include/linux/peci.h b/include/linux/peci.h
index 90e241458ef6907e7e29e95a46cbf0e1dacbcc00..3e0bc37591d63193eace56667bbda9a6ce8bda91 100644 (file)
--- a/include/linux/peci.h
+++ b/include/linux/peci.h
@@ -59,8 +59,7 @@ static inline struct peci_controller *to_peci_controller(void *d)
  * struct peci_device - PECI device
  * @dev: device object to register PECI device to the device model
  * @info: PECI device characteristics
- * @info.family: device family
- * @info.model: device model
+ * @info.x86_vfm: device vendor-family-model
  * @info.peci_revision: PECI revision supported by the PECI device
  * @info.socket_id: the socket ID represented by the PECI device
  * @addr: address used on the PECI bus connected to the parent controller
@@ -73,8 +72,7 @@ static inline struct peci_controller *to_peci_controller(void *d)
 struct peci_device {
        struct device dev;
        struct {
-               u16 family;
-               u8 model;
+               u32 x86_vfm;
                u8 peci_revision;
                u8 socket_id;
        } info;