mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
Implement SMBIOS type 9 v2.6
Signed-off-by: Felix Wu <flwu@google.com> Signed-off-by: Nabih Estefan <nabihestefan@google.com> Message-Id: <20240221170027.1027325-3-nabihestefan@google.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
735eee07d1
commit
04f143d828
|
@ -123,7 +123,7 @@ static QTAILQ_HEAD(, type8_instance) type8 = QTAILQ_HEAD_INITIALIZER(type8);
|
|||
|
||||
/* type 9 instance for parsing */
|
||||
struct type9_instance {
|
||||
const char *slot_designation;
|
||||
const char *slot_designation, *pcidev;
|
||||
uint8_t slot_type, slot_data_bus_width, current_usage, slot_length,
|
||||
slot_characteristics1, slot_characteristics2;
|
||||
uint16_t slot_id;
|
||||
|
@ -436,6 +436,11 @@ static const QemuOptDesc qemu_smbios_type9_opts[] = {
|
|||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "slot characteristics2, see the spec",
|
||||
},
|
||||
{
|
||||
.name = "pci_device",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "PCI device, if provided."
|
||||
}
|
||||
};
|
||||
|
||||
static const QemuOptDesc qemu_smbios_type11_opts[] = {
|
||||
|
@ -866,7 +871,7 @@ static void smbios_build_type_8_table(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void smbios_build_type_9_table(void)
|
||||
static void smbios_build_type_9_table(Error **errp)
|
||||
{
|
||||
unsigned instance = 0;
|
||||
struct type9_instance *t9;
|
||||
|
@ -883,6 +888,43 @@ static void smbios_build_type_9_table(void)
|
|||
t->slot_characteristics1 = t9->slot_characteristics1;
|
||||
t->slot_characteristics2 = t9->slot_characteristics2;
|
||||
|
||||
if (t9->pcidev) {
|
||||
PCIDevice *pdev = NULL;
|
||||
int rc = pci_qdev_find_device(t9->pcidev, &pdev);
|
||||
if (rc != 0) {
|
||||
error_setg(errp,
|
||||
"No PCI device %s for SMBIOS type 9 entry %s",
|
||||
t9->pcidev, t9->slot_designation);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* We only handle the case were the device is attached to
|
||||
* the PCI root bus. The general case is more complex as
|
||||
* bridges are enumerated later and the table would need
|
||||
* to be updated at this moment.
|
||||
*/
|
||||
if (!pci_bus_is_root(pci_get_bus(pdev))) {
|
||||
error_setg(errp,
|
||||
"Cannot create type 9 entry for PCI device %s: "
|
||||
"not attached to the root bus",
|
||||
t9->pcidev);
|
||||
return;
|
||||
}
|
||||
t->segment_group_number = cpu_to_le16(0);
|
||||
t->bus_number = pci_dev_bus_num(pdev);
|
||||
t->device_number = pdev->devfn;
|
||||
} else {
|
||||
/*
|
||||
* Per SMBIOS spec, For slots that are not of the PCI, AGP, PCI-X,
|
||||
* or PCI-Express type that do not have bus/device/function
|
||||
* information, 0FFh should be populated in the fields of Segment
|
||||
* Group Number, Bus Number, Device/Function Number.
|
||||
*/
|
||||
t->segment_group_number = 0xff;
|
||||
t->bus_number = 0xff;
|
||||
t->device_number = 0xff;
|
||||
}
|
||||
|
||||
SMBIOS_BUILD_TABLE_POST;
|
||||
instance++;
|
||||
}
|
||||
|
@ -1207,7 +1249,7 @@ void smbios_get_tables(MachineState *ms,
|
|||
}
|
||||
|
||||
smbios_build_type_8_table();
|
||||
smbios_build_type_9_table();
|
||||
smbios_build_type_9_table(errp);
|
||||
smbios_build_type_11_table();
|
||||
|
||||
#define MAX_DIMM_SZ (16 * GiB)
|
||||
|
@ -1556,6 +1598,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
|
|||
t->slot_id = qemu_opt_get_number(opts, "slot_id", 0);
|
||||
t->slot_characteristics1 = qemu_opt_get_number(opts, "slot_characteristics1", 0);
|
||||
t->slot_characteristics2 = qemu_opt_get_number(opts, "slot_characteristics2", 0);
|
||||
save_opt(&t->pcidev, opts, "pcidev");
|
||||
QTAILQ_INSERT_TAIL(&type9, t, next);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -222,6 +222,10 @@ struct smbios_type_9 {
|
|||
uint16_t slot_id;
|
||||
uint8_t slot_characteristics1;
|
||||
uint8_t slot_characteristics2;
|
||||
/* SMBIOS spec v2.6+ */
|
||||
uint16_t segment_group_number;
|
||||
uint8_t bus_number;
|
||||
uint8_t device_number;
|
||||
} QEMU_PACKED;
|
||||
|
||||
/* SMBIOS type 11 - OEM strings */
|
||||
|
|
|
@ -2718,7 +2718,7 @@ SRST
|
|||
``-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=9[,slot_designation=str][,slot_type=%d][,slot_data_bus_width=%d][,current_usage=%d][,slot_length=%d][,slot_id=%d][,slot_characteristics1=%d][,slot_characteristics12=%d]``
|
||||
``-smbios type=9[,slot_designation=str][,slot_type=%d][,slot_data_bus_width=%d][,current_usage=%d][,slot_length=%d][,slot_id=%d][,slot_characteristics1=%d][,slot_characteristics12=%d][,pci_device=str]``
|
||||
Specify SMBIOS type 9 fields
|
||||
|
||||
``-smbios type=11[,value=str][,path=filename]``
|
||||
|
|
Loading…
Reference in a new issue