* [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
@ 2024-04-24 18:14 ` Tony Luck
2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
2024-04-24 18:14 ` [PATCH v4 13/71] ASoC: Intel: " Tony Luck
` (11 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:14 UTC (permalink / raw)
To: Borislav Petkov, Jithu Joseph, Hans de Goede, Ilpo Järvinen
Cc: Ashok Raj, Tony Luck, platform-driver-x86, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Jithu Joseph <jithu.joseph@intel.com>
---
drivers/platform/x86/intel/ifs/core.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
index 7b11198d85a1..33412a584836 100644
--- a/drivers/platform/x86/intel/ifs/core.c
+++ b/drivers/platform/x86/intel/ifs/core.c
@@ -11,16 +11,15 @@
#include "ifs.h"
-#define X86_MATCH(model, array_gen) \
- X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
- INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen)
+#define X86_MATCH(vfm, array_gen) \
+ X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen)
static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {
- X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0),
- X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0),
- X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0),
- X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0),
- X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1),
+ X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0),
+ X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0),
+ X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0),
+ X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0),
+ X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1),
{}
};
MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 13/71] ASoC: Intel: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
2024-04-24 18:14 ` [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines Tony Luck
@ 2024-04-24 18:14 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 56/71] platform/x86: intel_ips: " Tony Luck
` (10 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:14 UTC (permalink / raw)
To: Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba,
Srinivas Pandruvada, Tony Luck, linux-pm, linux-kernel,
platform-driver-x86, patches, Rafael J . Wysocki
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
include/linux/platform_data/x86/soc.h | 12 ++++++------
drivers/thermal/intel/intel_soc_dts_thermal.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h
index a5705189e2ac..f981907a5cb0 100644
--- a/include/linux/platform_data/x86/soc.h
+++ b/include/linux/platform_data/x86/soc.h
@@ -20,7 +20,7 @@
static inline bool soc_intel_is_##soc(void) \
{ \
static const struct x86_cpu_id soc##_cpu_ids[] = { \
- X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \
+ X86_MATCH_VFM(type, NULL), \
{} \
}; \
const struct x86_cpu_id *id; \
@@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \
return false; \
}
-SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);
-SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);
-SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);
-SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);
-SOC_INTEL_IS_CPU(cml, KABYLAKE_L);
+SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT);
+SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT);
+SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT);
+SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS);
+SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L);
#undef SOC_INTEL_IS_CPU
diff --git a/drivers/thermal/intel/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c
index 9c825c6e1f38..718c6326eaf4 100644
--- a/drivers/thermal/intel/intel_soc_dts_thermal.c
+++ b/drivers/thermal/intel/intel_soc_dts_thermal.c
@@ -36,7 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data)
}
static const struct x86_cpu_id soc_thermal_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ),
+ X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ),
{}
};
MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 56/71] platform/x86: intel_ips: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
2024-04-24 18:14 ` [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines Tony Luck
2024-04-24 18:14 ` [PATCH v4 13/71] ASoC: Intel: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 57/71] platform/x86/intel/pmc: " Tony Luck
` (9 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel_ips.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index ba38649cc142..d95f686e0515 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -62,6 +62,7 @@
#include <drm/i915_drm.h>
#include <asm/msr.h>
#include <asm/processor.h>
+#include <asm/cpu_device_id.h>
#include "intel_ips.h"
#include <linux/io-64-nonatomic-lo-hi.h>
@@ -1284,7 +1285,7 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips)
struct ips_mcp_limits *limits = NULL;
u16 tdp;
- if (!(boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 37)) {
+ if (!(boot_cpu_data.x86_vfm == INTEL_WESTMERE)) {
dev_info(ips->dev, "Non-IPS CPU detected.\n");
return NULL;
}
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 57/71] platform/x86/intel/pmc: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (2 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 56/71] platform/x86: intel_ips: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 58/71] platform/x86/intel: pmc: " Tony Luck
` (8 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Rajneesh Bhardwaj, David E Box, Hans de Goede,
Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/pmc/core.c | 46 +++++++++++++--------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index 10c96c1a850a..054a56532e23 100644
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1255,29 +1255,29 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev)
}
static const struct x86_cpu_id intel_pmc_core_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, spt_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, spt_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, spt_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, spt_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, cnp_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, icl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, icl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, cnp_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, cnp_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, tgl_l_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, tgl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, tgl_l_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, icl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, tgl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, tgl_l_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, tgl_l_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, adl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, tgl_l_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, adl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, arl_core_init),
- X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, lnl_core_init),
+ X86_MATCH_VFM(INTEL_SKYLAKE_L, spt_core_init),
+ X86_MATCH_VFM(INTEL_SKYLAKE, spt_core_init),
+ X86_MATCH_VFM(INTEL_KABYLAKE_L, spt_core_init),
+ X86_MATCH_VFM(INTEL_KABYLAKE, spt_core_init),
+ X86_MATCH_VFM(INTEL_CANNONLAKE_L, cnp_core_init),
+ X86_MATCH_VFM(INTEL_ICELAKE_L, icl_core_init),
+ X86_MATCH_VFM(INTEL_ICELAKE_NNPI, icl_core_init),
+ X86_MATCH_VFM(INTEL_COMETLAKE, cnp_core_init),
+ X86_MATCH_VFM(INTEL_COMETLAKE_L, cnp_core_init),
+ X86_MATCH_VFM(INTEL_TIGERLAKE_L, tgl_l_core_init),
+ X86_MATCH_VFM(INTEL_TIGERLAKE, tgl_core_init),
+ X86_MATCH_VFM(INTEL_ATOM_TREMONT, tgl_l_core_init),
+ X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, icl_core_init),
+ X86_MATCH_VFM(INTEL_ROCKETLAKE, tgl_core_init),
+ X86_MATCH_VFM(INTEL_ALDERLAKE_L, tgl_l_core_init),
+ X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, tgl_l_core_init),
+ X86_MATCH_VFM(INTEL_ALDERLAKE, adl_core_init),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_P, tgl_l_core_init),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE, adl_core_init),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_S, adl_core_init),
+ X86_MATCH_VFM(INTEL_METEORLAKE_L, mtl_core_init),
+ X86_MATCH_VFM(INTEL_ARROWLAKE, arl_core_init),
+ X86_MATCH_VFM(INTEL_LUNARLAKE_M, lnl_core_init),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 58/71] platform/x86/intel: pmc: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (3 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 57/71] platform/x86/intel/pmc: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 59/71] platform/x86: intel_scu_wdt: " Tony Luck
` (7 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Rajneesh Bhardwaj, David E Box, Hans de Goede,
Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/pmc/pltdrv.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/intel/pmc/pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c
index ddfba38c2104..22cfcd431987 100644
--- a/drivers/platform/x86/intel/pmc/pltdrv.c
+++ b/drivers/platform/x86/intel/pmc/pltdrv.c
@@ -35,14 +35,14 @@ static struct platform_device *pmc_core_device;
* other list may grow, but this list should not.
*/
static const struct x86_cpu_id intel_pmc_core_platform_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &pmc_core_device),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_SKYLAKE_L, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_SKYLAKE, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_KABYLAKE_L, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_KABYLAKE, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_CANNONLAKE_L, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_ICELAKE_L, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_COMETLAKE, &pmc_core_device),
+ X86_MATCH_VFM(INTEL_COMETLAKE_L, &pmc_core_device),
{}
};
MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 59/71] platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (4 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 58/71] platform/x86/intel: pmc: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
2024-04-24 18:15 ` [PATCH v4 60/71] platform/x86: ISST: " Tony Luck
` (6 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Mika Westerberg, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel_scu_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel_scu_wdt.c
index a5031a25632e..d0b6637861d3 100644
--- a/drivers/platform/x86/intel_scu_wdt.c
+++ b/drivers/platform/x86/intel_scu_wdt.c
@@ -50,7 +50,7 @@ static struct intel_mid_wdt_pdata tangier_pdata = {
};
static const struct x86_cpu_id intel_mid_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &tangier_pdata),
+ X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &tangier_pdata),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 60/71] platform/x86: ISST: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (5 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 59/71] platform/x86: intel_scu_wdt: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-25 12:32 ` srinivas pandruvada
2024-04-24 18:15 ` [PATCH v4 61/71] platform/x86: intel_speed_select_if: " Tony Luck
` (5 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Srinivas Pandruvada, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 08df9494603c..96f3b221b6c8 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
@@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver = {
};
static const struct x86_cpu_id hpm_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL),
+ X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, NULL),
+ X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, NULL),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 61/71] platform/x86: intel_speed_select_if: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (6 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 60/71] platform/x86: ISST: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-25 12:33 ` srinivas pandruvada
2024-04-24 18:15 ` [PATCH v4 62/71] platform/x86: intel_telemetry: " Tony Luck
` (4 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Srinivas Pandruvada, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
index 1b6eab071068..6c36f7704fe7 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
@@ -161,7 +161,7 @@ static struct notifier_block isst_pm_nb = {
};
static const struct x86_cpu_id isst_if_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),
+ X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),
{}
};
MODULE_DEVICE_TABLE(x86cpu, isst_if_cpu_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 62/71] platform/x86: intel_telemetry: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (7 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 61/71] platform/x86: intel_speed_select_if: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 63/71] platform/x86: intel: telemetry: " Tony Luck
` (3 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Rajneesh Bhardwaj, David E. Box, Hans de Goede,
Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/telemetry/debugfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel/telemetry/debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c
index 1d4d0fbfd63c..70e5736c44c7 100644
--- a/drivers/platform/x86/intel/telemetry/debugfs.c
+++ b/drivers/platform/x86/intel/telemetry/debugfs.c
@@ -308,8 +308,8 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = {
};
static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_debugfs_conf),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &telem_apl_debugfs_conf),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf),
{}
};
MODULE_DEVICE_TABLE(x86cpu, telemetry_debugfs_cpu_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 63/71] platform/x86: intel: telemetry: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (8 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 62/71] platform/x86: intel_telemetry: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 64/71] platform/x86: intel_turbo_max_3: " Tony Luck
` (2 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Rajneesh Bhardwaj, David E. Box, Hans de Goede,
Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/telemetry/pltdrv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel/telemetry/pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
index 06311d0e9451..767a0bc6c7ad 100644
--- a/drivers/platform/x86/intel/telemetry/pltdrv.c
+++ b/drivers/platform/x86/intel/telemetry/pltdrv.c
@@ -177,8 +177,8 @@ static struct telemetry_plt_config telem_glk_config = {
};
static const struct x86_cpu_id telemetry_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_config),
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_glk_config),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &telem_apl_config),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &telem_glk_config),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 64/71] platform/x86: intel_turbo_max_3: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (9 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 63/71] platform/x86: intel: telemetry: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-24 18:15 ` [PATCH v4 65/71] platform/x86: intel-uncore-freq: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 66/71] platform/x86: p2sb: " Tony Luck
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: Tony Luck, platform-driver-x86, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/turbo_max_3.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel/turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3.c
index 892140b62898..79a0bcdeffb8 100644
--- a/drivers/platform/x86/intel/turbo_max_3.c
+++ b/drivers/platform/x86/intel/turbo_max_3.c
@@ -114,8 +114,8 @@ static int itmt_legacy_cpu_online(unsigned int cpu)
}
static const struct x86_cpu_id itmt_legacy_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),
+ X86_MATCH_VFM(INTEL_BROADWELL_X, NULL),
+ X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 65/71] platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (10 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 64/71] platform/x86: intel_turbo_max_3: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
2024-04-25 12:34 ` srinivas pandruvada
2024-04-24 18:15 ` [PATCH v4 66/71] platform/x86: p2sb: " Tony Luck
12 siblings, 1 reply; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Srinivas Pandruvada, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
.../intel/uncore-frequency/uncore-frequency.c | 56 +++++++++----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
index b89c0dda9e5d..b80feaf5828f 100644
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
@@ -197,34 +197,34 @@ static struct notifier_block uncore_pm_nb = {
};
static const struct x86_cpu_id intel_uncore_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, NULL),
+ X86_MATCH_VFM(INTEL_BROADWELL_G, NULL),
+ X86_MATCH_VFM(INTEL_BROADWELL_X, NULL),
+ X86_MATCH_VFM(INTEL_BROADWELL_D, NULL),
+ X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),
+ X86_MATCH_VFM(INTEL_ICELAKE_X, NULL),
+ X86_MATCH_VFM(INTEL_ICELAKE_D, NULL),
+ X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
+ X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, NULL),
+ X86_MATCH_VFM(INTEL_KABYLAKE, NULL),
+ X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_COMETLAKE, NULL),
+ X86_MATCH_VFM(INTEL_COMETLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_CANNONLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_ICELAKE, NULL),
+ X86_MATCH_VFM(INTEL_ICELAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_ROCKETLAKE, NULL),
+ X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
+ X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
+ X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
+ X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
+ X86_MATCH_VFM(INTEL_METEORLAKE, NULL),
+ X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL),
+ X86_MATCH_VFM(INTEL_ARROWLAKE, NULL),
+ X86_MATCH_VFM(INTEL_ARROWLAKE_H, NULL),
+ X86_MATCH_VFM(INTEL_LUNARLAKE_M, NULL),
{}
};
MODULE_DEVICE_TABLE(x86cpu, intel_uncore_cpu_ids);
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v4 66/71] platform/x86: p2sb: Switch to new Intel CPU model defines
[not found] <20240424181245.41141-1-tony.luck@intel.com>
` (11 preceding siblings ...)
2024-04-24 18:15 ` [PATCH v4 65/71] platform/x86: intel-uncore-freq: " Tony Luck
@ 2024-04-24 18:15 ` Tony Luck
12 siblings, 0 replies; 19+ messages in thread
From: Tony Luck @ 2024-04-24 18:15 UTC (permalink / raw)
To: Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches, Tony Luck
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/p2sb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/p2sb.c b/drivers/platform/x86/p2sb.c
index 3d66e1d4eb1f..8cfbf0bbd346 100644
--- a/drivers/platform/x86/p2sb.c
+++ b/drivers/platform/x86/p2sb.c
@@ -24,7 +24,7 @@
#define SPI_DEVFN_GOLDMONT PCI_DEVFN(13, 2)
static const struct x86_cpu_id p2sb_cpu_ids[] = {
- X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, P2SB_DEVFN_GOLDMONT),
+ X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, P2SB_DEVFN_GOLDMONT),
{}
};
--
2.44.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v4 60/71] platform/x86: ISST: Switch to new Intel CPU model defines
2024-04-24 18:15 ` [PATCH v4 60/71] platform/x86: ISST: " Tony Luck
@ 2024-04-25 12:32 ` srinivas pandruvada
2024-04-25 16:34 ` Luck, Tony
0 siblings, 1 reply; 19+ messages in thread
From: srinivas pandruvada @ 2024-04-25 12:32 UTC (permalink / raw)
To: Tony Luck, Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches
On Wed, 2024-04-24 at 11:15 -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
But we added new CPU model here, which is targeted for 6.10-rc1. So
there will be merge issues.
> ---
> drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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 08df9494603c..96f3b221b6c8 100644
> --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
> @@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver = {
> };
>
> static const struct x86_cpu_id hpm_cpu_ids[] = {
> - X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL),
> + X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, NULL),
> + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, NULL),
> {}
> };
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v4 61/71] platform/x86: intel_speed_select_if: Switch to new Intel CPU model defines
2024-04-24 18:15 ` [PATCH v4 61/71] platform/x86: intel_speed_select_if: " Tony Luck
@ 2024-04-25 12:33 ` srinivas pandruvada
0 siblings, 0 replies; 19+ messages in thread
From: srinivas pandruvada @ 2024-04-25 12:33 UTC (permalink / raw)
To: Tony Luck, Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches
On Wed, 2024-04-24 at 11:15 -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git
> a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
> b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
> index 1b6eab071068..6c36f7704fe7 100644
> --- a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
> +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
> @@ -161,7 +161,7 @@ static struct notifier_block isst_pm_nb = {
> };
>
> static const struct x86_cpu_id isst_if_cpu_ids[] = {
> - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),
> + X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),
> {}
> };
> MODULE_DEVICE_TABLE(x86cpu, isst_if_cpu_ids);
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v4 65/71] platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines
2024-04-24 18:15 ` [PATCH v4 65/71] platform/x86: intel-uncore-freq: " Tony Luck
@ 2024-04-25 12:34 ` srinivas pandruvada
0 siblings, 0 replies; 19+ messages in thread
From: srinivas pandruvada @ 2024-04-25 12:34 UTC (permalink / raw)
To: Tony Luck, Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches
On Wed, 2024-04-24 at 11:15 -0700, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> .../intel/uncore-frequency/uncore-frequency.c | 56 +++++++++--------
> --
> 1 file changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-
> frequency.c b/drivers/platform/x86/intel/uncore-frequency/uncore-
> frequency.c
> index b89c0dda9e5d..b80feaf5828f 100644
> --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
> +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
> @@ -197,34 +197,34 @@ static struct notifier_block uncore_pm_nb = {
> };
>
> static const struct x86_cpu_id intel_uncore_cpu_ids[] = {
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, NULL),
> - X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, NULL),
> + X86_MATCH_VFM(INTEL_BROADWELL_G, NULL),
> + X86_MATCH_VFM(INTEL_BROADWELL_X, NULL),
> + X86_MATCH_VFM(INTEL_BROADWELL_D, NULL),
> + X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL),
> + X86_MATCH_VFM(INTEL_ICELAKE_X, NULL),
> + X86_MATCH_VFM(INTEL_ICELAKE_D, NULL),
> + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
> + X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, NULL),
> + X86_MATCH_VFM(INTEL_KABYLAKE, NULL),
> + X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_COMETLAKE, NULL),
> + X86_MATCH_VFM(INTEL_COMETLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_CANNONLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_ICELAKE, NULL),
> + X86_MATCH_VFM(INTEL_ICELAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_ROCKETLAKE, NULL),
> + X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
> + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
> + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
> + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
> + X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
> + X86_MATCH_VFM(INTEL_METEORLAKE, NULL),
> + X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL),
> + X86_MATCH_VFM(INTEL_ARROWLAKE, NULL),
> + X86_MATCH_VFM(INTEL_ARROWLAKE_H, NULL),
> + X86_MATCH_VFM(INTEL_LUNARLAKE_M, NULL),
> {}
> };
> MODULE_DEVICE_TABLE(x86cpu, intel_uncore_cpu_ids);
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH v4 60/71] platform/x86: ISST: Switch to new Intel CPU model defines
2024-04-25 12:32 ` srinivas pandruvada
@ 2024-04-25 16:34 ` Luck, Tony
0 siblings, 0 replies; 19+ messages in thread
From: Luck, Tony @ 2024-04-25 16:34 UTC (permalink / raw)
To: srinivas pandruvada, Borislav Petkov, Hans de Goede, Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches
>> New CPU #defines encode vendor and family as well as model.
>>
>> Signed-off-by: Tony Luck <tony.luck@intel.com>
>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Thanks.
> But we added new CPU model here, which is targeted for 6.10-rc1. So
> there will be merge issues.
Yup. This is the second patch that was created before some new CPU was added.
I expect there will be more before this is all over.
I'll be mopping those up post 6.10-rc1
-Tony
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines
2024-04-24 18:14 ` [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines Tony Luck
@ 2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
0 siblings, 0 replies; 19+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-29 3:19 UTC (permalink / raw)
To: Tony Luck, Borislav Petkov, Jithu Joseph, Hans de Goede,
Ilpo Järvinen
Cc: Ashok Raj, platform-driver-x86, linux-kernel, patches
Hi,
On 4/24/24 11:14 AM, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> Reviewed-by: Jithu Joseph <jithu.joseph@intel.com>
> ---
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> drivers/platform/x86/intel/ifs/core.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
> index 7b11198d85a1..33412a584836 100644
> --- a/drivers/platform/x86/intel/ifs/core.c
> +++ b/drivers/platform/x86/intel/ifs/core.c
> @@ -11,16 +11,15 @@
>
> #include "ifs.h"
>
> -#define X86_MATCH(model, array_gen) \
> - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
> - INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen)
> +#define X86_MATCH(vfm, array_gen) \
> + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen)
>
> static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {
> - X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0),
> - X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0),
> - X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1),
> + X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0),
> + X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0),
> + X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1),
> {}
> };
> MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v4 59/71] platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines
2024-04-24 18:15 ` [PATCH v4 59/71] platform/x86: intel_scu_wdt: " Tony Luck
@ 2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
0 siblings, 0 replies; 19+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-29 3:19 UTC (permalink / raw)
To: Tony Luck, Borislav Petkov, Mika Westerberg, Hans de Goede,
Ilpo Järvinen
Cc: platform-driver-x86, linux-kernel, patches
Hi,
On 4/24/24 11:15 AM, Tony Luck wrote:
> New CPU #defines encode vendor and family as well as model.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> drivers/platform/x86/intel_scu_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel_scu_wdt.c
> index a5031a25632e..d0b6637861d3 100644
> --- a/drivers/platform/x86/intel_scu_wdt.c
> +++ b/drivers/platform/x86/intel_scu_wdt.c
> @@ -50,7 +50,7 @@ static struct intel_mid_wdt_pdata tangier_pdata = {
> };
>
> static const struct x86_cpu_id intel_mid_cpu_ids[] = {
> - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &tangier_pdata),
> + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &tangier_pdata),
> {}
> };
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-04-29 3:19 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240424181245.41141-1-tony.luck@intel.com>
2024-04-24 18:14 ` [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines Tony Luck
2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
2024-04-24 18:14 ` [PATCH v4 13/71] ASoC: Intel: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 56/71] platform/x86: intel_ips: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 57/71] platform/x86/intel/pmc: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 58/71] platform/x86/intel: pmc: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 59/71] platform/x86: intel_scu_wdt: " Tony Luck
2024-04-29 3:19 ` Kuppuswamy Sathyanarayanan
2024-04-24 18:15 ` [PATCH v4 60/71] platform/x86: ISST: " Tony Luck
2024-04-25 12:32 ` srinivas pandruvada
2024-04-25 16:34 ` Luck, Tony
2024-04-24 18:15 ` [PATCH v4 61/71] platform/x86: intel_speed_select_if: " Tony Luck
2024-04-25 12:33 ` srinivas pandruvada
2024-04-24 18:15 ` [PATCH v4 62/71] platform/x86: intel_telemetry: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 63/71] platform/x86: intel: telemetry: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 64/71] platform/x86: intel_turbo_max_3: " Tony Luck
2024-04-24 18:15 ` [PATCH v4 65/71] platform/x86: intel-uncore-freq: " Tony Luck
2024-04-25 12:34 ` srinivas pandruvada
2024-04-24 18:15 ` [PATCH v4 66/71] platform/x86: p2sb: " Tony Luck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).