* [PATCH 0/3] x86/cpu: More macros cleanup
@ 2020-05-06 7:15 Borislav Petkov
2020-05-06 7:15 ` [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id Borislav Petkov
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Borislav Petkov @ 2020-05-06 7:15 UTC (permalink / raw)
To: X86 ML; +Cc: Mark Gross, LKML
From: Borislav Petkov <bp@suse.de>
Hi all,
here are some more cleanups ontop of tglx's x86 CPU macros cleanup
series.
Thx.
Borislav Petkov (2):
x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro
x86/apic: Convert the TSC deadline timer matching to steppings macro
Mark Gross (1):
x86/cpu: Add a steppings field to struct x86_cpu_id
arch/x86/include/asm/cpu_device_id.h | 31 +++++++++++++--
arch/x86/kernel/apic/apic.c | 57 ++++++----------------------
arch/x86/kernel/cpu/match.c | 7 +++-
include/linux/mod_devicetable.h | 2 +
4 files changed, 48 insertions(+), 49 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id
2020-05-06 7:15 [PATCH 0/3] x86/cpu: More macros cleanup Borislav Petkov
@ 2020-05-06 7:15 ` Borislav Petkov
2020-05-06 15:02 ` mark gross
2020-05-06 7:15 ` [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro Borislav Petkov
2020-05-06 7:15 ` [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro Borislav Petkov
2 siblings, 1 reply; 9+ messages in thread
From: Borislav Petkov @ 2020-05-06 7:15 UTC (permalink / raw)
To: X86 ML; +Cc: Mark Gross, LKML, Tony Luck, Josh Poimboeuf
From: Mark Gross <mgross@linux.intel.com>
Intel uses the same family/model for several CPUs. Sometimes the
stepping must be checked to tell them apart.
On x86 there can be at most 16 steppings. Add a steppings bitmask to
x86_cpu_id and a X86_MATCH_VENDOR_FAMILY_MODEL_STEPPING_FEATURE macro
and support for matching against family/model/stepping.
[ bp: Massage. ]
Signed-off-by: Mark Gross <mgross@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
arch/x86/include/asm/cpu_device_id.h | 27 ++++++++++++++++++++++++---
arch/x86/kernel/cpu/match.c | 7 ++++++-
include/linux/mod_devicetable.h | 2 ++
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index cf3d621c6892..10426cd56dca 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -20,12 +20,14 @@
#define X86_CENTAUR_FAM6_C7_D 0xd
#define X86_CENTAUR_FAM6_NANO 0xf
+#define X86_STEPPINGS(mins, maxs) GENMASK(maxs, mins)
/**
- * X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Base macro for CPU matching
+ * X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching
* @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
* The name is expanded to X86_VENDOR_@_vendor
* @_family: The family number or X86_FAMILY_ANY
* @_model: The model number, model constant or X86_MODEL_ANY
+ * @_steppings: Bitmask for steppings, stepping constant or X86_STEPPING_ANY
* @_feature: A X86_FEATURE bit or X86_FEATURE_ANY
* @_data: Driver specific data or NULL. The internal storage
* format is unsigned long. The supplied value, pointer
@@ -37,15 +39,34 @@
* into another macro at the usage site for good reasons, then please
* start this local macro with X86_MATCH to allow easy grepping.
*/
-#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(_vendor, _family, _model, \
- _feature, _data) { \
+#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(_vendor, _family, _model, \
+ _steppings, _feature, _data) { \
.vendor = X86_VENDOR_##_vendor, \
.family = _family, \
.model = _model, \
+ .steppings = _steppings, \
.feature = _feature, \
.driver_data = (unsigned long) _data \
}
+/**
+ * X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching
+ * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
+ * The name is expanded to X86_VENDOR_@_vendor
+ * @_family: The family number or X86_FAMILY_ANY
+ * @_model: The model number, model constant or X86_MODEL_ANY
+ * @_feature: A X86_FEATURE bit or X86_FEATURE_ANY
+ * @_data: Driver specific data or NULL. The internal storage
+ * format is unsigned long. The supplied value, pointer
+ * etc. is casted to unsigned long internally.
+ *
+ * The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is
+ * set to wildcards.
+ */
+#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, feature, data) \
+ X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \
+ X86_STEPPING_ANY, feature, data)
+
/**
* X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature
* @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
index d3482eb43ff3..ad6776081e60 100644
--- a/arch/x86/kernel/cpu/match.c
+++ b/arch/x86/kernel/cpu/match.c
@@ -39,13 +39,18 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)
const struct x86_cpu_id *m;
struct cpuinfo_x86 *c = &boot_cpu_data;
- for (m = match; m->vendor | m->family | m->model | m->feature; m++) {
+ for (m = match;
+ m->vendor | m->family | m->model | m->steppings | m->feature;
+ m++) {
if (m->vendor != X86_VENDOR_ANY && c->x86_vendor != m->vendor)
continue;
if (m->family != X86_FAMILY_ANY && c->x86 != m->family)
continue;
if (m->model != X86_MODEL_ANY && c->x86_model != m->model)
continue;
+ if (m->steppings != X86_STEPPING_ANY &&
+ !(BIT(c->x86_stepping) & m->steppings))
+ continue;
if (m->feature != X86_FEATURE_ANY && !cpu_has(c, m->feature))
continue;
return m;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 4c2ddd0941a7..0754b8d71262 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -663,6 +663,7 @@ struct x86_cpu_id {
__u16 vendor;
__u16 family;
__u16 model;
+ __u16 steppings;
__u16 feature; /* bit index */
kernel_ulong_t driver_data;
};
@@ -671,6 +672,7 @@ struct x86_cpu_id {
#define X86_VENDOR_ANY 0xffff
#define X86_FAMILY_ANY 0
#define X86_MODEL_ANY 0
+#define X86_STEPPING_ANY 0
#define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
/*
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro
2020-05-06 7:15 [PATCH 0/3] x86/cpu: More macros cleanup Borislav Petkov
2020-05-06 7:15 ` [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id Borislav Petkov
@ 2020-05-06 7:15 ` Borislav Petkov
2020-05-06 15:01 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2020-05-06 7:15 ` [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro Borislav Petkov
2 siblings, 2 replies; 9+ messages in thread
From: Borislav Petkov @ 2020-05-06 7:15 UTC (permalink / raw)
To: X86 ML; +Cc: Mark Gross, LKML
From: Borislav Petkov <bp@suse.de>
... to match Intel family 6 CPUs with steppings.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/include/asm/cpu_device_id.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 10426cd56dca..eb8fcede9e3b 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -160,6 +160,10 @@
#define X86_MATCH_INTEL_FAM6_MODEL(model, data) \
X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data)
+#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data) \
+ X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+ steppings, X86_FEATURE_ANY, data)
+
/*
* Match specific microcode revisions.
*
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro
2020-05-06 7:15 [PATCH 0/3] x86/cpu: More macros cleanup Borislav Petkov
2020-05-06 7:15 ` [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id Borislav Petkov
2020-05-06 7:15 ` [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro Borislav Petkov
@ 2020-05-06 7:15 ` Borislav Petkov
2020-05-06 15:00 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2 siblings, 2 replies; 9+ messages in thread
From: Borislav Petkov @ 2020-05-06 7:15 UTC (permalink / raw)
To: X86 ML; +Cc: Mark Gross, LKML, Peter Zijlstra
From: Borislav Petkov <bp@suse.de>
... and get rid of the function pointers which would spit out the
microcode revision based on the CPU stepping.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/kernel/apic/apic.c | 57 ++++++++-----------------------------
1 file changed, 12 insertions(+), 45 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index e53dda210cd7..4b1d31be50b4 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -544,46 +544,20 @@ static struct clock_event_device lapic_clockevent = {
};
static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
-static __init u32 hsx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x02: return 0x3a; /* EP */
- case 0x04: return 0x0f; /* EX */
- }
-
- return ~0U;
-}
-
-static __init u32 bdx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x02: return 0x00000011;
- case 0x03: return 0x0700000e;
- case 0x04: return 0x0f00000c;
- case 0x05: return 0x0e000003;
- }
-
- return ~0U;
-}
-
-static __init u32 skx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x03: return 0x01000136;
- case 0x04: return 0x02000014;
- }
+static const struct x86_cpu_id deadline_match[] __initconst = {
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x2, 0x2), 0x3a), /* EP */
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x4, 0x4), 0x0f), /* EX */
- if (boot_cpu_data.x86_stepping > 4)
- return 0;
+ X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
- return ~0U;
-}
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x2, 0x2), 0x00000011),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x3), 0x0700000e),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x4, 0x4), 0x0f00000c),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x5, 0x5), 0x0e000003),
-static const struct x86_cpu_id deadline_match[] __initconst = {
- X86_MATCH_INTEL_FAM6_MODEL( HASWELL_X, &hsx_deadline_rev),
- X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
- X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_D, &bdx_deadline_rev),
- X86_MATCH_INTEL_FAM6_MODEL( SKYLAKE_X, &skx_deadline_rev),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x3, 0x3), 0x01000136),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x4, 0x4), 0x02000014),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x5, 0xf), 0),
X86_MATCH_INTEL_FAM6_MODEL( HASWELL, 0x22),
X86_MATCH_INTEL_FAM6_MODEL( HASWELL_L, 0x20),
@@ -615,14 +589,7 @@ static __init bool apic_validate_deadline_timer(void)
if (!m)
return true;
- /*
- * Function pointers will have the MSB set due to address layout,
- * immediate revisions will not.
- */
- if ((long)m->driver_data < 0)
- rev = ((u32 (*)(void))(m->driver_data))();
- else
- rev = (u32)m->driver_data;
+ rev = (u32)m->driver_data;
if (boot_cpu_data.microcode >= rev)
return true;
--
2.21.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro
2020-05-06 7:15 ` [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro Borislav Petkov
@ 2020-05-06 15:00 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 9+ messages in thread
From: mark gross @ 2020-05-06 15:00 UTC (permalink / raw)
To: Borislav Petkov; +Cc: X86 ML, LKML, Peter Zijlstra
Reviewed-by: Mark Gross <mgross.linux.intel.com>
On Wed, May 06, 2020 at 09:15:16AM +0200, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... and get rid of the function pointers which would spit out the
> microcode revision based on the CPU stepping.
>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> arch/x86/kernel/apic/apic.c | 57 ++++++++-----------------------------
> 1 file changed, 12 insertions(+), 45 deletions(-)
>
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index e53dda210cd7..4b1d31be50b4 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -544,46 +544,20 @@ static struct clock_event_device lapic_clockevent = {
> };
> static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
>
> -static __init u32 hsx_deadline_rev(void)
> -{
> - switch (boot_cpu_data.x86_stepping) {
> - case 0x02: return 0x3a; /* EP */
> - case 0x04: return 0x0f; /* EX */
> - }
> -
> - return ~0U;
> -}
> -
> -static __init u32 bdx_deadline_rev(void)
> -{
> - switch (boot_cpu_data.x86_stepping) {
> - case 0x02: return 0x00000011;
> - case 0x03: return 0x0700000e;
> - case 0x04: return 0x0f00000c;
> - case 0x05: return 0x0e000003;
> - }
> -
> - return ~0U;
> -}
> -
> -static __init u32 skx_deadline_rev(void)
> -{
> - switch (boot_cpu_data.x86_stepping) {
> - case 0x03: return 0x01000136;
> - case 0x04: return 0x02000014;
> - }
> +static const struct x86_cpu_id deadline_match[] __initconst = {
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x2, 0x2), 0x3a), /* EP */
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x4, 0x4), 0x0f), /* EX */
>
> - if (boot_cpu_data.x86_stepping > 4)
> - return 0;
> + X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
>
> - return ~0U;
> -}
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x2, 0x2), 0x00000011),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x3), 0x0700000e),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x4, 0x4), 0x0f00000c),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x5, 0x5), 0x0e000003),
>
> -static const struct x86_cpu_id deadline_match[] __initconst = {
> - X86_MATCH_INTEL_FAM6_MODEL( HASWELL_X, &hsx_deadline_rev),
> - X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
> - X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_D, &bdx_deadline_rev),
> - X86_MATCH_INTEL_FAM6_MODEL( SKYLAKE_X, &skx_deadline_rev),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x3, 0x3), 0x01000136),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x4, 0x4), 0x02000014),
> + X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x5, 0xf), 0),
>
> X86_MATCH_INTEL_FAM6_MODEL( HASWELL, 0x22),
> X86_MATCH_INTEL_FAM6_MODEL( HASWELL_L, 0x20),
> @@ -615,14 +589,7 @@ static __init bool apic_validate_deadline_timer(void)
> if (!m)
> return true;
>
> - /*
> - * Function pointers will have the MSB set due to address layout,
> - * immediate revisions will not.
> - */
> - if ((long)m->driver_data < 0)
> - rev = ((u32 (*)(void))(m->driver_data))();
> - else
> - rev = (u32)m->driver_data;
> + rev = (u32)m->driver_data;
>
> if (boot_cpu_data.microcode >= rev)
> return true;
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro
2020-05-06 7:15 ` [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro Borislav Petkov
@ 2020-05-06 15:01 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 9+ messages in thread
From: mark gross @ 2020-05-06 15:01 UTC (permalink / raw)
To: Borislav Petkov; +Cc: X86 ML, LKML
Reviewed-by: Mark Gross <mgross@linux.intel.com>
On Wed, May 06, 2020 at 09:15:15AM +0200, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... to match Intel family 6 CPUs with steppings.
>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
> arch/x86/include/asm/cpu_device_id.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
> index 10426cd56dca..eb8fcede9e3b 100644
> --- a/arch/x86/include/asm/cpu_device_id.h
> +++ b/arch/x86/include/asm/cpu_device_id.h
> @@ -160,6 +160,10 @@
> #define X86_MATCH_INTEL_FAM6_MODEL(model, data) \
> X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data)
>
> +#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data) \
> + X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
> + steppings, X86_FEATURE_ANY, data)
> +
> /*
> * Match specific microcode revisions.
> *
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id
2020-05-06 7:15 ` [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id Borislav Petkov
@ 2020-05-06 15:02 ` mark gross
0 siblings, 0 replies; 9+ messages in thread
From: mark gross @ 2020-05-06 15:02 UTC (permalink / raw)
To: Borislav Petkov; +Cc: X86 ML, LKML, Tony Luck, Josh Poimboeuf
+1
--mark
On Wed, May 06, 2020 at 09:15:14AM +0200, Borislav Petkov wrote:
> From: Mark Gross <mgross@linux.intel.com>
>
> Intel uses the same family/model for several CPUs. Sometimes the
> stepping must be checked to tell them apart.
>
> On x86 there can be at most 16 steppings. Add a steppings bitmask to
> x86_cpu_id and a X86_MATCH_VENDOR_FAMILY_MODEL_STEPPING_FEATURE macro
> and support for matching against family/model/stepping.
>
> [ bp: Massage. ]
>
> Signed-off-by: Mark Gross <mgross@linux.intel.com>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Reviewed-by: Tony Luck <tony.luck@intel.com>
> Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
> ---
> arch/x86/include/asm/cpu_device_id.h | 27 ++++++++++++++++++++++++---
> arch/x86/kernel/cpu/match.c | 7 ++++++-
> include/linux/mod_devicetable.h | 2 ++
> 3 files changed, 32 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
> index cf3d621c6892..10426cd56dca 100644
> --- a/arch/x86/include/asm/cpu_device_id.h
> +++ b/arch/x86/include/asm/cpu_device_id.h
> @@ -20,12 +20,14 @@
> #define X86_CENTAUR_FAM6_C7_D 0xd
> #define X86_CENTAUR_FAM6_NANO 0xf
>
> +#define X86_STEPPINGS(mins, maxs) GENMASK(maxs, mins)
> /**
> - * X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Base macro for CPU matching
> + * X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching
> * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
> * The name is expanded to X86_VENDOR_@_vendor
> * @_family: The family number or X86_FAMILY_ANY
> * @_model: The model number, model constant or X86_MODEL_ANY
> + * @_steppings: Bitmask for steppings, stepping constant or X86_STEPPING_ANY
> * @_feature: A X86_FEATURE bit or X86_FEATURE_ANY
> * @_data: Driver specific data or NULL. The internal storage
> * format is unsigned long. The supplied value, pointer
> @@ -37,15 +39,34 @@
> * into another macro at the usage site for good reasons, then please
> * start this local macro with X86_MATCH to allow easy grepping.
> */
> -#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(_vendor, _family, _model, \
> - _feature, _data) { \
> +#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(_vendor, _family, _model, \
> + _steppings, _feature, _data) { \
> .vendor = X86_VENDOR_##_vendor, \
> .family = _family, \
> .model = _model, \
> + .steppings = _steppings, \
> .feature = _feature, \
> .driver_data = (unsigned long) _data \
> }
>
> +/**
> + * X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching
> + * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
> + * The name is expanded to X86_VENDOR_@_vendor
> + * @_family: The family number or X86_FAMILY_ANY
> + * @_model: The model number, model constant or X86_MODEL_ANY
> + * @_feature: A X86_FEATURE bit or X86_FEATURE_ANY
> + * @_data: Driver specific data or NULL. The internal storage
> + * format is unsigned long. The supplied value, pointer
> + * etc. is casted to unsigned long internally.
> + *
> + * The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is
> + * set to wildcards.
> + */
> +#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, feature, data) \
> + X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \
> + X86_STEPPING_ANY, feature, data)
> +
> /**
> * X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature
> * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
> diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
> index d3482eb43ff3..ad6776081e60 100644
> --- a/arch/x86/kernel/cpu/match.c
> +++ b/arch/x86/kernel/cpu/match.c
> @@ -39,13 +39,18 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)
> const struct x86_cpu_id *m;
> struct cpuinfo_x86 *c = &boot_cpu_data;
>
> - for (m = match; m->vendor | m->family | m->model | m->feature; m++) {
> + for (m = match;
> + m->vendor | m->family | m->model | m->steppings | m->feature;
> + m++) {
> if (m->vendor != X86_VENDOR_ANY && c->x86_vendor != m->vendor)
> continue;
> if (m->family != X86_FAMILY_ANY && c->x86 != m->family)
> continue;
> if (m->model != X86_MODEL_ANY && c->x86_model != m->model)
> continue;
> + if (m->steppings != X86_STEPPING_ANY &&
> + !(BIT(c->x86_stepping) & m->steppings))
> + continue;
> if (m->feature != X86_FEATURE_ANY && !cpu_has(c, m->feature))
> continue;
> return m;
> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> index 4c2ddd0941a7..0754b8d71262 100644
> --- a/include/linux/mod_devicetable.h
> +++ b/include/linux/mod_devicetable.h
> @@ -663,6 +663,7 @@ struct x86_cpu_id {
> __u16 vendor;
> __u16 family;
> __u16 model;
> + __u16 steppings;
> __u16 feature; /* bit index */
> kernel_ulong_t driver_data;
> };
> @@ -671,6 +672,7 @@ struct x86_cpu_id {
> #define X86_VENDOR_ANY 0xffff
> #define X86_FAMILY_ANY 0
> #define X86_MODEL_ANY 0
> +#define X86_STEPPING_ANY 0
> #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */
>
> /*
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [tip: x86/cpu] x86/apic: Convert the TSC deadline timer matching to steppings macro
2020-05-06 7:15 ` [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro Borislav Petkov
2020-05-06 15:00 ` mark gross
@ 2020-05-07 15:51 ` tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 9+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2020-05-07 15:51 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov, Peter Zijlstra (Intel), x86, LKML
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 66abf2388331b800f290e854cca3ae71de7977fe
Gitweb: https://git.kernel.org/tip/66abf2388331b800f290e854cca3ae71de7977fe
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 05 May 2020 19:27:16 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 07 May 2020 13:50:32 +02:00
x86/apic: Convert the TSC deadline timer matching to steppings macro
... and get rid of the function pointers which would spit out the
microcode revision based on the CPU stepping.
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Mark Gross <mgross.linux.intel.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200506071516.25445-4-bp@alien8.de
---
arch/x86/kernel/apic/apic.c | 57 +++++++-----------------------------
1 file changed, 12 insertions(+), 45 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index e53dda2..4b1d31b 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -544,46 +544,20 @@ static struct clock_event_device lapic_clockevent = {
};
static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
-static __init u32 hsx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x02: return 0x3a; /* EP */
- case 0x04: return 0x0f; /* EX */
- }
-
- return ~0U;
-}
-
-static __init u32 bdx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x02: return 0x00000011;
- case 0x03: return 0x0700000e;
- case 0x04: return 0x0f00000c;
- case 0x05: return 0x0e000003;
- }
-
- return ~0U;
-}
-
-static __init u32 skx_deadline_rev(void)
-{
- switch (boot_cpu_data.x86_stepping) {
- case 0x03: return 0x01000136;
- case 0x04: return 0x02000014;
- }
+static const struct x86_cpu_id deadline_match[] __initconst = {
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x2, 0x2), 0x3a), /* EP */
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x4, 0x4), 0x0f), /* EX */
- if (boot_cpu_data.x86_stepping > 4)
- return 0;
+ X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
- return ~0U;
-}
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x2, 0x2), 0x00000011),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x3), 0x0700000e),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x4, 0x4), 0x0f00000c),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x5, 0x5), 0x0e000003),
-static const struct x86_cpu_id deadline_match[] __initconst = {
- X86_MATCH_INTEL_FAM6_MODEL( HASWELL_X, &hsx_deadline_rev),
- X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X, 0x0b000020),
- X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_D, &bdx_deadline_rev),
- X86_MATCH_INTEL_FAM6_MODEL( SKYLAKE_X, &skx_deadline_rev),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x3, 0x3), 0x01000136),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x4, 0x4), 0x02000014),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x5, 0xf), 0),
X86_MATCH_INTEL_FAM6_MODEL( HASWELL, 0x22),
X86_MATCH_INTEL_FAM6_MODEL( HASWELL_L, 0x20),
@@ -615,14 +589,7 @@ static __init bool apic_validate_deadline_timer(void)
if (!m)
return true;
- /*
- * Function pointers will have the MSB set due to address layout,
- * immediate revisions will not.
- */
- if ((long)m->driver_data < 0)
- rev = ((u32 (*)(void))(m->driver_data))();
- else
- rev = (u32)m->driver_data;
+ rev = (u32)m->driver_data;
if (boot_cpu_data.microcode >= rev)
return true;
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [tip: x86/cpu] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro
2020-05-06 7:15 ` [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro Borislav Petkov
2020-05-06 15:01 ` mark gross
@ 2020-05-07 15:51 ` tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 9+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2020-05-07 15:51 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov, Mark Gross, x86, LKML
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: d8422f6bb052b44db923a28afd8ceaef63d38d26
Gitweb: https://git.kernel.org/tip/d8422f6bb052b44db923a28afd8ceaef63d38d26
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 05 May 2020 19:25:08 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 07 May 2020 13:48:05 +02:00
x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro
... to match Intel family 6 CPUs with steppings.
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Mark Gross <mgross@linux.intel.com>
Link: https://lkml.kernel.org/r/20200506071516.25445-3-bp@alien8.de
---
arch/x86/include/asm/cpu_device_id.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 10426cd..eb8fced 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -160,6 +160,10 @@
#define X86_MATCH_INTEL_FAM6_MODEL(model, data) \
X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data)
+#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data) \
+ X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
+ steppings, X86_FEATURE_ANY, data)
+
/*
* Match specific microcode revisions.
*
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-07 15:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-06 7:15 [PATCH 0/3] x86/cpu: More macros cleanup Borislav Petkov
2020-05-06 7:15 ` [PATCH 1/3] x86/cpu: Add a steppings field to struct x86_cpu_id Borislav Petkov
2020-05-06 15:02 ` mark gross
2020-05-06 7:15 ` [PATCH 2/3] x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro Borislav Petkov
2020-05-06 15:01 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2020-05-06 7:15 ` [PATCH 3/3] x86/apic: Convert the TSC deadline timer matching to steppings macro Borislav Petkov
2020-05-06 15:00 ` mark gross
2020-05-07 15:51 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
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).