On Sat, May 28, 2022 at 6:34 AM Ani Sinha <a...@anisinha.ca> wrote: > > > > On Fri, 27 May 2022, Julia Suvorova wrote: > > > In order to use the increased number of cpus, we need to bring smbios > > tables in line with the SMBIOS 3.0 specification. This allows us to > > introduce core_count2 which acts as a duplicate of core_count if we have > > fewer cores than 256, and contains the actual core number per socket if > > we have more. > > > > core_enabled2 and thread_count2 fields work the same way. > > > > Signed-off-by: Julia Suvorova <jus...@redhat.com> > > Other than the comment below, > Reviewed-by: Ani Sinha <a...@anisinha.ca> > > > --- > > include/hw/firmware/smbios.h | 3 +++ > > hw/smbios/smbios.c | 11 +++++++++-- > > 2 files changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h > > index 4b7ad77a44..c427ae5558 100644 > > --- a/include/hw/firmware/smbios.h > > +++ b/include/hw/firmware/smbios.h > > @@ -187,6 +187,9 @@ struct smbios_type_4 { > > uint8_t thread_count; > > uint16_t processor_characteristics; > > uint16_t processor_family2; > > + uint16_t core_count2; > > + uint16_t core_enabled2; > > + uint16_t thread_count2; > > I would add a comment along the lines of > /* section 7.5, table 21 smbios spec version 3.0.0 */
Ok > > } QEMU_PACKED; > > > > /* SMBIOS type 11 - OEM strings */ > > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > > index 60349ee402..45d7be6b30 100644 > > --- a/hw/smbios/smbios.c > > +++ b/hw/smbios/smbios.c > > @@ -709,8 +709,15 @@ static void smbios_build_type_4_table(MachineState > > *ms, unsigned instance) > > SMBIOS_TABLE_SET_STR(4, serial_number_str, type4.serial); > > SMBIOS_TABLE_SET_STR(4, asset_tag_number_str, type4.asset); > > SMBIOS_TABLE_SET_STR(4, part_number_str, type4.part); > > - t->core_count = t->core_enabled = ms->smp.cores; > > - t->thread_count = ms->smp.threads; > > + > > + t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; > > + t->core_enabled = t->core_count; > > + > > + t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); > > + > > + t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; > > + t->thread_count2 = cpu_to_le16(ms->smp.threads); > > + > > t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ > > t->processor_family2 = cpu_to_le16(0x01); /* Other */ > > > > -- > > 2.35.1 > > > > >