[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/54] acpi: ich9-smb: add support for AcpiDevAmlIf interface
From: |
Michael S. Tsirkin |
Subject: |
[PULL 15/54] acpi: ich9-smb: add support for AcpiDevAmlIf interface |
Date: |
Fri, 10 Jun 2022 03:57:45 -0400 |
From: Igor Mammedov <imammedo@redhat.com>
wire AcpiDevAmlIf interface to build ich9-smb and its slave
devices AML. It will be used by followup patches to switch
from creating AML in ad-hoc way to a more systematic one
that will scan present devices and ask them to provide
their AML code like it's done with ISA devices.
This patch is a partial conversion, as it only fetches
AML from slave devices attached to its I2C bus.
The conversion will be completed when PCI bus is
switched to use AcpiDevAmlIf and build_smb0() could be
dropped.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220608135340.3304695-16-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i2c/smbus_ich9.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 44dd5653b7..ee50ba1f2c 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -29,6 +29,7 @@
#include "hw/i386/ich9.h"
#include "qom/object.h"
+#include "hw/acpi/acpi_aml_interface.h"
OBJECT_DECLARE_SIMPLE_TYPE(ICH9SMBState, ICH9_SMB_DEVICE)
@@ -94,10 +95,22 @@ static void ich9_smbus_realize(PCIDevice *d, Error **errp)
&s->smb.io);
}
+static void build_ich9_smb_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ BusChild *kid;
+ ICH9SMBState *s = ICH9_SMB_DEVICE(adev);
+ BusState *bus = BUS(s->smb.smbus);
+
+ QTAILQ_FOREACH(kid, &bus->children, sibling) {
+ call_dev_aml_func(DEVICE(kid->child), scope);
+ }
+}
+
static void ich9_smb_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_ICH9_6;
@@ -112,6 +125,7 @@ static void ich9_smb_class_init(ObjectClass *klass, void
*data)
* pc_q35_init()
*/
dc->user_creatable = false;
+ adevc->build_dev_aml = build_ich9_smb_aml;
}
static void ich9_smb_set_irq(PMSMBus *pmsmb, bool enabled)
@@ -143,6 +157,7 @@ static const TypeInfo ich9_smb_info = {
.class_init = ich9_smb_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { TYPE_ACPI_DEV_AML_IF },
{ },
},
};
--
MST
- [PULL 05/54] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, (continued)
- [PULL 05/54] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 07/54] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 08/54] isa-bus: drop no longer used ISADeviceClass::build_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 06/54] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 11/54] tests: acpi: update expected blob DSDT.ipmismbus, Michael S. Tsirkin, 2022/06/10
- [PULL 09/54] tests: acpi: add and whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 10/54] tests: acpi: q35: add test for smbus-ipmi device, Michael S. Tsirkin, 2022/06/10
- [PULL 12/54] tests: acpi: whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 13/54] ipmi: acpi: use relative path to resource source, Michael S. Tsirkin, 2022/06/10
- [PULL 14/54] tests: acpi: update expected DSDT.ipmismbus blob, Michael S. Tsirkin, 2022/06/10
- [PULL 15/54] acpi: ich9-smb: add support for AcpiDevAmlIf interface,
Michael S. Tsirkin <=
- [PULL 16/54] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors, Michael S. Tsirkin, 2022/06/10
- [PULL 17/54] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi, Michael S. Tsirkin, 2022/06/10
- [PULL 18/54] tests: acpi: white-list to be re-factored pc/q35 DSDT, Michael S. Tsirkin, 2022/06/10
- [PULL 19/54] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors, Michael S. Tsirkin, 2022/06/10
- [PULL 20/54] acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors, Michael S. Tsirkin, 2022/06/10
- [PULL 21/54] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/06/10
- [PULL 22/54] tests: acpi: add and white-list DSDT.applesmc expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 23/54] tests: acpi: add applesmc testcase, Michael S. Tsirkin, 2022/06/10
- [PULL 24/54] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML, Michael S. Tsirkin, 2022/06/10
- [PULL 25/54] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/06/10