mirror of https://gitee.com/openkylin/linux.git
Merge branch 'x86/cpu' into x86/urgent
Merge the forgotten cleanup patch for the new file, so the mess does not propagate further.
This commit is contained in:
commit
f7798711ad
|
@ -1,6 +1,6 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _CPU_DEVICE_ID
|
#ifndef _ASM_X86_CPU_DEVICE_ID
|
||||||
#define _CPU_DEVICE_ID 1
|
#define _ASM_X86_CPU_DEVICE_ID
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Declare drivers belonging to specific x86 CPUs
|
* Declare drivers belonging to specific x86 CPUs
|
||||||
|
@ -9,8 +9,6 @@
|
||||||
|
|
||||||
#include <linux/mod_devicetable.h>
|
#include <linux/mod_devicetable.h>
|
||||||
|
|
||||||
extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Match specific microcode revisions.
|
* Match specific microcode revisions.
|
||||||
*
|
*
|
||||||
|
@ -22,21 +20,22 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct x86_cpu_desc {
|
struct x86_cpu_desc {
|
||||||
__u8 x86_family;
|
u8 x86_family;
|
||||||
__u8 x86_vendor;
|
u8 x86_vendor;
|
||||||
__u8 x86_model;
|
u8 x86_model;
|
||||||
__u8 x86_stepping;
|
u8 x86_stepping;
|
||||||
__u32 x86_microcode_rev;
|
u32 x86_microcode_rev;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define INTEL_CPU_DESC(mod, step, rev) { \
|
#define INTEL_CPU_DESC(model, stepping, revision) { \
|
||||||
.x86_family = 6, \
|
.x86_family = 6, \
|
||||||
.x86_vendor = X86_VENDOR_INTEL, \
|
.x86_vendor = X86_VENDOR_INTEL, \
|
||||||
.x86_model = mod, \
|
.x86_model = (model), \
|
||||||
.x86_stepping = step, \
|
.x86_stepping = (stepping), \
|
||||||
.x86_microcode_rev = rev, \
|
.x86_microcode_rev = (revision), \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
|
||||||
extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
|
extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
|
||||||
|
|
||||||
#endif
|
#endif /* _ASM_X86_CPU_DEVICE_ID */
|
||||||
|
|
Loading…
Reference in New Issue