[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/55] ipmi: Add firmware registration to the ISA int
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 22/55] ipmi: Add firmware registration to the ISA interface |
Date: |
Tue, 22 Dec 2015 18:53:43 +0200 |
From: Corey Minyard <address@hidden>
Signed-off-by: Corey Minyard <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/ipmi/isa_ipmi_bt.c | 15 +++++++++++++++
hw/ipmi/isa_ipmi_kcs.c | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 03eb9cc..21fa4a7 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -407,6 +407,7 @@ typedef struct ISAIPMIBTDevice {
ISADevice dev;
int32 isairq;
IPMIBT bt;
+ IPMIFwInfo fwinfo;
} ISAIPMIBTDevice;
static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp)
@@ -435,6 +436,20 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error
**errp)
qdev_set_legacy_instance_id(dev, iib->bt.io_base, iib->bt.io_length);
isa_register_ioport(isadev, &iib->bt.io, iib->bt.io_base);
+
+ iib->fwinfo.interface_name = "bt";
+ iib->fwinfo.interface_type = IPMI_SMBIOS_BT;
+ iib->fwinfo.ipmi_spec_major_revision = 2;
+ iib->fwinfo.ipmi_spec_minor_revision = 0;
+ iib->fwinfo.base_address = iib->bt.io_base;
+ iib->fwinfo.register_length = iib->bt.io_length;
+ iib->fwinfo.register_spacing = 1;
+ iib->fwinfo.memspace = IPMI_MEMSPACE_IO;
+ iib->fwinfo.irq_type = IPMI_LEVEL_IRQ;
+ iib->fwinfo.interrupt_number = iib->isairq;
+ iib->fwinfo.acpi_parent = "\\_SB.PCI0.ISA";
+ iib->fwinfo.i2c_slave_address = iib->bt.bmc->slave_addr;
+ ipmi_add_fwinfo(&iib->fwinfo, errp);
}
static const VMStateDescription vmstate_ISAIPMIBTDevice = {
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index b588711..c662aee 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -370,6 +370,7 @@ typedef struct ISAIPMIKCSDevice {
ISADevice dev;
int32 isairq;
IPMIKCS kcs;
+ IPMIFwInfo fwinfo;
} ISAIPMIKCSDevice;
static void ipmi_isa_realize(DeviceState *dev, Error **errp)
@@ -398,6 +399,20 @@ static void ipmi_isa_realize(DeviceState *dev, Error
**errp)
qdev_set_legacy_instance_id(dev, iik->kcs.io_base, iik->kcs.io_length);
isa_register_ioport(isadev, &iik->kcs.io, iik->kcs.io_base);
+
+ iik->fwinfo.interface_name = "kcs";
+ iik->fwinfo.interface_type = IPMI_SMBIOS_KCS;
+ iik->fwinfo.ipmi_spec_major_revision = 2;
+ iik->fwinfo.ipmi_spec_minor_revision = 0;
+ iik->fwinfo.base_address = iik->kcs.io_base;
+ iik->fwinfo.i2c_slave_address = iik->kcs.bmc->slave_addr;
+ iik->fwinfo.register_length = iik->kcs.io_length;
+ iik->fwinfo.register_spacing = 1;
+ iik->fwinfo.memspace = IPMI_MEMSPACE_IO;
+ iik->fwinfo.irq_type = IPMI_LEVEL_IRQ;
+ iik->fwinfo.interrupt_number = iik->isairq;
+ iik->fwinfo.acpi_parent = "\\_SB.PCI0.ISA";
+ ipmi_add_fwinfo(&iik->fwinfo, errp);
}
const VMStateDescription vmstate_ISAIPMIKCSDevice = {
--
MST
- [Qemu-devel] [PULL 12/55] pc: Group and document related PCMachineState/PCMachineclass fields, (continued)
- [Qemu-devel] [PULL 12/55] pc: Group and document related PCMachineState/PCMachineclass fields, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 13/55] Add a base IPMI interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 15/55] ipmi: Add an external connection simulation interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 14/55] ipmi: Add a local BMC simulation, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 17/55] ipmi: Add a BT low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 16/55] ipmi: Add an ISA KCS low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 18/55] ipmi: Add tests, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 20/55] ipmi: Add migration capability to the IPMI devices., Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 19/55] ipmi: Add documentation, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 23/55] ipmi: Add a force off function, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 22/55] ipmi: Add firmware registration to the ISA interface,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 21/55] ipmi: Add a firmware configuration repository, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 24/55] q35: skip q35-acpi-dsdt.aml load if not needed, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 25/55] pc: Remove redundant code from pc-*-2.3 machine classes, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 26/55] pc: Add pc-*-2.6 machine classes, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 27/55] pc: Change indentation of PC_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 28/55] hw/compat.h: Change indentation of HW_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 30/55] nvdimm: implement NVDIMM device abstract, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 29/55] docs/pci_expander_bridge: fix typo, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 31/55] acpi: support specified oem table id for build_header, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 32/55] nvdimm acpi: build ACPI NFIT table, Michael S. Tsirkin, 2015/12/22