Message ID | 1439345302-13994-5-git-send-email-wei@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Aug 11, 2015 at 10:08:21PM -0400, Wei Huang wrote: > This patch adds support for SMBIOS 3.0 entry point. When caller invokes > smbios_set_defaults(), it can specify entry point as 2.1 or 3.0. Then > smbios_get_tables() will return the entry point table in right format. > > Acked-by: Gabriel Somlo <somlo@cmu.edu> > Tested-by: Gabriel Somlo <somlo@cmu.edu> > Tested-by: Leif Lindholm <leif.lindholm@linaro.org> > Signed-off-by: Wei Huang <wei@redhat.com> > --- > hw/i386/pc_piix.c | 3 +- > hw/i386/pc_q35.c | 3 +- > hw/smbios/smbios.c | 83 +++++++++++++++++++++++++++++++++------------- > include/hw/smbios/smbios.h | 51 ++++++++++++++++++++-------- > 4 files changed, 101 insertions(+), 39 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 653c710..04636b1 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -173,7 +173,8 @@ static void pc_init1(MachineState *machine) > MachineClass *mc = MACHINE_GET_CLASS(machine); > /* These values are guest ABI, do not change */ > smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)", > - mc->name, smbios_legacy_mode, smbios_uuid_encoded); > + mc->name, smbios_legacy_mode, smbios_uuid_encoded, > + SMBIOS_ENTRY_POINT_21); > } > > /* allocate ram and load rom/bios */ > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index d83df14..061507d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -165,7 +165,8 @@ static void pc_q35_init(MachineState *machine) > if (smbios_defaults) { > /* These values are guest ABI, do not change */ > smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)", > - mc->name, smbios_legacy_mode, smbios_uuid_encoded); > + mc->name, smbios_legacy_mode, smbios_uuid_encoded, > + SMBIOS_ENTRY_POINT_21); > } > > /* allocate ram and load rom/bios */ > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > index efdbb5d..de3cab5 100644 > --- a/hw/smbios/smbios.c > +++ b/hw/smbios/smbios.c > @@ -55,7 +55,10 @@ static uint8_t *smbios_tables; > static size_t smbios_tables_len; > static unsigned smbios_table_max; > static unsigned smbios_table_cnt; > -static struct smbios_entry_point ep; > +static SmbiosEntryPointType smbios_ep_type = SMBIOS_ENTRY_POINT_21; > + > +static SmbiosEntryPoint ep; > +static size_t ep_length; I think it's better to drop ep_length and write a function that retrieves length from ep, based on anchor string. Don't duplicate information. > > static int smbios_type4_count = 0; > static bool smbios_immutable; > @@ -771,11 +774,12 @@ 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) > + bool uuid_encoded, SmbiosEntryPointType ep_type) > { > smbios_have_defaults = true; > smbios_legacy = legacy_mode; > smbios_uuid_encoded = uuid_encoded; > + smbios_ep_type = ep_type; > > /* drop unwanted version of command-line file blob(s) */ > if (smbios_legacy) { > @@ -808,26 +812,59 @@ void smbios_set_defaults(const char *manufacturer, const char *product, > > static void smbios_entry_point_setup(void) > { > - memcpy(ep.anchor_string, "_SM_", 4); > - memcpy(ep.intermediate_anchor_string, "_DMI_", 5); > - ep.length = sizeof(struct smbios_entry_point); > - ep.entry_point_revision = 0; /* formatted_area reserved, per spec v2.1+ */ > - memset(ep.formatted_area, 0, 5); > - > - /* compliant with smbios spec v2.8 */ > - ep.smbios_major_version = 2; > - ep.smbios_minor_version = 8; > - ep.smbios_bcd_revision = 0x28; > - > - /* set during table construction, but BIOS may override: */ > - ep.structure_table_length = cpu_to_le16(smbios_tables_len); > - ep.max_structure_size = cpu_to_le16(smbios_table_max); > - ep.number_of_structures = cpu_to_le16(smbios_table_cnt); > - > - /* BIOS must recalculate: */ > - ep.checksum = 0; > - ep.intermediate_checksum = 0; > - ep.structure_table_address = cpu_to_le32(0); > + switch (smbios_ep_type) { > + case SMBIOS_ENTRY_POINT_21: > + memcpy(ep.ep21.anchor_string, "_SM_", 4); > + memcpy(ep.ep21.intermediate_anchor_string, "_DMI_", 5); > + ep.ep21.length = sizeof(struct smbios_21_entry_point); > + ep.ep21.entry_point_revision = 0; /* formatted_area reserved */ > + memset(ep.ep21.formatted_area, 0, 5); > + > + /* compliant with smbios spec v2.8 */ > + ep.ep21.smbios_major_version = 2; > + ep.ep21.smbios_minor_version = 8; > + ep.ep21.smbios_bcd_revision = 0x28; > + > + /* set during table construction, but BIOS may override: */ > + ep.ep21.structure_table_length = cpu_to_le16(smbios_tables_len); > + ep.ep21.max_structure_size = cpu_to_le16(smbios_table_max); > + ep.ep21.number_of_structures = cpu_to_le16(smbios_table_cnt); > + > + /* BIOS must recalculate */ > + ep.ep21.checksum = 0; > + ep.ep21.intermediate_checksum = 0; > + ep.ep21.structure_table_address = cpu_to_le32(0); > + > + /* setup the anchor point length */ > + ep_length = sizeof(struct smbios_21_entry_point); > + > + break; > + case SMBIOS_ENTRY_POINT_30: > + memcpy(ep.ep30.anchor_string, "_SM3_", 5); > + ep.ep30.length = sizeof(struct smbios_30_entry_point); > + ep.ep30.entry_point_revision = 1; > + ep.ep30.reserved = 0; > + > + /* compliant with smbios spec 3.0 */ > + ep.ep30.smbios_major_version = 3; > + ep.ep30.smbios_minor_version = 0; > + ep.ep30.smbios_doc_rev = 0; > + > + /* set during table construct, but BIOS might override */ > + ep.ep30.structure_table_max_size = cpu_to_le32(smbios_tables_len); > + > + /* BIOS must recalculate */ > + ep.ep30.checksum = 0; > + ep.ep30.structure_table_address = cpu_to_le64(0); > + > + /* setup anchor point length */ > + ep_length = sizeof(struct smbios_30_entry_point); > + > + break; > + default: > + abort(); > + break; > + } > } > > void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, > @@ -885,7 +922,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, > *tables = smbios_tables; > *tables_len = smbios_tables_len; > *anchor = (uint8_t *)&ep; > - *anchor_len = sizeof(struct smbios_entry_point); > + *anchor_len = ep_length; > } > > static void save_opt(const char **dest, QemuOpts *opts, const char *name) > diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h > index 4269aab..7d999cd 100644 > --- a/include/hw/smbios/smbios.h > +++ b/include/hw/smbios/smbios.h > @@ -23,25 +23,19 @@ struct smbios_phys_mem_area { > uint64_t length; > }; > > -void smbios_entry_add(QemuOpts *opts); > -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); > -uint8_t *smbios_get_table_legacy(size_t *length); > -void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, > - const unsigned int mem_array_size, > - uint8_t **tables, size_t *tables_len, > - uint8_t **anchor, size_t *anchor_len); > - > /* > * SMBIOS spec defined tables > */ > +typedef enum SmbiosEntryPointType { > + SMBIOS_ENTRY_POINT_21, > + SMBIOS_ENTRY_POINT_30, > +} SmbiosEntryPointType; > > -/* SMBIOS entry point (anchor). > - * BIOS must place this at a 16-bit-aligned address between 0xf0000 and 0xfffff. > +/* SMBIOS entry point > + * BIOS must place this at a 16-bit-aligned address between 0xf0000 > + * and 0xfffff. > */ > -struct smbios_entry_point { > +struct smbios_21_entry_point { > uint8_t anchor_string[4]; > uint8_t checksum; > uint8_t length; > @@ -58,6 +52,25 @@ struct smbios_entry_point { > uint8_t smbios_bcd_revision; > } QEMU_PACKED; > > +/* SMBIOS 3.0 entry point */ > +struct smbios_30_entry_point { > + uint8_t anchor_string[5]; > + uint8_t checksum; > + uint8_t length; > + uint8_t smbios_major_version; > + uint8_t smbios_minor_version; > + uint8_t smbios_doc_rev; > + uint8_t entry_point_revision; > + uint8_t reserved; > + uint32_t structure_table_max_size; > + uint64_t structure_table_address; > +} QEMU_PACKED; > + > +typedef union { > + struct smbios_21_entry_point ep21; > + struct smbios_30_entry_point ep30; > +} QEMU_PACKED SmbiosEntryPoint; > + > /* This goes at the beginning of every SMBIOS structure. */ > struct smbios_structure_header { > uint8_t type; > @@ -232,4 +245,14 @@ struct smbios_type_127 { > struct smbios_structure_header header; > } QEMU_PACKED; > > +void smbios_entry_add(QemuOpts *opts); > +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); > +uint8_t *smbios_get_table_legacy(size_t *length); > +void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, > + const unsigned int mem_array_size, > + uint8_t **tables, size_t *tables_len, > + uint8_t **anchor, size_t *anchor_len); > #endif /*QEMU_SMBIOS_H */ > -- > 1.8.3.1
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 653c710..04636b1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -173,7 +173,8 @@ static void pc_init1(MachineState *machine) MachineClass *mc = MACHINE_GET_CLASS(machine); /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)", - mc->name, smbios_legacy_mode, smbios_uuid_encoded); + mc->name, smbios_legacy_mode, smbios_uuid_encoded, + SMBIOS_ENTRY_POINT_21); } /* allocate ram and load rom/bios */ diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d83df14..061507d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -165,7 +165,8 @@ static void pc_q35_init(MachineState *machine) if (smbios_defaults) { /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)", - mc->name, smbios_legacy_mode, smbios_uuid_encoded); + mc->name, smbios_legacy_mode, smbios_uuid_encoded, + SMBIOS_ENTRY_POINT_21); } /* allocate ram and load rom/bios */ diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index efdbb5d..de3cab5 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -55,7 +55,10 @@ static uint8_t *smbios_tables; static size_t smbios_tables_len; static unsigned smbios_table_max; static unsigned smbios_table_cnt; -static struct smbios_entry_point ep; +static SmbiosEntryPointType smbios_ep_type = SMBIOS_ENTRY_POINT_21; + +static SmbiosEntryPoint ep; +static size_t ep_length; static int smbios_type4_count = 0; static bool smbios_immutable; @@ -771,11 +774,12 @@ 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) + bool uuid_encoded, SmbiosEntryPointType ep_type) { smbios_have_defaults = true; smbios_legacy = legacy_mode; smbios_uuid_encoded = uuid_encoded; + smbios_ep_type = ep_type; /* drop unwanted version of command-line file blob(s) */ if (smbios_legacy) { @@ -808,26 +812,59 @@ void smbios_set_defaults(const char *manufacturer, const char *product, static void smbios_entry_point_setup(void) { - memcpy(ep.anchor_string, "_SM_", 4); - memcpy(ep.intermediate_anchor_string, "_DMI_", 5); - ep.length = sizeof(struct smbios_entry_point); - ep.entry_point_revision = 0; /* formatted_area reserved, per spec v2.1+ */ - memset(ep.formatted_area, 0, 5); - - /* compliant with smbios spec v2.8 */ - ep.smbios_major_version = 2; - ep.smbios_minor_version = 8; - ep.smbios_bcd_revision = 0x28; - - /* set during table construction, but BIOS may override: */ - ep.structure_table_length = cpu_to_le16(smbios_tables_len); - ep.max_structure_size = cpu_to_le16(smbios_table_max); - ep.number_of_structures = cpu_to_le16(smbios_table_cnt); - - /* BIOS must recalculate: */ - ep.checksum = 0; - ep.intermediate_checksum = 0; - ep.structure_table_address = cpu_to_le32(0); + switch (smbios_ep_type) { + case SMBIOS_ENTRY_POINT_21: + memcpy(ep.ep21.anchor_string, "_SM_", 4); + memcpy(ep.ep21.intermediate_anchor_string, "_DMI_", 5); + ep.ep21.length = sizeof(struct smbios_21_entry_point); + ep.ep21.entry_point_revision = 0; /* formatted_area reserved */ + memset(ep.ep21.formatted_area, 0, 5); + + /* compliant with smbios spec v2.8 */ + ep.ep21.smbios_major_version = 2; + ep.ep21.smbios_minor_version = 8; + ep.ep21.smbios_bcd_revision = 0x28; + + /* set during table construction, but BIOS may override: */ + ep.ep21.structure_table_length = cpu_to_le16(smbios_tables_len); + ep.ep21.max_structure_size = cpu_to_le16(smbios_table_max); + ep.ep21.number_of_structures = cpu_to_le16(smbios_table_cnt); + + /* BIOS must recalculate */ + ep.ep21.checksum = 0; + ep.ep21.intermediate_checksum = 0; + ep.ep21.structure_table_address = cpu_to_le32(0); + + /* setup the anchor point length */ + ep_length = sizeof(struct smbios_21_entry_point); + + break; + case SMBIOS_ENTRY_POINT_30: + memcpy(ep.ep30.anchor_string, "_SM3_", 5); + ep.ep30.length = sizeof(struct smbios_30_entry_point); + ep.ep30.entry_point_revision = 1; + ep.ep30.reserved = 0; + + /* compliant with smbios spec 3.0 */ + ep.ep30.smbios_major_version = 3; + ep.ep30.smbios_minor_version = 0; + ep.ep30.smbios_doc_rev = 0; + + /* set during table construct, but BIOS might override */ + ep.ep30.structure_table_max_size = cpu_to_le32(smbios_tables_len); + + /* BIOS must recalculate */ + ep.ep30.checksum = 0; + ep.ep30.structure_table_address = cpu_to_le64(0); + + /* setup anchor point length */ + ep_length = sizeof(struct smbios_30_entry_point); + + break; + default: + abort(); + break; + } } void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, @@ -885,7 +922,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, *tables = smbios_tables; *tables_len = smbios_tables_len; *anchor = (uint8_t *)&ep; - *anchor_len = sizeof(struct smbios_entry_point); + *anchor_len = ep_length; } static void save_opt(const char **dest, QemuOpts *opts, const char *name) diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index 4269aab..7d999cd 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -23,25 +23,19 @@ struct smbios_phys_mem_area { uint64_t length; }; -void smbios_entry_add(QemuOpts *opts); -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); -uint8_t *smbios_get_table_legacy(size_t *length); -void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, - const unsigned int mem_array_size, - uint8_t **tables, size_t *tables_len, - uint8_t **anchor, size_t *anchor_len); - /* * SMBIOS spec defined tables */ +typedef enum SmbiosEntryPointType { + SMBIOS_ENTRY_POINT_21, + SMBIOS_ENTRY_POINT_30, +} SmbiosEntryPointType; -/* SMBIOS entry point (anchor). - * BIOS must place this at a 16-bit-aligned address between 0xf0000 and 0xfffff. +/* SMBIOS entry point + * BIOS must place this at a 16-bit-aligned address between 0xf0000 + * and 0xfffff. */ -struct smbios_entry_point { +struct smbios_21_entry_point { uint8_t anchor_string[4]; uint8_t checksum; uint8_t length; @@ -58,6 +52,25 @@ struct smbios_entry_point { uint8_t smbios_bcd_revision; } QEMU_PACKED; +/* SMBIOS 3.0 entry point */ +struct smbios_30_entry_point { + uint8_t anchor_string[5]; + uint8_t checksum; + uint8_t length; + uint8_t smbios_major_version; + uint8_t smbios_minor_version; + uint8_t smbios_doc_rev; + uint8_t entry_point_revision; + uint8_t reserved; + uint32_t structure_table_max_size; + uint64_t structure_table_address; +} QEMU_PACKED; + +typedef union { + struct smbios_21_entry_point ep21; + struct smbios_30_entry_point ep30; +} QEMU_PACKED SmbiosEntryPoint; + /* This goes at the beginning of every SMBIOS structure. */ struct smbios_structure_header { uint8_t type; @@ -232,4 +245,14 @@ struct smbios_type_127 { struct smbios_structure_header header; } QEMU_PACKED; +void smbios_entry_add(QemuOpts *opts); +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); +uint8_t *smbios_get_table_legacy(size_t *length); +void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, + const unsigned int mem_array_size, + uint8_t **tables, size_t *tables_len, + uint8_t **anchor, size_t *anchor_len); #endif /*QEMU_SMBIOS_H */