OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

smbios: add processor-family option

Browse Source 
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>
Message-ID: <20240123184229.10415-2-heinrich.schuchardt@canonical.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Heinrich Schuchardt 2024-01-23 19:42:26 +01:00 committed by Alistair Francis
parent 1c8e491c45
commit b5831d7967
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/smbios/smbios.c
View File

@ -102,6 +102,7 @@ static struct {
#define DEFAULT_CPU_SPEED 2000 #define DEFAULT_CPU_SPEED 2000
static struct { static struct {
uint16_t processor_family;
const char *sock_pfx, *manufacturer, *version, *serial, *asset, *part; const char *sock_pfx, *manufacturer, *version, *serial, *asset, *part;
uint64_t max_speed; uint64_t max_speed;
uint64_t current_speed; uint64_t current_speed;
@ -110,6 +111,7 @@ static struct {
.max_speed = DEFAULT_CPU_SPEED, .max_speed = DEFAULT_CPU_SPEED,
.current_speed = DEFAULT_CPU_SPEED, .current_speed = DEFAULT_CPU_SPEED,
.processor_id = 0, .processor_id = 0,
.processor_family = 0x01, /* Other */
}; };
struct type8_instance { struct type8_instance {
@ -337,6 +339,10 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = {
.name = "part", .name = "part",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "part number", .help = "part number",
}, {
.name = "processor-family",
.type = QEMU_OPT_NUMBER,
.help = "processor family",
}, { }, {
.name = "processor-id", .name = "processor-id",
.type = QEMU_OPT_NUMBER, .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); snprintf(sock_str, sizeof(sock_str), "%s%2x", type4.sock_pfx, instance);
SMBIOS_TABLE_SET_STR(4, socket_designation_str, sock_str); SMBIOS_TABLE_SET_STR(4, socket_designation_str, sock_str);
t->processor_type = 0x03; /* CPU */ 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); SMBIOS_TABLE_SET_STR(4, processor_manufacturer_str, type4.manufacturer);
if (type4.processor_id == 0) { if (type4.processor_id == 0) {
t->processor_id[0] = cpu_to_le32(smbios_cpuid_version); 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->thread_count = (threads_per_socket > 255) ? 0xFF : threads_per_socket;
t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ 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) { if (tbl_len == SMBIOS_TYPE_4_LEN_V30) {
t->core_count2 = t->core_enabled2 = cpu_to_le16(cores_per_socket); 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; return;
} }
save_opt(&type4.sock_pfx, opts, "sock_pfx"); 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.manufacturer, opts, "manufacturer");
save_opt(&type4.version, opts, "version"); save_opt(&type4.version, opts, "version");
save_opt(&type4.serial, opts, "serial"); save_opt(&type4.serial, opts, "serial");

4
qemu-options.hx
View File

@ -2686,7 +2686,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
" specify SMBIOS type 3 fields\n" " specify SMBIOS type 3 fields\n"
"-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str]\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" " [,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" " specify SMBIOS type 4 fields\n"
"-smbios type=8[,external_reference=str][,internal_reference=str][,connector_type=%d][,port_type=%d]\n" "-smbios type=8[,external_reference=str][,internal_reference=str][,connector_type=%d][,port_type=%d]\n"
" specify SMBIOS type 8 fields\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]`` ``-smbios type=3[,manufacturer=str][,version=str][,serial=str][,asset=str][,sku=str]``
Specify SMBIOS type 3 fields 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 Specify SMBIOS type 4 fields
``-smbios type=11[,value=str][,path=filename]`` ``-smbios type=11[,value=str][,path=filename]``