Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd29b75 authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Greg Kroah-Hartman
Browse files

Revert "x86/cpu: Add a steppings field to struct x86_cpu_id" 



This reverts commit 749ec6b4.

This is commit e9d7144597b10ff13ff2264c059f7d4a7fbc89ac upstream. A proper
backport will be done. This will make it easier to check for parts affected
by Retbleed, which require X86_MATCH_VENDOR_FAM_MODEL.

Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a8ff61e

arch/x86/include/asm/cpu_device_id.h

+0 −30
Original line number Diff line number Diff line
@@ -9,36 +9,6 @@ 


#include <linux/mod_devicetable.h>



#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_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

 *		etc. is casted to unsigned long internally.

 *

 * Backport version to keep the SRBDS pile consistant. No shorter variants

 * required for this.

 */

#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				\

}



/*

 * Match specific microcode revisions.

 *

arch/x86/kernel/cpu/match.c

+1 −6
Original line number Diff line number Diff line
@@ -34,18 +34,13 @@ 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->steppings | m->feature;

	     m++) {

	for (m = match; m->vendor | m->family | m->model | 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;

include/linux/mod_devicetable.h

+0 −6
Original line number Diff line number Diff line
@@ -657,10 +657,6 @@ struct mips_cdmm_device_id { 
/*

 * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id.

 * Although gcc seems to ignore this error, clang fails without this define.

 *

 * Note: The ordering of the struct is different from upstream because the

 * static initializers in kernels < 5.7 still use C89 style while upstream

 * has been converted to proper C99 initializers.

 */

#define x86cpu_device_id x86_cpu_id

struct x86_cpu_id {
@@ -669,7 +665,6 @@ struct x86_cpu_id { 
	__u16 model;

	__u16 feature;	/* bit index */

	kernel_ulong_t driver_data;

	__u16 steppings;

};



#define X86_FEATURE_MATCH(x) \
@@ -678,7 +673,6 @@ 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 */



/*