Francois Toguo Fotso has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31997
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 65 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/1
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 8cb59df..aea347d 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -328,6 +328,17 @@ t->handle = *handle; *handle += 1; t->length = sizeof(struct smbios_type17) - 2; + t->memory_technology = MEMORY_TECHNOLOGY_UNKNOWN; + t->operating_mode_capability = MEMORY_OPERATING_MODE_CAP_UNKNOWN; + t->fw_version = 0xff; + t->manufacturer_id = dimm->mod_id; + t->product_id = 0x0000; + t->sub_ctrl_manufacturer_id = 0x0000; + t->sub_ctrl_product_id = 0x0000; + t->non_volatile_size = 0xffffffffffffffff; + t->volatile_size = 0xffffffffffffffff; + t->cache_size = 0xffffffffffffffff; + t->logical_size = 0xffffffffffffffff; return t->length + smbios_string_table_len(t->eos); }
@@ -547,6 +558,26 @@ return len; }
+u16 __weak smbios_processor_core_or_thread_count(u16 level_type) +{ + u16 count = 0; + int ecx = 0; + + for (ecx = 0 ; ecx < 255 ; ecx++) { + struct cpuid_result leaf_b; + leaf_b = cpuid_ext(0xb, ecx); + if ((cpuid_eax(0) < 0xb) || !(leaf_b.eax | leaf_b.ebx | leaf_b.ecx | leaf_b.edx)) + return (((cpuid(1).ebx) >> 16) & 0x00ff); + + if ((leaf_b.ecx & 0xff00) == level_type) { + count = leaf_b.ebx & 0xffff; + break; + } + } + + return count; +} + static int smbios_write_type4(unsigned long *current, int handle) { struct cpuid_result res; @@ -570,7 +601,15 @@ t->processor_version = smbios_processor_name(t->eos); t->processor_family = (res.eax > 0) ? 0x0c : 0x6; t->processor_type = 3; /* System Processor */ - t->core_count = (res.ebx >> 16) & 0xff; + + u16 core_count = smbios_processor_core_or_thread_count(0x0200); + u16 thread_count = smbios_processor_core_or_thread_count(0x0100); + t->core_count2 = core_count; + t->core_count = (core_count > 255) ? 0xff : core_count; + t->thread_count2 = thread_count; + t->thread_count = (thread_count > 255) ? 0xff : core_count; + t->core_enabled2 = core_count; + t->l1_cache_handle = 0xffff; t->l2_cache_handle = 0xffff; t->l3_cache_handle = 0xffff; diff --git a/src/include/smbios.h b/src/include/smbios.h index af83bfe..1c5d25a 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -52,6 +52,10 @@ u8 smbios_mainboard_feature_flags(void); const char *smbios_mainboard_location_in_chassis(void); u8 smbios_mainboard_enclosure_type(void); +u16 smbios_processor_core_or_thread_count(u16 level_type); +#ifdef CONFIG_MAINBOARD_FAMILY +const char *smbios_mainboard_family(void); +#endif
#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7) #define BIOS_CHARACTERISTICS_PC_CARD (1 << 8) @@ -299,6 +303,8 @@ u8 location_in_chassis; u16 chassis_handle; u8 board_type; + u8 num_cont_obj_handles; + u16 cont_obj_hanles[256]; u8 eos[2]; } __packed;
@@ -390,6 +396,9 @@ u8 thread_count; u16 processor_characteristics; u16 processor_family2; + u16 core_count2; + u16 core_enabled2; + u16 thread_count2; u8 eos[2]; } __packed;
@@ -401,6 +410,11 @@ u8 eos[2]; } __packed;
+typedef struct { + u8 type; + u8 format_descriptor; +} log_type_descriptor; + struct smbios_type15 { u8 type; u8 length; @@ -471,6 +485,17 @@ u16 minimum_voltage; u16 maximum_voltage; u16 configured_voltage; + u8 memory_technology; + u16 operating_mode_capability; + u8 fw_version; + u16 manufacturer_id; + u16 product_id; + u16 sub_ctrl_manufacturer_id; + u16 sub_ctrl_product_id; + u64 non_volatile_size; + u64 volatile_size; + u64 cache_size; + u64 logical_size; u8 eos[2]; } __packed;
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/31997/1/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/1/src/arch/x86/smbios.c@569 PS1, Line 569: if ((cpuid_eax(0) < 0xb) || !(leaf_b.eax | leaf_b.ebx | leaf_b.ecx | leaf_b.edx)) line over 80 characters
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31997
to look at the new patch set (#2).
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 66 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/2
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 2:
(4 comments)
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@606 PS2, Line 606: 0x0200 #define in smbios.h?
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@607 PS2, Line 607: 0x0100 #define in smbios.h?
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@609 PS2, Line 609: 255 maybe "#define BYTE_LIMIT 255" on smbios.h, and use BYTE_LIMIT here?
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@611 PS2, Line 611: 255 BYTE_LIMIT?
Hello Aaron Durbin, Richard Spiegel, Paul Menzel, Lijian Zhao, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31997
to look at the new patch set (#3).
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 70 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 3:
(3 comments)
https://review.coreboot.org/#/c/31997/3/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/3/src/arch/x86/smbios.c@569 PS3, Line 569: if ((cpuid_eax(0) < 0xb) || !(leaf_b.eax | leaf_b.ebx | leaf_b.ecx | leaf_b.edx)) line over 80 characters
https://review.coreboot.org/#/c/31997/3/src/arch/x86/smbios.c@605 PS3, Line 605: u16 core_count = smbios_processor_core_or_thread_count(PROCESSOR_INFO_CORE_COUNT_TYPE); line over 80 characters
https://review.coreboot.org/#/c/31997/3/src/arch/x86/smbios.c@606 PS3, Line 606: u16 thread_count = smbios_processor_core_or_thread_count(PROCESSOR_INFO_THREAD_COUNT_TYPE); line over 80 characters
Hello Aaron Durbin, Richard Spiegel, Paul Menzel, build bot (Jenkins), Lijian Zhao, Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31997
to look at the new patch set (#4).
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 71 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/4
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 4:
(3 comments)
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@569 PS4, Line 569: if ((cpuid_eax(0) < 0xb) || trailing whitespace
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@606 PS4, Line 606: u16 core_count = smbios_processor_core_or_thread_count(PROCESSOR_CORE_TYPE); line over 80 characters
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@607 PS4, Line 607: u16 thread_count = smbios_processor_core_or_thread_count(PROCESSOR_THREAD_TYPE); line over 80 characters
Hello Aaron Durbin, Richard Spiegel, Paul Menzel, build bot (Jenkins), Lijian Zhao, Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31997
to look at the new patch set (#5).
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 72 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/5
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/#/c/31997/5/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/5/src/arch/x86/smbios.c@608 PS5, Line 608: thread_count = smbios_processor_core_thread_count(PROCESSOR_THREAD_TYPE); line over 80 characters
Hello Aaron Durbin, Richard Spiegel, Paul Menzel, build bot (Jenkins), Lijian Zhao, Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31997
to look at the new patch set (#6).
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 72 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/31997/6
Francois Toguo Fotso has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 6:
(9 comments)
Patch Set 2:
(4 comments)
Nico and Richard,
Your findings have been implemented.
Regards, Francois
https://review.coreboot.org/#/c/31997/1/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/1/src/arch/x86/smbios.c@569 PS1, Line 569: if ((cpuid_eax(0) < 0xb) || !(leaf_b.eax | leaf_b.ebx | leaf_b.ecx | leaf_b.edx))
line over 80 characters
Done
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@606 PS2, Line 606: 0x0200
#define in smbios. […]
Done
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@607 PS2, Line 607: 0x0100
#define in smbios. […]
Done
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@609 PS2, Line 609: 255
maybe "#define BYTE_LIMIT 255" on smbios. […]
Done
https://review.coreboot.org/#/c/31997/2/src/arch/x86/smbios.c@611 PS2, Line 611: 255
BYTE_LIMIT?
Done
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@569 PS4, Line 569: if ((cpuid_eax(0) < 0xb) ||
trailing whitespace
Done
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@606 PS4, Line 606: u16 core_count = smbios_processor_core_or_thread_count(PROCESSOR_CORE_TYPE);
line over 80 characters
Done
https://review.coreboot.org/#/c/31997/4/src/arch/x86/smbios.c@607 PS4, Line 607: u16 thread_count = smbios_processor_core_or_thread_count(PROCESSOR_THREAD_TYPE);
line over 80 characters
Done
https://review.coreboot.org/#/c/31997/5/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31997/5/src/arch/x86/smbios.c@608 PS5, Line 608: thread_count = smbios_processor_core_thread_count(PROCESSOR_THREAD_TYPE);
line over 80 characters
Done
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 7: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
src/arch: An upgrade of SMBIOS to latest version 3.2
This is the second of 2 patches upgrading the SMBIOS interface to the latest 3.2 First patch is in mosys. Newer required fields are added to various types definitions
BUG=NONE TEST=Boot to OS on GLK Sparky
Change-Id: Iab98e063874c9738e48a387cd91341d266391156 Signed-off-by: Francois Toguo francois.toguo.fotso@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31997 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/arch/x86/smbios.c M src/include/smbios.h 2 files changed, 72 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Richard Spiegel: Looks good to me, approved
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 8cb59df..b82780d 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -328,6 +328,17 @@ t->handle = *handle; *handle += 1; t->length = sizeof(struct smbios_type17) - 2; + t->memory_technology = MEMORY_TECHNOLOGY_UNKNOWN; + t->operating_mode_capability = MEMORY_OPERATING_MODE_CAP_UNKNOWN; + t->fw_version = 0xff; + t->manufacturer_id = dimm->mod_id; + t->product_id = 0x0000; + t->sub_ctrl_manufacturer_id = 0x0000; + t->sub_ctrl_product_id = 0x0000; + t->non_volatile_size = 0xffffffffffffffff; + t->volatile_size = 0xffffffffffffffff; + t->cache_size = 0xffffffffffffffff; + t->logical_size = 0xffffffffffffffff; return t->length + smbios_string_table_len(t->eos); }
@@ -547,9 +558,31 @@ return len; }
+u16 __weak smbios_processor_core_thread_count(u16 level_type) +{ + u16 count = 0; + int ecx = 0; + + for (ecx = 0 ; ecx < 255 ; ecx++) { + struct cpuid_result leaf_b; + leaf_b = cpuid_ext(0xb, ecx); + if ((cpuid_eax(0) < 0xb) || + !(leaf_b.eax | leaf_b.ebx | leaf_b.ecx | leaf_b.edx)) + return (((cpuid(1).ebx) >> 16) & 0x00ff); + + if ((leaf_b.ecx & 0xff00) == level_type) { + count = leaf_b.ebx & 0xffff; + break; + } + } + + return count; +} + static int smbios_write_type4(unsigned long *current, int handle) { struct cpuid_result res; + u16 core_count = 0, thread_count = 0; struct smbios_type4 *t = (struct smbios_type4 *)*current; int len = sizeof(struct smbios_type4);
@@ -570,7 +603,15 @@ t->processor_version = smbios_processor_name(t->eos); t->processor_family = (res.eax > 0) ? 0x0c : 0x6; t->processor_type = 3; /* System Processor */ - t->core_count = (res.ebx >> 16) & 0xff; + + core_count = smbios_processor_core_thread_count(PROC_CORE_TYPE); + thread_count = smbios_processor_core_thread_count(PROC_THREAD_TYPE); + t->core_count2 = core_count; + t->core_count = (core_count > BYTE_LIMIT) ? 0xff : core_count; + t->thread_count2 = thread_count; + t->thread_count = (thread_count > BYTE_LIMIT) ? 0xff : core_count; + t->core_enabled2 = core_count; + t->l1_cache_handle = 0xffff; t->l2_cache_handle = 0xffff; t->l3_cache_handle = 0xffff; diff --git a/src/include/smbios.h b/src/include/smbios.h index af83bfe..2f3bc7a 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -52,6 +52,10 @@ u8 smbios_mainboard_feature_flags(void); const char *smbios_mainboard_location_in_chassis(void); u8 smbios_mainboard_enclosure_type(void); +u16 smbios_processor_core_thread_count(u16 level_type); +#ifdef CONFIG_MAINBOARD_FAMILY +const char *smbios_mainboard_family(void); +#endif
#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7) #define BIOS_CHARACTERISTICS_PC_CARD (1 << 8) @@ -100,6 +104,11 @@ #define MEMORY_OPERATING_MODE_CAP_BYTE_ACCESS_PERSISTENT (1 << 4) #define MEMORY_OPERATING_MODE_CAP_BLOCK_ACCESS_PERSISTENT (1 << 5)
+#define PROC_THREAD_TYPE 0x1 +#define PROC_CORE_TYPE 0x2 + +#define BYTE_LIMIT 255 + typedef enum { MEMORY_BUS_WIDTH_8 = 0, MEMORY_BUS_WIDTH_16 = 1, @@ -299,6 +308,8 @@ u8 location_in_chassis; u16 chassis_handle; u8 board_type; + u8 num_cont_obj_handles; + u16 cont_obj_hanles[256]; u8 eos[2]; } __packed;
@@ -390,6 +401,9 @@ u8 thread_count; u16 processor_characteristics; u16 processor_family2; + u16 core_count2; + u16 core_enabled2; + u16 thread_count2; u8 eos[2]; } __packed;
@@ -401,6 +415,11 @@ u8 eos[2]; } __packed;
+typedef struct { + u8 type; + u8 format_descriptor; +} log_type_descriptor; + struct smbios_type15 { u8 type; u8 length; @@ -471,6 +490,17 @@ u16 minimum_voltage; u16 maximum_voltage; u16 configured_voltage; + u8 memory_technology; + u16 operating_mode_capability; + u8 fw_version; + u16 manufacturer_id; + u16 product_id; + u16 sub_ctrl_manufacturer_id; + u16 sub_ctrl_product_id; + u64 non_volatile_size; + u64 volatile_size; + u64 cache_size; + u64 logical_size; u8 eos[2]; } __packed;
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31997 )
Change subject: src/arch: An upgrade of SMBIOS to latest version 3.2 ......................................................................
Patch Set 8:
(1 comment)
https://review.coreboot.org/#/c/31997/8//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/31997/8//COMMIT_MSG@7 PS8, Line 7: src/arch: An upgrade of SMBIOS to latest version 3.2 Please use a statement next time with a verb (in imperative mood).
Upgrade SMBIOS to latest version 3.2.
-
build bot (Jenkins) (Code Review) -
Francois Toguo Fotso (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)
-
Richard Spiegel (Code Review)