Elyes Haouas has submitted this change. ( https://review.coreboot.org/c/coreboot/+/82648?usp=email )
Change subject: tree: Add some SMBIOS_PROCESSOR_FAMILY macros ......................................................................
tree: Add some SMBIOS_PROCESSOR_FAMILY macros
Change-Id: Ibe551a4c83f416ba30326077aa165818cf79c1fd Signed-off-by: Elyes Haouas ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/82648 Reviewed-by: Eric Lai ericllai@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/arch/arm64/smbios.c M src/arch/x86/smbios.c M src/include/smbios.h 3 files changed, 9 insertions(+), 3 deletions(-)
Approvals: Eric Lai: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/arch/arm64/smbios.c b/src/arch/arm64/smbios.c index a8d0523..f0be956 100644 --- a/src/arch/arm64/smbios.c +++ b/src/arch/arm64/smbios.c @@ -66,8 +66,8 @@ smbios_processor_id(t->processor_id); t->processor_manufacturer = smbios_processor_manufacturer(t->eos); t->processor_version = smbios_processor_name(t->eos); - t->processor_family = 0xfe; /* Use processor_family2 field */ - t->processor_family2 = 0x101; /* ARMv8 */ + t->processor_family = SMBIOS_PROCESSOR_FAMILY_FROM_FAMILY2; + t->processor_family2 = SMBIOS_PROCESSOR_FAMILY2_ARMV8; t->processor_type = SMBIOS_PROCESSOR_TYPE_CENTRAL;
smbios_cpu_get_core_counts(&t->core_count2, &t->thread_count2); diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index ef2c19a..4fa8612 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -68,7 +68,7 @@
unsigned int __weak smbios_processor_family(struct cpuid_result res) { - return (res.eax > 0) ? 0x0c : 0x6; + return (res.eax > 0) ? SMBIOS_PROCESSOR_FAMILY_PENTIUM_PRO : SMBIOS_PROCESSOR_FAMILY_INTEL486; }
static size_t get_number_of_caches(size_t max_logical_cpus_sharing_cache) diff --git a/src/include/smbios.h b/src/include/smbios.h index 0fe2b9c..8ef37d8 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -584,7 +584,13 @@ /* defines for processor family */ #define SMBIOS_PROCESSOR_FAMILY_OTHER 0x01 #define SMBIOS_PROCESSOR_FAMILY_UNKNOWN 0x02 +#define SMBIOS_PROCESSOR_FAMILY_INTEL486 0x06 +#define SMBIOS_PROCESSOR_FAMILY_PENTIUM_PRO 0x0c #define SMBIOS_PROCESSOR_FAMILY_XEON 0xb3 +#define SMBIOS_PROCESSOR_FAMILY_FROM_FAMILY2 0xfe + +/* defines for processor family 2 */ +#define SMBIOS_PROCESSOR_FAMILY2_ARMV8 0x101
/* defines for processor characteristics */ #define PROCESSOR_64BIT_CAPABLE (1 << 2)