diff mbox series

[v2,2/2] coreboot: make use of smbios parser

Message ID 20201007123335.86983-2-christian.gmeiner@gmail.com
State Superseded
Delegated to: Bin Meng
Headers show
Series [v2,1/2] smbios: add parsing API | expand

Commit Message

Christian Gmeiner Oct. 7, 2020, 12:33 p.m. UTC 
If u-boot gets used as coreboot payload it might be nice to get
vendor, model and bios version from smbios. I am not sure about
the output of all the read information.

With qemu target for coreboot this could look this:

CBFS: Found @ offset 14f40 size 3b188
Checking segment from ROM address 0xffc15178
Checking segment from ROM address 0xffc15194
Loading segment from ROM address 0xffc15178
  code (compression=1)
  New segment dstaddr 0x01110000 memsize 0x889ef srcaddr 0xffc151b0 filesize 0x3b150
Loading Segment: addr: 0x01110000 memsz: 0x00000000000889ef filesz: 0x000000000003b150
using LZMA
Loading segment from ROM address 0xffc15194
  Entry Point 0x01110000
BS: BS_PAYLOAD_LOAD run times (exec / console): 77 / 1 ms
Jumping to boot code at 0x01110000(0x07fa7000)

U-Boot 2020.10-00536-g5dcf7cc590-dirty (Oct 07 2020 - 14:21:51 +0200)

CPU: x86_64, vendor AMD, device 663h
DRAM:  127.1 MiB
MMC:
Video: No video mode configured in coreboot!
Video: No video mode configured in coreboot!
Vendor: QEMU
Model: Standard PC (i440FX + PIIX, 1996)
Bios Version: 4.12-3152-g326a499f6f-dirty
Net:   e1000: 52:54:00:12:34:56
       eth0: e1000#0
No working controllers found
Finalizing coreboot
Hit any key to stop autoboot:  0

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
---
 board/coreboot/coreboot/coreboot.c | 45 ++++++++++++++++++++++++++++++
 configs/coreboot_defconfig         |  1 +
 2 files changed, 46 insertions(+)

Comments

Christian Gmeiner Nov. 2, 2020, 9:21 a.m. UTC | #1 
ping

Am Mi., 7. Okt. 2020 um 14:33 Uhr schrieb Christian Gmeiner
<christian.gmeiner@gmail.com>:
>
> If u-boot gets used as coreboot payload it might be nice to get
> vendor, model and bios version from smbios. I am not sure about
> the output of all the read information.
>
> With qemu target for coreboot this could look this:
>
> CBFS: Found @ offset 14f40 size 3b188
> Checking segment from ROM address 0xffc15178
> Checking segment from ROM address 0xffc15194
> Loading segment from ROM address 0xffc15178
>   code (compression=1)
>   New segment dstaddr 0x01110000 memsize 0x889ef srcaddr 0xffc151b0 filesize 0x3b150
> Loading Segment: addr: 0x01110000 memsz: 0x00000000000889ef filesz: 0x000000000003b150
> using LZMA
> Loading segment from ROM address 0xffc15194
>   Entry Point 0x01110000
> BS: BS_PAYLOAD_LOAD run times (exec / console): 77 / 1 ms
> Jumping to boot code at 0x01110000(0x07fa7000)
>
> U-Boot 2020.10-00536-g5dcf7cc590-dirty (Oct 07 2020 - 14:21:51 +0200)
>
> CPU: x86_64, vendor AMD, device 663h
> DRAM:  127.1 MiB
> MMC:
> Video: No video mode configured in coreboot!
> Video: No video mode configured in coreboot!
> Vendor: QEMU
> Model: Standard PC (i440FX + PIIX, 1996)
> Bios Version: 4.12-3152-g326a499f6f-dirty
> Net:   e1000: 52:54:00:12:34:56
>        eth0: e1000#0
> No working controllers found
> Finalizing coreboot
> Hit any key to stop autoboot:  0
>
> Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
> ---
>  board/coreboot/coreboot/coreboot.c | 45 ++++++++++++++++++++++++++++++
>  configs/coreboot_defconfig         |  1 +
>  2 files changed, 46 insertions(+)
>
> diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c
> index b791b82ef4..afb457212a 100644
> --- a/board/coreboot/coreboot/coreboot.c
> +++ b/board/coreboot/coreboot/coreboot.c
> @@ -4,7 +4,9 @@
>   */
>
>  #include <common.h>
> +#include <asm/arch/sysinfo.h>
>  #include <init.h>
> +#include <smbios.h>
>
>  int board_early_init_r(void)
>  {
> @@ -16,3 +18,46 @@ int board_early_init_r(void)
>
>         return 0;
>  }
> +
> +#ifdef CONFIG_SMBIOS_PARSER
> +int show_board_info(void)
> +{
> +       const struct smbios_entry *smbios = smbios_entry(lib_sysinfo.smbios_start, lib_sysinfo.smbios_size);
> +
> +       if (!smbios)
> +               goto fallback;
> +
> +       const struct smbios_header *bios = smbios_header(smbios, SMBIOS_BIOS_INFORMATION);
> +       const struct smbios_header *system = smbios_header(smbios, SMBIOS_SYSTEM_INFORMATION);
> +       const struct smbios_type0 *t0 = (struct smbios_type0 *)bios;
> +       const struct smbios_type1 *t1 = (struct smbios_type1 *)system;
> +
> +       if (!t0 || !t1)
> +               goto fallback;
> +
> +       const char *bios_ver = smbios_string(bios, t0->bios_ver);
> +       const char *model = smbios_string(system, t1->product_name);
> +       const char *manufacturer = smbios_string(system, t1->manufacturer);
> +
> +       if (!model || !manufacturer || !bios_ver)
> +               goto fallback;
> +
> +       printf("Vendor: %s\n", manufacturer);
> +       printf("Model: %s\n", model);
> +       printf("Bios Version: %s\n", bios_ver);
> +
> +       return 0;
> +
> +fallback:
> +#ifdef CONFIG_OF_CONTROL
> +       DECLARE_GLOBAL_DATA_PTR;
> +
> +       model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
> +
> +       if (model)
> +               printf("Model: %s\n", model);
> +#endif
> +
> +       return checkboard();
> +}
> +#endif
> diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
> index 3249b2fb2f..501a20e790 100644
> --- a/configs/coreboot_defconfig
> +++ b/configs/coreboot_defconfig
> @@ -43,3 +43,4 @@ CONFIG_SOUND=y
>  CONFIG_SOUND_I8254=y
>  CONFIG_CONSOLE_SCROLL_LINES=5
>  # CONFIG_GZIP is not set
> +CONFIG_SMBIOS_PARSER=y
> --
> 2.28.0
>
Bin Meng Nov. 3, 2020, 7:20 a.m. UTC | #2 
On Wed, Oct 7, 2020 at 8:33 PM Christian Gmeiner
<christian.gmeiner@gmail.com> wrote:
>
> If u-boot gets used as coreboot payload it might be nice to get
> vendor, model and bios version from smbios. I am not sure about
> the output of all the read information.
>
> With qemu target for coreboot this could look this:
>
> CBFS: Found @ offset 14f40 size 3b188
> Checking segment from ROM address 0xffc15178
> Checking segment from ROM address 0xffc15194
> Loading segment from ROM address 0xffc15178
>   code (compression=1)
>   New segment dstaddr 0x01110000 memsize 0x889ef srcaddr 0xffc151b0 filesize 0x3b150
> Loading Segment: addr: 0x01110000 memsz: 0x00000000000889ef filesz: 0x000000000003b150
> using LZMA
> Loading segment from ROM address 0xffc15194
>   Entry Point 0x01110000
> BS: BS_PAYLOAD_LOAD run times (exec / console): 77 / 1 ms
> Jumping to boot code at 0x01110000(0x07fa7000)
>
> U-Boot 2020.10-00536-g5dcf7cc590-dirty (Oct 07 2020 - 14:21:51 +0200)
>
> CPU: x86_64, vendor AMD, device 663h
> DRAM:  127.1 MiB
> MMC:
> Video: No video mode configured in coreboot!
> Video: No video mode configured in coreboot!
> Vendor: QEMU
> Model: Standard PC (i440FX + PIIX, 1996)
> Bios Version: 4.12-3152-g326a499f6f-dirty
> Net:   e1000: 52:54:00:12:34:56
>        eth0: e1000#0
> No working controllers found
> Finalizing coreboot
> Hit any key to stop autoboot:  0
>
> Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
> ---
>  board/coreboot/coreboot/coreboot.c | 45 ++++++++++++++++++++++++++++++
>  configs/coreboot_defconfig         |  1 +
>  2 files changed, 46 insertions(+)
>
> diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c
> index b791b82ef4..afb457212a 100644
> --- a/board/coreboot/coreboot/coreboot.c
> +++ b/board/coreboot/coreboot/coreboot.c
> @@ -4,7 +4,9 @@
>   */
>
>  #include <common.h>
> +#include <asm/arch/sysinfo.h>
>  #include <init.h>
> +#include <smbios.h>
>
>  int board_early_init_r(void)
>  {
> @@ -16,3 +18,46 @@ int board_early_init_r(void)
>
>         return 0;
>  }
> +
> +#ifdef CONFIG_SMBIOS_PARSER
> +int show_board_info(void)
> +{
> +       const struct smbios_entry *smbios = smbios_entry(lib_sysinfo.smbios_start, lib_sysinfo.smbios_size);
> +
> +       if (!smbios)
> +               goto fallback;
> +
> +       const struct smbios_header *bios = smbios_header(smbios, SMBIOS_BIOS_INFORMATION);
> +       const struct smbios_header *system = smbios_header(smbios, SMBIOS_SYSTEM_INFORMATION);
> +       const struct smbios_type0 *t0 = (struct smbios_type0 *)bios;
> +       const struct smbios_type1 *t1 = (struct smbios_type1 *)system;
> +
> +       if (!t0 || !t1)
> +               goto fallback;
> +
> +       const char *bios_ver = smbios_string(bios, t0->bios_ver);
> +       const char *model = smbios_string(system, t1->product_name);
> +       const char *manufacturer = smbios_string(system, t1->manufacturer);
> +
> +       if (!model || !manufacturer || !bios_ver)
> +               goto fallback;
> +
> +       printf("Vendor: %s\n", manufacturer);
> +       printf("Model: %s\n", model);
> +       printf("Bios Version: %s\n", bios_ver);

nits: Bios -> BIOS

> +
> +       return 0;
> +
> +fallback:
> +#ifdef CONFIG_OF_CONTROL
> +       DECLARE_GLOBAL_DATA_PTR;
> +
> +       model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
> +
> +       if (model)
> +               printf("Model: %s\n", model);
> +#endif
> +
> +       return checkboard();
> +}
> +#endif
> diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
> index 3249b2fb2f..501a20e790 100644
> --- a/configs/coreboot_defconfig
> +++ b/configs/coreboot_defconfig
> @@ -43,3 +43,4 @@ CONFIG_SOUND=y
>  CONFIG_SOUND_I8254=y
>  CONFIG_CONSOLE_SCROLL_LINES=5
>  # CONFIG_GZIP is not set
> +CONFIG_SMBIOS_PARSER=y

Please make sure the Kconfig option is inserted in a correct order

Otherwise:
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Bin
diff mbox series

Patch

diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c
index b791b82ef4..afb457212a 100644
--- a/board/coreboot/coreboot/coreboot.c
+++ b/board/coreboot/coreboot/coreboot.c
@@ -4,7 +4,9 @@ 
  */
 
 #include <common.h>
+#include <asm/arch/sysinfo.h>
 #include <init.h>
+#include <smbios.h>
 
 int board_early_init_r(void)
 {
@@ -16,3 +18,46 @@  int board_early_init_r(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_SMBIOS_PARSER
+int show_board_info(void)
+{
+	const struct smbios_entry *smbios = smbios_entry(lib_sysinfo.smbios_start, lib_sysinfo.smbios_size);
+
+	if (!smbios)
+		goto fallback;
+
+	const struct smbios_header *bios = smbios_header(smbios, SMBIOS_BIOS_INFORMATION);
+	const struct smbios_header *system = smbios_header(smbios, SMBIOS_SYSTEM_INFORMATION);
+	const struct smbios_type0 *t0 = (struct smbios_type0 *)bios;
+	const struct smbios_type1 *t1 = (struct smbios_type1 *)system;
+
+	if (!t0 || !t1)
+		goto fallback;
+
+	const char *bios_ver = smbios_string(bios, t0->bios_ver);
+	const char *model = smbios_string(system, t1->product_name);
+	const char *manufacturer = smbios_string(system, t1->manufacturer);
+
+	if (!model || !manufacturer || !bios_ver)
+		goto fallback;
+
+	printf("Vendor: %s\n", manufacturer);
+	printf("Model: %s\n", model);
+	printf("Bios Version: %s\n", bios_ver);
+
+	return 0;
+
+fallback:
+#ifdef CONFIG_OF_CONTROL
+	DECLARE_GLOBAL_DATA_PTR;
+
+	model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
+
+	if (model)
+		printf("Model: %s\n", model);
+#endif
+
+	return checkboard();
+}
+#endif
diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index 3249b2fb2f..501a20e790 100644
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -43,3 +43,4 @@  CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_CONSOLE_SCROLL_LINES=5
 # CONFIG_GZIP is not set
+CONFIG_SMBIOS_PARSER=y