* [PATCH v4 1/4] smbios: add processor-family option
2024-01-23 18:42 [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
@ 2024-01-23 18:42 ` Heinrich Schuchardt
2024-01-23 18:42 ` [PATCH v4 2/4] smbios: function to set default processor family Heinrich Schuchardt
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Heinrich Schuchardt @ 2024-01-23 18:42 UTC (permalink / raw)
To: Palmer Dabbelt, Alistair Francis
Cc: Andrew Jones, Paolo Bonzini, Bin Meng, Weiwei Li,
Daniel Henrique Barboza, Liu Zhiwei, Michael S . Tsirkin,
Igor Mammedov, Ani Sinha, qemu-riscv, qemu-devel,
Heinrich Schuchardt
For RISC-V the SMBIOS standard requires specific values of the processor
family value depending on the bitness of the CPU.
Add a processor-family option for SMBIOS table 4.
The value of processor-family may exceed 255 and therefore must be provided
in the Processor Family 2 field. Set the Processor Family field to 0xFE
which signals that the Processor Family 2 is used.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
---
v4:
no change
v3:
no change
v2:
new patch
---
hw/smbios/smbios.c | 13 +++++++++++--
qemu-options.hx | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 2a90601ac5..647bc6d603 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -102,6 +102,7 @@ static struct {
#define DEFAULT_CPU_SPEED 2000
static struct {
+ uint16_t processor_family;
const char *sock_pfx, *manufacturer, *version, *serial, *asset, *part;
uint64_t max_speed;
uint64_t current_speed;
@@ -110,6 +111,7 @@ static struct {
.max_speed = DEFAULT_CPU_SPEED,
.current_speed = DEFAULT_CPU_SPEED,
.processor_id = 0,
+ .processor_family = 0x01, /* Other */
};
struct type8_instance {
@@ -337,6 +339,10 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = {
.name = "part",
.type = QEMU_OPT_STRING,
.help = "part number",
+ }, {
+ .name = "processor-family",
+ .type = QEMU_OPT_NUMBER,
+ .help = "processor family",
}, {
.name = "processor-id",
.type = QEMU_OPT_NUMBER,
@@ -726,7 +732,7 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance)
snprintf(sock_str, sizeof(sock_str), "%s%2x", type4.sock_pfx, instance);
SMBIOS_TABLE_SET_STR(4, socket_designation_str, sock_str);
t->processor_type = 0x03; /* CPU */
- t->processor_family = 0x01; /* Other */
+ t->processor_family = 0xfe; /* use Processor Family 2 field */
SMBIOS_TABLE_SET_STR(4, processor_manufacturer_str, type4.manufacturer);
if (type4.processor_id == 0) {
t->processor_id[0] = cpu_to_le32(smbios_cpuid_version);
@@ -758,7 +764,7 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance)
t->thread_count = (threads_per_socket > 255) ? 0xFF : threads_per_socket;
t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */
- t->processor_family2 = cpu_to_le16(0x01); /* Other */
+ t->processor_family2 = cpu_to_le16(type4.processor_family);
if (tbl_len == SMBIOS_TYPE_4_LEN_V30) {
t->core_count2 = t->core_enabled2 = cpu_to_le16(cores_per_socket);
@@ -1402,6 +1408,9 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
return;
}
save_opt(&type4.sock_pfx, opts, "sock_pfx");
+ type4.processor_family = qemu_opt_get_number(opts,
+ "processor-family",
+ 0x01 /* Other */);
save_opt(&type4.manufacturer, opts, "manufacturer");
save_opt(&type4.version, opts, "version");
save_opt(&type4.serial, opts, "serial");
diff --git a/qemu-options.hx b/qemu-options.hx
index ced8284863..d90bdffc7a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2686,7 +2686,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
" specify SMBIOS type 3 fields\n"
"-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str]\n"
" [,asset=str][,part=str][,max-speed=%d][,current-speed=%d]\n"
- " [,processor-id=%d]\n"
+ " [,processor-family=%d,processor-id=%d]\n"
" specify SMBIOS type 4 fields\n"
"-smbios type=8[,external_reference=str][,internal_reference=str][,connector_type=%d][,port_type=%d]\n"
" specify SMBIOS type 8 fields\n"
@@ -2714,7 +2714,7 @@ SRST
``-smbios type=3[,manufacturer=str][,version=str][,serial=str][,asset=str][,sku=str]``
Specify SMBIOS type 3 fields
-``-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str][,asset=str][,part=str][,processor-id=%d]``
+``-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str][,asset=str][,part=str][,processor-family=%d][,processor-id=%d]``
Specify SMBIOS type 4 fields
``-smbios type=11[,value=str][,path=filename]``
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v4 2/4] smbios: function to set default processor family
2024-01-23 18:42 [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
2024-01-23 18:42 ` [PATCH v4 1/4] smbios: add processor-family option Heinrich Schuchardt
@ 2024-01-23 18:42 ` Heinrich Schuchardt
2024-01-23 18:42 ` [PATCH v4 3/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Heinrich Schuchardt @ 2024-01-23 18:42 UTC (permalink / raw)
To: Palmer Dabbelt, Alistair Francis
Cc: Andrew Jones, Paolo Bonzini, Bin Meng, Weiwei Li,
Daniel Henrique Barboza, Liu Zhiwei, Michael S . Tsirkin,
Igor Mammedov, Ani Sinha, qemu-riscv, qemu-devel,
Heinrich Schuchardt
Provide a function to set the default processor family.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
---
v4:
no change
v3:
no change
v2:
new patch
---
hw/smbios/smbios.c | 7 +++++++
include/hw/firmware/smbios.h | 1 +
2 files changed, 8 insertions(+)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 647bc6d603..c0c5a81e66 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -989,6 +989,13 @@ void smbios_set_cpuid(uint32_t version, uint32_t features)
field = value; \
}
+void smbios_set_default_processor_family(uint16_t processor_family)
+{
+ if (type4.processor_family <= 0x01) {
+ type4.processor_family = processor_family;
+ }
+}
+
void smbios_set_defaults(const char *manufacturer, const char *product,
const char *version, bool legacy_mode,
bool uuid_encoded, SmbiosEntryPointType ep_type)
diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h
index 7f3259a630..6e514982d4 100644
--- a/include/hw/firmware/smbios.h
+++ b/include/hw/firmware/smbios.h
@@ -295,6 +295,7 @@ void smbios_set_cpuid(uint32_t version, uint32_t features);
void smbios_set_defaults(const char *manufacturer, const char *product,
const char *version, bool legacy_mode,
bool uuid_encoded, SmbiosEntryPointType ep_type);
+void smbios_set_default_processor_family(uint16_t processor_family);
uint8_t *smbios_get_table_legacy(MachineState *ms, size_t *length);
void smbios_get_tables(MachineState *ms,
const struct smbios_phys_mem_area *mem_array,
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v4 3/4] target/riscv: SMBIOS support for RISC-V virt machine
2024-01-23 18:42 [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
2024-01-23 18:42 ` [PATCH v4 1/4] smbios: add processor-family option Heinrich Schuchardt
2024-01-23 18:42 ` [PATCH v4 2/4] smbios: function to set default processor family Heinrich Schuchardt
@ 2024-01-23 18:42 ` Heinrich Schuchardt
2024-01-23 18:58 ` Andrew Jones
2024-01-23 18:42 ` [PATCH v4 4/4] qemu-options: enable -smbios option on RISC-V Heinrich Schuchardt
2024-02-05 6:13 ` [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Alistair Francis
4 siblings, 1 reply; 7+ messages in thread
From: Heinrich Schuchardt @ 2024-01-23 18:42 UTC (permalink / raw)
To: Palmer Dabbelt, Alistair Francis
Cc: Andrew Jones, Paolo Bonzini, Bin Meng, Weiwei Li,
Daniel Henrique Barboza, Liu Zhiwei, Michael S . Tsirkin,
Igor Mammedov, Ani Sinha, qemu-riscv, qemu-devel,
Heinrich Schuchardt
Generate SMBIOS tables for the RISC-V mach-virt.
Add CONFIG_SMBIOS=y to the RISC-V default config.
Set the default processor family in the type 4 table.
The implementation is based on the corresponding ARM and Loongson code.
With the patch the following firmware tables are provided:
etc/smbios/smbios-anchor
etc/smbios/smbios-tables
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
v4:
remove a superfluous #ifdef
v3:
use misa_mxl_max to determine bitness
v2:
set processor family
---
hw/riscv/Kconfig | 1 +
hw/riscv/virt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index a50717be87..5d644eb7b1 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -41,6 +41,7 @@ config RISCV_VIRT
select RISCV_IMSIC
select SIFIVE_PLIC
select SIFIVE_TEST
+ select SMBIOS
select VIRTIO_MMIO
select FW_CFG_DMA
select PLATFORM_BUS
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index f9fd1341fc..1b333af4f0 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -36,6 +36,7 @@
#include "hw/riscv/boot.h"
#include "hw/riscv/numa.h"
#include "kvm/kvm_riscv.h"
+#include "hw/firmware/smbios.h"
#include "hw/intc/riscv_aclint.h"
#include "hw/intc/riscv_aplic.h"
#include "hw/intc/sifive_plic.h"
@@ -1263,6 +1264,45 @@ static void create_platform_bus(RISCVVirtState *s, DeviceState *irqchip)
sysbus_mmio_get_region(sysbus, 0));
}
+static void virt_build_smbios(RISCVVirtState *s)
+{
+ MachineClass *mc = MACHINE_GET_CLASS(s);
+ MachineState *ms = MACHINE(s);
+ uint8_t *smbios_tables, *smbios_anchor;
+ size_t smbios_tables_len, smbios_anchor_len;
+ struct smbios_phys_mem_area mem_array;
+ const char *product = "QEMU Virtual Machine";
+
+ if (kvm_enabled()) {
+ product = "KVM Virtual Machine";
+ }
+
+ smbios_set_defaults("QEMU", product, mc->name, false,
+ true, SMBIOS_ENTRY_POINT_TYPE_64);
+
+ if (riscv_is_32bit(&s->soc[0])) {
+ smbios_set_default_processor_family(0x200);
+ } else {
+ smbios_set_default_processor_family(0x201);
+ }
+
+ /* build the array of physical mem area from base_memmap */
+ mem_array.address = s->memmap[VIRT_DRAM].base;
+ mem_array.length = ms->ram_size;
+
+ smbios_get_tables(ms, &mem_array, 1,
+ &smbios_tables, &smbios_tables_len,
+ &smbios_anchor, &smbios_anchor_len,
+ &error_fatal);
+
+ if (smbios_anchor) {
+ fw_cfg_add_file(s->fw_cfg, "etc/smbios/smbios-tables",
+ smbios_tables, smbios_tables_len);
+ fw_cfg_add_file(s->fw_cfg, "etc/smbios/smbios-anchor",
+ smbios_anchor, smbios_anchor_len);
+ }
+}
+
static void virt_machine_done(Notifier *notifier, void *data)
{
RISCVVirtState *s = container_of(notifier, RISCVVirtState,
@@ -1351,6 +1393,8 @@ static void virt_machine_done(Notifier *notifier, void *data)
riscv_setup_direct_kernel(kernel_entry, fdt_load_addr);
}
+ virt_build_smbios(s);
+
if (virt_is_acpi_enabled(s)) {
virt_acpi_setup(s);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 3/4] target/riscv: SMBIOS support for RISC-V virt machine
2024-01-23 18:42 ` [PATCH v4 3/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
@ 2024-01-23 18:58 ` Andrew Jones
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Jones @ 2024-01-23 18:58 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Palmer Dabbelt, Alistair Francis, Paolo Bonzini, Bin Meng,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei,
Michael S . Tsirkin, Igor Mammedov, Ani Sinha, qemu-riscv,
qemu-devel
On Tue, Jan 23, 2024 at 07:42:28PM +0100, Heinrich Schuchardt wrote:
> Generate SMBIOS tables for the RISC-V mach-virt.
> Add CONFIG_SMBIOS=y to the RISC-V default config.
> Set the default processor family in the type 4 table.
>
> The implementation is based on the corresponding ARM and Loongson code.
>
> With the patch the following firmware tables are provided:
>
> etc/smbios/smbios-anchor
> etc/smbios/smbios-tables
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> v4:
> remove a superfluous #ifdef
> v3:
> use misa_mxl_max to determine bitness
> v2:
> set processor family
> ---
> hw/riscv/Kconfig | 1 +
> hw/riscv/virt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 43 insertions(+)
>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 4/4] qemu-options: enable -smbios option on RISC-V
2024-01-23 18:42 [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
` (2 preceding siblings ...)
2024-01-23 18:42 ` [PATCH v4 3/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
@ 2024-01-23 18:42 ` Heinrich Schuchardt
2024-02-05 6:13 ` [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Alistair Francis
4 siblings, 0 replies; 7+ messages in thread
From: Heinrich Schuchardt @ 2024-01-23 18:42 UTC (permalink / raw)
To: Palmer Dabbelt, Alistair Francis
Cc: Andrew Jones, Paolo Bonzini, Bin Meng, Weiwei Li,
Daniel Henrique Barboza, Liu Zhiwei, Michael S . Tsirkin,
Igor Mammedov, Ani Sinha, qemu-riscv, qemu-devel,
Heinrich Schuchardt
With SMBIOS support added for RISC-V we also should enable the command line
option.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
---
v4:
no change
v3:
no change
v2:
new patch
---
qemu-options.hx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index d90bdffc7a..935aec7cb9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2697,7 +2697,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
" specify SMBIOS type 17 fields\n"
"-smbios type=41[,designation=str][,kind=str][,instance=%d][,pcidev=str]\n"
" specify SMBIOS type 41 fields\n",
- QEMU_ARCH_I386 | QEMU_ARCH_ARM | QEMU_ARCH_LOONGARCH)
+ QEMU_ARCH_I386 | QEMU_ARCH_ARM | QEMU_ARCH_LOONGARCH | QEMU_ARCH_RISCV)
SRST
``-smbios file=binary``
Load SMBIOS entry from binary file.
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine
2024-01-23 18:42 [PATCH v4 0/4] target/riscv: SMBIOS support for RISC-V virt machine Heinrich Schuchardt
` (3 preceding siblings ...)
2024-01-23 18:42 ` [PATCH v4 4/4] qemu-options: enable -smbios option on RISC-V Heinrich Schuchardt
@ 2024-02-05 6:13 ` Alistair Francis
4 siblings, 0 replies; 7+ messages in thread
From: Alistair Francis @ 2024-02-05 6:13 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Palmer Dabbelt, Alistair Francis, Andrew Jones, Paolo Bonzini,
Bin Meng, Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei,
Michael S . Tsirkin, Igor Mammedov, Ani Sinha, qemu-riscv,
qemu-devel
On Wed, Jan 24, 2024 at 4:44 AM Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> Generate SMBIOS tables for the RISC-V mach-virt.
> Add CONFIG_SMBIOS=y to the RISC-V default config.
>
> With the series the following firmware tables are provided:
>
> etc/smbios/smbios-anchor
> etc/smbios/smbios-tables
>
> Add processor-family to the '-smbios type=4' command line options.
>
> v4:
> remove a superfluous #ifdef
> v3:
> use misa_mxl_max to determine bitness
> v2:
> set processor family
>
> Heinrich Schuchardt (4):
> smbios: add processor-family option
> smbios: function to set default processor family
> target/riscv: SMBIOS support for RISC-V virt machine
> qemu-options: enable -smbios option on RISC-V
Thanks!
Applied to riscv-to-apply.next
Alistair
>
> hw/riscv/Kconfig | 1 +
> hw/riscv/virt.c | 42 ++++++++++++++++++++++++++++++++++++
> hw/smbios/smbios.c | 20 +++++++++++++++--
> include/hw/firmware/smbios.h | 1 +
> qemu-options.hx | 6 +++---
> 5 files changed, 65 insertions(+), 5 deletions(-)
>
> --
> 2.43.0
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread