* [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation
@ 2022-05-16 15:25 Igor Mammedov
2022-05-16 15:25 ` [PATCH 01/35] acpi: add interface to build device specific AML Igor Mammedov
` (36 more replies)
0 siblings, 37 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Series is excerpt form larger refactoring that does
the same for PCI devices, but it's too large at this
point, so I've split off a relatively self-contained
ISA/SMBUS patches into a smaller separate series, and
PCI refactoring will follow up on top of this series
using the same AcpiDevAmlIf interface.
Series consolidates and unifies how pc/q35 machine
generates AML for ISA and SMBUS devices. It adds
a new more generic interface 'AcpiDevAmlIf' that
replaces ISA specific ISADeviceClass::build_aml
hook and should allow to use the same approach
(i.e. ask a device to provide its own AML) but
not limited to ISA bus.
Series applies AcpiDevAmlIf interface to a few
ISA devices that were already using
ISADeviceClass::build_aml and to devices /tpm,
applesmc,pvpanic,ipmi/ that were generated in
custom way. The AML generation for the later
class is normalized to behave like any other
ISA device that were using ISADeviceClass::build_aml
and converted to interface 'AcpiDevAmlIf'.
It simplifies process of building DSDT and
eliminates custom probing/wiring for those devices
as AML for them is generated at the time ISA/SMBUS
is enumerated.
Changes to DSDT tables QEMU generates are mostly
contextual where devices scattered across DSDT
are consolidated under respective device that
hosts bus they are attached to.
PS:
+ series adds several ACPI tests for devices
that were missing them.
Igor Mammedov (35):
acpi: add interface to build device specific AML
acpi: make isa_build_aml() support AcpiDevAmlIf interface
acpi: fdc-isa: replace ISADeviceClass::build_aml with
AcpiDevAmlIfClass:build_dev_aml
acpi: parallel port: replace ISADeviceClass::build_aml with
AcpiDevAmlIfClass:build_dev_aml
acpi: serial-is: replace ISADeviceClass::build_aml with
AcpiDevAmlIfClass:build_dev_aml
acpi: mc146818rtc: replace ISADeviceClass::build_aml with
AcpiDevAmlIfClass:build_dev_aml
acpi: pckbd: replace ISADeviceClass::build_aml with
AcpiDevAmlIfClass:build_dev_aml
isa-bus: drop no longer used ISADeviceClass::build_aml
tests: acpi: add and whitelist DSDT.ipmismbus expected blob
tests: acpi: q35: add test for smbus-ipmi device
tests: acpi: update expected blob DSDT.ipmismbus
tests: acpi: whitelist DSDT.ipmismbus expected blob
ipmi: acpi: use relative path to resource source
tests: acpi: update expected DSDT.ipmismbus blob
acpi: ich9-smb: add support for AcpiDevAmlIf interface
acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device
descriptors
q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi
tests: acpi: white-list to be re-factored pc/q35 DSDT
acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device
descriptors
acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device
descriptors
tests: acpi: update expected blobs
tests: acpi: add and white-list DSDT.applesmc expected blob
tests: acpi: add applesmc testcase
acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide
device's AML
tests: acpi: update expected blobs
tests: acpi: white-lists expected DSDT.pvpanic-isa blob
tests: acpi: add pvpanic-isa: testcase
acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide
device's AML
tests: acpi: update expected DSDT.pvpanic-isa blob
tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs
acpi: pc/q35: tpm-tis: fix TPM device scope
acpi: pc/q35: remove not needed 'if' condition on pci bus
acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's
AML
tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs
x86: acpi-build: do not include hw/isa/isa.h directly
include/hw/acpi/acpi_aml_interface.h | 40 ++++++
include/hw/acpi/ipmi.h | 9 +-
include/hw/i386/pc.h | 1 -
include/hw/isa/isa.h | 15 ---
include/hw/misc/pvpanic.h | 9 --
hw/acpi/acpi_interface.c | 8 ++
hw/acpi/ipmi-stub.c | 2 +-
hw/acpi/ipmi.c | 53 +++-----
hw/acpi/meson.build | 2 +-
hw/block/fdc-isa.c | 16 ++-
hw/char/parallel.c | 14 ++-
hw/char/serial-isa.c | 14 ++-
hw/i2c/smbus_ich9.c | 15 +++
hw/i386/acpi-build.c | 171 ++++++--------------------
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
hw/input/pckbd.c | 14 ++-
hw/ipmi/isa_ipmi_bt.c | 4 +
hw/ipmi/isa_ipmi_kcs.c | 4 +
hw/ipmi/smbus_ipmi.c | 4 +
hw/isa/isa-bus.c | 9 +-
hw/isa/lpc_ich9.c | 19 +++
hw/isa/piix3.c | 17 +++
hw/misc/applesmc.c | 29 +++++
hw/misc/pvpanic-isa.c | 42 +++++++
hw/rtc/mc146818rtc.c | 14 ++-
hw/tpm/tpm_tis_isa.c | 32 +++++
tests/data/acpi/pc/DSDT | Bin 6002 -> 5987 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 5969 -> 5954 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7327 -> 7312 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 8668 -> 8653 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6466 -> 6451 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7656 -> 7641 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 5969 -> 5954 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3069 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6074 -> 6059 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7361 -> 7346 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 5860 -> 5845 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6008 -> 5993 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6210 -> 6195 bytes
tests/data/acpi/q35/DSDT | Bin 8289 -> 8274 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8306 -> 8291 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9599 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 0 -> 8320 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 10988 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8738 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9943 -> 9928 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8349 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 0 -> 8363 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8306 -> 8291 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9633 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9404 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8583 -> 8568 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8132 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8295 -> 8280 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 0 -> 8375 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8900 -> 8880 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8921 -> 8906 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9398 -> 9383 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35652 -> 35637 bytes
tests/qtest/bios-tables-test.c | 40 ++++++
61 files changed, 360 insertions(+), 239 deletions(-)
create mode 100644 include/hw/acpi/acpi_aml_interface.h
create mode 100644 tests/data/acpi/q35/DSDT.applesmc
create mode 100644 tests/data/acpi/q35/DSDT.ipmismbus
create mode 100644 tests/data/acpi/q35/DSDT.pvpanic-isa
--
2.31.1
^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH 01/35] acpi: add interface to build device specific AML
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-18 10:00 ` Ani Sinha
2022-05-16 15:25 ` [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface Igor Mammedov
` (35 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
There is already ISADeviceClass::build_aml() callback which
builds device specific AML blob for some ISA devices.
To extend the same idea to other devices, add TYPE_ACPI_DEV_AML_IF
Interface that will provide a more generic callback which
will be used not only for ISA but other devices. It will
allow get rid of some data-mining and ad-hoc AML building,
by asking device(s) to generate its own AML blob like it's
done for ISA devices.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/acpi_aml_interface.h | 40 ++++++++++++++++++++++++++++
hw/acpi/acpi_interface.c | 8 ++++++
hw/acpi/meson.build | 2 +-
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 include/hw/acpi/acpi_aml_interface.h
diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
new file mode 100644
index 0000000000..ab76f0e55d
--- /dev/null
+++ b/include/hw/acpi/acpi_aml_interface.h
@@ -0,0 +1,40 @@
+#ifndef ACPI_AML_INTERFACE_H
+#define ACPI_AML_INTERFACE_H
+
+#include "qom/object.h"
+#include "hw/acpi/aml-build.h"
+
+#define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface"
+typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass;
+DECLARE_CLASS_CHECKERS(AcpiDevAmlIfClass, ACPI_DEV_AML_IF, TYPE_ACPI_DEV_AML_IF)
+#define ACPI_DEV_AML_IF(obj) \
+ INTERFACE_CHECK(AcpiDevAmlIf, (obj), TYPE_ACPI_DEV_AML_IF)
+
+typedef struct AcpiDevAmlIf AcpiDevAmlIf;
+typedef void (*dev_aml_fn)(AcpiDevAmlIf *adev, Aml *scope);
+
+/**
+ * AcpiDevAmlIfClass:
+ *
+ * build_dev_aml: adds device specific AML blob to provided scope
+ *
+ * Interface is designed for providing generic callback that builds device
+ * specific AML blob.
+ */
+struct AcpiDevAmlIfClass {
+ /* <private> */
+ InterfaceClass parent_class;
+
+ /* <public> */
+ dev_aml_fn build_dev_aml;
+};
+
+static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_ACPI_DEV_AML_IF)) {
+ AcpiDevAmlIfClass *klass = ACPI_DEV_AML_IF_GET_CLASS(dev);
+ klass->build_dev_aml(ACPI_DEV_AML_IF(dev), scope);
+ }
+}
+
+#endif
diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c
index 6583917b8e..c668d361f6 100644
--- a/hw/acpi/acpi_interface.c
+++ b/hw/acpi/acpi_interface.c
@@ -1,5 +1,6 @@
#include "qemu/osdep.h"
#include "hw/acpi/acpi_dev_interface.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "qemu/module.h"
void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event)
@@ -18,8 +19,15 @@ static void register_types(void)
.parent = TYPE_INTERFACE,
.class_size = sizeof(AcpiDeviceIfClass),
};
+ static const TypeInfo acpi_dev_aml_if_info = {
+ .name = TYPE_ACPI_DEV_AML_IF,
+ .parent = TYPE_INTERFACE,
+ .class_size = sizeof(AcpiDevAmlIfClass),
+ };
+
type_register_static(&acpi_dev_if_info);
+ type_register_static(&acpi_dev_aml_if_info);
}
type_init(register_types)
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index 8bea2e6933..9504f5ce09 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -28,7 +28,7 @@ acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
if have_tpm
acpi_ss.add(files('tpm.c'))
endif
-softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
+softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c',
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
2022-05-16 15:25 ` [PATCH 01/35] acpi: add interface to build device specific AML Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-18 10:13 ` Ani Sinha
2022-05-16 15:25 ` [PATCH 03/35] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml Igor Mammedov
` (34 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
To allow incremental conversion from ISADeviceClass::build_aml
to AcpiDevAmlIf, add support for the later without removing
the former. Once conversion is complete, another commit will
drop ISADeviceClass::build_aml related code.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/isa/isa-bus.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index cd5ad3687d..237e2cee12 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -24,6 +24,7 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/isa/isa.h"
+#include "hw/acpi/acpi_aml_interface.h"
static ISABus *isabus;
@@ -196,8 +197,12 @@ void isa_build_aml(ISABus *bus, Aml *scope)
QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) {
dev = ISA_DEVICE(kid->child);
dc = ISA_DEVICE_GET_CLASS(dev);
+ bool has_build_dev_aml = !!object_dynamic_cast(OBJECT(dev),
+ TYPE_ACPI_DEV_AML_IF);
if (dc->build_aml) {
dc->build_aml(dev, scope);
+ } else if (has_build_dev_aml) {
+ call_dev_aml_func(DEVICE(dev), scope);
}
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 03/35] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
2022-05-16 15:25 ` [PATCH 01/35] acpi: add interface to build device specific AML Igor Mammedov
2022-05-16 15:25 ` [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 04/35] acpi: parallel port: " Igor Mammedov
` (33 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/block/fdc-isa.c | 16 ++++++++++------
hw/i386/acpi-build.c | 1 -
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index fa20450747..fee1ca68a8 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -32,7 +32,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
@@ -214,9 +214,9 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)
return val;
}
-static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
+static void build_fdc_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- FDCtrlISABus *isa = ISA_FDC(isadev);
+ FDCtrlISABus *isa = ISA_FDC(adev);
Aml *dev;
Aml *crs;
int i;
@@ -241,7 +241,7 @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
aml_append(dev, aml_name_decl("_CRS", crs));
for (i = 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) {
- FloppyDriveType type = isa_fdc_get_drive_type(isadev, i);
+ FloppyDriveType type = isa_fdc_get_drive_type(ISA_DEVICE(adev), i);
if (type < FLOPPY_DRIVE_TYPE_NONE) {
fde_buf[i] = cpu_to_le32(1); /* drive present */
@@ -283,14 +283,14 @@ static Property isa_fdc_properties[] = {
static void isabus_fdc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->desc = "virtual floppy controller";
dc->realize = isabus_fdc_realize;
dc->fw_name = "fdc";
dc->reset = fdctrl_external_reset_isa;
dc->vmsd = &vmstate_isa_fdc;
- isa->build_aml = fdc_isa_build_aml;
+ adevc->build_dev_aml = build_fdc_aml;
device_class_set_props(dc, isa_fdc_properties);
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
@@ -313,6 +313,10 @@ static const TypeInfo isa_fdc_info = {
.instance_size = sizeof(FDCtrlISABus),
.class_init = isabus_fdc_class_init,
.instance_init = isabus_fdc_instance_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void isa_fdc_register_types(void)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index dcf6ece3d0..92455579b2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -39,7 +39,6 @@
#include "hw/acpi/bios-linker-loader.h"
#include "hw/isa/isa.h"
#include "hw/input/i8042.h"
-#include "hw/block/fdc.h"
#include "hw/acpi/memory_hotplug.h"
#include "sysemu/tpm.h"
#include "hw/acpi/tpm.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 04/35] acpi: parallel port: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (2 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 03/35] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 05/35] acpi: serial-is: " Igor Mammedov
` (32 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/char/parallel.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index f735a6cd7f..1c9ca47820 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -28,7 +28,7 @@
#include "qemu/module.h"
#include "chardev/char-parallel.h"
#include "chardev/char-fe.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
@@ -570,9 +570,9 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp)
s, "parallel");
}
-static void parallel_isa_build_aml(ISADevice *isadev, Aml *scope)
+static void parallel_isa_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- ISAParallelState *isa = ISA_PARALLEL(isadev);
+ ISAParallelState *isa = ISA_PARALLEL(adev);
Aml *dev;
Aml *crs;
@@ -645,11 +645,11 @@ static Property parallel_isa_properties[] = {
static void parallel_isa_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = parallel_isa_realizefn;
dc->vmsd = &vmstate_parallel_isa;
- isa->build_aml = parallel_isa_build_aml;
+ adevc->build_dev_aml = parallel_isa_build_aml;
device_class_set_props(dc, parallel_isa_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
@@ -659,6 +659,10 @@ static const TypeInfo parallel_isa_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAParallelState),
.class_init = parallel_isa_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void parallel_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 05/35] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (3 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 04/35] acpi: parallel port: " Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 06/35] acpi: mc146818rtc: " Igor Mammedov
` (31 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/char/serial-isa.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index 7a7ed239cd..141a6cb168 100644
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "sysemu/sysemu.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/char/serial.h"
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
@@ -83,9 +83,9 @@ static void serial_isa_realizefn(DeviceState *dev, Error **errp)
isa_register_ioport(isadev, &s->io, isa->iobase);
}
-static void serial_isa_build_aml(ISADevice *isadev, Aml *scope)
+static void serial_isa_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- ISASerialState *isa = ISA_SERIAL(isadev);
+ ISASerialState *isa = ISA_SERIAL(adev);
Aml *dev;
Aml *crs;
@@ -122,11 +122,11 @@ static Property serial_isa_properties[] = {
static void serial_isa_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = serial_isa_realizefn;
dc->vmsd = &vmstate_isa_serial;
- isa->build_aml = serial_isa_build_aml;
+ adevc->build_dev_aml = serial_isa_build_aml;
device_class_set_props(dc, serial_isa_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
@@ -146,6 +146,10 @@ static const TypeInfo serial_isa_info = {
.instance_size = sizeof(ISASerialState),
.instance_init = serial_isa_initfn,
.class_init = serial_isa_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void serial_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 06/35] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (4 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 05/35] acpi: serial-is: " Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 07/35] acpi: pckbd: " Igor Mammedov
` (30 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/rtc/mc146818rtc.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index f235c2ddbe..ef9765bb8f 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -26,7 +26,7 @@
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/bcd.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
@@ -1017,9 +1017,9 @@ static void rtc_reset_hold(Object *obj)
qemu_irq_lower(s->irq);
}
-static void rtc_build_aml(ISADevice *isadev, Aml *scope)
+static void rtc_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- RTCState *s = MC146818_RTC(isadev);
+ RTCState *s = MC146818_RTC(adev);
Aml *dev;
Aml *crs;
@@ -1043,13 +1043,13 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = rtc_realizefn;
dc->vmsd = &vmstate_rtc;
rc->phases.enter = rtc_reset_enter;
rc->phases.hold = rtc_reset_hold;
- isa->build_aml = rtc_build_aml;
+ adevc->build_dev_aml = rtc_build_aml;
device_class_set_props(dc, mc146818rtc_properties);
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
}
@@ -1059,6 +1059,10 @@ static const TypeInfo mc146818rtc_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(RTCState),
.class_init = rtc_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void mc146818rtc_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 07/35] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (5 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 06/35] acpi: mc146818rtc: " Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 08/35] isa-bus: drop no longer used ISADeviceClass::build_aml Igor Mammedov
` (29 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/input/pckbd.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 4efdf75620..45c40fe3f3 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -29,7 +29,7 @@
#include "qapi/error.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/input/ps2.h"
#include "hw/irq.h"
#include "hw/input/i8042.h"
@@ -767,9 +767,9 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
qemu_register_reset(kbd_reset, s);
}
-static void i8042_build_aml(ISADevice *isadev, Aml *scope)
+static void i8042_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- ISAKBDState *isa_s = I8042(isadev);
+ ISAKBDState *isa_s = I8042(adev);
Aml *kbd;
Aml *mou;
Aml *crs;
@@ -807,12 +807,12 @@ static Property i8042_properties[] = {
static void i8042_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
device_class_set_props(dc, i8042_properties);
dc->realize = i8042_realizefn;
dc->vmsd = &vmstate_kbd_isa;
- isa->build_aml = i8042_build_aml;
+ adevc->build_dev_aml = i8042_build_aml;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
@@ -822,6 +822,10 @@ static const TypeInfo i8042_info = {
.instance_size = sizeof(ISAKBDState),
.instance_init = i8042_initfn,
.class_init = i8042_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void i8042_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 08/35] isa-bus: drop no longer used ISADeviceClass::build_aml
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (6 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 07/35] acpi: pckbd: " Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 09/35] tests: acpi: add and whitelist DSDT.ipmismbus expected blob Igor Mammedov
` (28 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/isa/isa.h | 1 -
hw/isa/isa-bus.c | 12 +-----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 034d706ba1..5c5a3d43a7 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -64,7 +64,6 @@ struct IsaDmaClass {
struct ISADeviceClass {
DeviceClass parent_class;
- void (*build_aml)(ISADevice *dev, Aml *scope);
};
struct ISABus {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 237e2cee12..1bee1a47f1 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -191,19 +191,9 @@ ISADevice *isa_vga_init(ISABus *bus)
void isa_build_aml(ISABus *bus, Aml *scope)
{
BusChild *kid;
- ISADevice *dev;
- ISADeviceClass *dc;
QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) {
- dev = ISA_DEVICE(kid->child);
- dc = ISA_DEVICE_GET_CLASS(dev);
- bool has_build_dev_aml = !!object_dynamic_cast(OBJECT(dev),
- TYPE_ACPI_DEV_AML_IF);
- if (dc->build_aml) {
- dc->build_aml(dev, scope);
- } else if (has_build_dev_aml) {
- call_dev_aml_func(DEVICE(dev), scope);
- }
+ call_dev_aml_func(DEVICE(kid->child), scope);
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 09/35] tests: acpi: add and whitelist DSDT.ipmismbus expected blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (7 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 08/35] isa-bus: drop no longer used ISADeviceClass::build_aml Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 10/35] tests: acpi: q35: add test for smbus-ipmi device Igor Mammedov
` (27 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
.. which will be used by follow up smbus-ipmi test-case
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
tests/data/acpi/q35/DSDT.ipmismbus | 0
2 files changed, 1 insertion(+)
create mode 100644 tests/data/acpi/q35/DSDT.ipmismbus
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..b4687d1cc8 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.ipmismbus",
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
new file mode 100644
index 0000000000..e69de29bb2
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 10/35] tests: acpi: q35: add test for smbus-ipmi device
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (8 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 09/35] tests: acpi: add and whitelist DSDT.ipmismbus expected blob Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 11/35] tests: acpi: update expected blob DSDT.ipmismbus Igor Mammedov
` (26 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
expected new device node:
Device (MI1)
{
Name (_HID, EisaId ("IPI0001")) // _HID: Hardware ID
Name (_STR, "ipmi_smbus") // _STR: Description String
Name (_UID, One) // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
I2cSerialBusV2 (0x0000, ControllerInitiated, 0x000186A0,
AddressingMode7Bit, "\\_SB.PCI0.SMB0",
0x00, ResourceProducer, , Exclusive,
)
})
Name (_IFT, 0x04) // _IFT: IPMI Interface Type
Name (_SRV, 0x0200) // _SRV: IPMI Spec Revision
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 5dddedabcd..615cbdaf17 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -955,6 +955,21 @@ static void test_acpi_q35_tcg_ipmi(void)
free_test_data(&data);
}
+static void test_acpi_q35_tcg_smbus_ipmi(void)
+{
+ test_data data;
+
+ memset(&data, 0, sizeof(data));
+ data.machine = MACHINE_Q35;
+ data.variant = ".ipmismbus";
+ data.required_struct_types = ipmi_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types);
+ test_acpi_one("-device ipmi-bmc-sim,id=bmc0"
+ " -device smbus-ipmi,bmc=bmc0",
+ &data);
+ free_test_data(&data);
+}
+
static void test_acpi_piix4_tcg_ipmi(void)
{
test_data data;
@@ -1700,6 +1715,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi);
qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi);
+ qtest_add_func("acpi/q35/smbus/ipmi", test_acpi_q35_tcg_smbus_ipmi);
qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp);
qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp);
qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp);
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 11/35] tests: acpi: update expected blob DSDT.ipmismbus
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (9 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 10/35] tests: acpi: q35: add test for smbus-ipmi device Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 12/35] tests: acpi: whitelist DSDT.ipmismbus expected blob Igor Mammedov
` (25 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
basic q35 DSDT with an extra device node:
Device (MI1)
{
Name (_HID, EisaId ("IPI0001")) // _HID: Hardware ID
Name (_STR, "ipmi_smbus") // _STR: Description String
Name (_UID, One) // _UID: Unique ID
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
I2cSerialBusV2 (0x0000, ControllerInitiated, 0x000186A0,
AddressingMode7Bit, "\\_SB.PCI0.SMB0",
0x00, ResourceProducer, , Exclusive,
)
})
Name (_IFT, 0x04) // _IFT: IPMI Interface Type
Name (_SRV, 0x0200) // _SRV: IPMI Spec Revision
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
tests/data/acpi/q35/DSDT.ipmismbus | Bin 0 -> 8391 bytes
2 files changed, 1 deletion(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index b4687d1cc8..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.ipmismbus",
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..07ba873b79caadd73ed9721fcbeee84c57676e2a 100644
GIT binary patch
literal 8391
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
b0j`+AVEO*C$FMbugNyRu5<f`LEyDf}=hf0`
literal 0
HcmV?d00001
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 12/35] tests: acpi: whitelist DSDT.ipmismbus expected blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (10 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 11/35] tests: acpi: update expected blob DSDT.ipmismbus Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 13/35] ipmi: acpi: use relative path to resource source Igor Mammedov
` (24 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..b4687d1cc8 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.ipmismbus",
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 13/35] ipmi: acpi: use relative path to resource source
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (11 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 12/35] tests: acpi: whitelist DSDT.ipmismbus expected blob Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 14/35] tests: acpi: update expected DSDT.ipmismbus blob Igor Mammedov
` (23 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
smbus-ipmi AML description needs to specify a path to its parent
node in _CRS. The rest of IPMI inplementations (ISA based)
do not need path at all. Instead of passing through a full path
use relative path to point to smbus-ipmi's parent node, it will
let follow up patches to create IPMI device AML in a generic
way instead of current ad-hoc way. (i.e. AML will be generated
the same way it's done for other ISA device, and smbus will be
converted to generate AML for its slave devices the same way
as ISA)
expected AML change:
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
I2cSerialBusV2 (0x0000, ControllerInitiated, 0x000186A0,
- AddressingMode7Bit, "\\_SB.PCI0.SMB0",
+ AddressingMode7Bit, "^",
0x00, ResourceProducer, , Exclusive,
)
})
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/ipmi.h | 2 +-
hw/acpi/ipmi-stub.c | 2 +-
hw/acpi/ipmi.c | 12 ++++++------
hw/i386/acpi-build.c | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h
index c14ad682ac..c38483565c 100644
--- a/include/hw/acpi/ipmi.h
+++ b/include/hw/acpi/ipmi.h
@@ -16,6 +16,6 @@
* bus matches the given bus. The resource is the ACPI resource that
* contains the IPMI device, this is required for the I2C CRS.
*/
-void build_acpi_ipmi_devices(Aml *table, BusState *bus, const char *resource);
+void build_acpi_ipmi_devices(Aml *table, BusState *bus);
#endif /* HW_ACPI_IPMI_H */
diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c
index 8634fb325c..f525f71c2d 100644
--- a/hw/acpi/ipmi-stub.c
+++ b/hw/acpi/ipmi-stub.c
@@ -10,6 +10,6 @@
#include "qemu/osdep.h"
#include "hw/acpi/ipmi.h"
-void build_acpi_ipmi_devices(Aml *table, BusState *bus, const char *resource)
+void build_acpi_ipmi_devices(Aml *table, BusState *bus)
{
}
diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c
index 96e48eba15..c30b44fcf5 100644
--- a/hw/acpi/ipmi.c
+++ b/hw/acpi/ipmi.c
@@ -13,7 +13,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/ipmi.h"
-static Aml *aml_ipmi_crs(IPMIFwInfo *info, const char *resource)
+static Aml *aml_ipmi_crs(IPMIFwInfo *info)
{
Aml *crs = aml_resource_template();
@@ -49,7 +49,7 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info, const char *resource)
break;
case IPMI_MEMSPACE_SMBUS:
aml_append(crs, aml_i2c_serial_bus_device(info->base_address,
- resource));
+ "^"));
break;
default:
abort();
@@ -62,7 +62,7 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info, const char *resource)
return crs;
}
-static Aml *aml_ipmi_device(IPMIFwInfo *info, const char *resource)
+static Aml *aml_ipmi_device(IPMIFwInfo *info)
{
Aml *dev;
uint16_t version = ((info->ipmi_spec_major_revision << 8)
@@ -75,14 +75,14 @@ static Aml *aml_ipmi_device(IPMIFwInfo *info, const char *resource)
aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
info->interface_name)));
aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
- aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info, resource)));
+ aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info)));
aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
return dev;
}
-void build_acpi_ipmi_devices(Aml *scope, BusState *bus, const char *resource)
+void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
{
BusChild *kid;
@@ -102,6 +102,6 @@ void build_acpi_ipmi_devices(Aml *scope, BusState *bus, const char *resource)
iic = IPMI_INTERFACE_GET_CLASS(obj);
memset(&info, 0, sizeof(info));
iic->get_fwinfo(ii, &info);
- aml_append(scope, aml_ipmi_device(&info, resource));
+ aml_append(scope, aml_ipmi_device(&info));
}
}
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 92455579b2..6dce8354cc 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -870,7 +870,7 @@ static void build_isa_devices_aml(Aml *table)
assert(obj && !ambiguous);
scope = aml_scope("_SB.PCI0.ISA");
- build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");
+ build_acpi_ipmi_devices(scope, BUS(obj));
isa_build_aml(ISA_BUS(obj), scope);
aml_append(table, scope);
@@ -1403,7 +1403,7 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
Aml *dev = aml_device("SMB0");
aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
- build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
+ build_acpi_ipmi_devices(dev, BUS(smbus));
aml_append(scope, dev);
aml_append(table, scope);
}
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 14/35] tests: acpi: update expected DSDT.ipmismbus blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (12 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 13/35] ipmi: acpi: use relative path to resource source Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 15/35] acpi: ich9-smb: add support for AcpiDevAmlIf interface Igor Mammedov
` (22 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
expected AML change:
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
I2cSerialBusV2 (0x0000, ControllerInitiated, 0x000186A0,
- AddressingMode7Bit, "\\_SB.PCI0.SMB0",
+ AddressingMode7Bit, "^",
0x00, ResourceProducer, , Exclusive,
)
})
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8391 -> 8378 bytes
2 files changed, 1 deletion(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index b4687d1cc8..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.ipmismbus",
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index 07ba873b79caadd73ed9721fcbeee84c57676e2a..415fe08a407690c0e118743d872de79d22f01a4c 100644
GIT binary patch
delta 85
zcmX@^xXY2tCD<iomjVL=W93G!vyzG~?0WIRPVoWGo(9oP?rg!nP6izDjxIqw%nb4j
k(M_(blYdBRi%D{c^$9XC0wGW%8^eM&5F>80n^Yqk0Lq6G-v9sr
delta 98
zcmdnxc-)c8CD<k8xB>$M<Nb|XXC)OKIrQR#o#F$WJq@CpT-bwsoeVhQ9bJNWm>J|5
sqMMx9CjXGsR#xLu?vrC+1VW%jHiiXlAVv&OqaH}39!S?_OQ}XS01jdo-v9sr
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 15/35] acpi: ich9-smb: add support for AcpiDevAmlIf interface
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (13 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 14/35] tests: acpi: update expected DSDT.ipmismbus blob Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors Igor Mammedov
` (21 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
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>
---
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 },
{ },
},
};
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (14 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 15/35] acpi: ich9-smb: add support for AcpiDevAmlIf interface Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-06-07 10:56 ` Michael S. Tsirkin
2022-05-16 15:25 ` [PATCH 17/35] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi Igor Mammedov
` (20 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
convert ad-hoc way we use to generate AML for ISA/SMB IPMI devices
to a generic approach (i.e. make devices provide its own AML blobs
like it is done with other ISA devices (ex. KBD))
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/ipmi.h | 9 ++------
hw/acpi/ipmi-stub.c | 2 +-
hw/acpi/ipmi.c | 49 +++++++++++++-----------------------------
hw/i386/acpi-build.c | 17 ++++++++++-----
hw/ipmi/isa_ipmi_bt.c | 4 ++++
hw/ipmi/isa_ipmi_kcs.c | 4 ++++
hw/ipmi/smbus_ipmi.c | 4 ++++
7 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h
index c38483565c..6c8079c97a 100644
--- a/include/hw/acpi/ipmi.h
+++ b/include/hw/acpi/ipmi.h
@@ -9,13 +9,8 @@
#ifndef HW_ACPI_IPMI_H
#define HW_ACPI_IPMI_H
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
-/*
- * Add ACPI IPMI entries for all registered IPMI devices whose parent
- * bus matches the given bus. The resource is the ACPI resource that
- * contains the IPMI device, this is required for the I2C CRS.
- */
-void build_acpi_ipmi_devices(Aml *table, BusState *bus);
+void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope);
#endif /* HW_ACPI_IPMI_H */
diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c
index f525f71c2d..befaf0a882 100644
--- a/hw/acpi/ipmi-stub.c
+++ b/hw/acpi/ipmi-stub.c
@@ -10,6 +10,6 @@
#include "qemu/osdep.h"
#include "hw/acpi/ipmi.h"
-void build_acpi_ipmi_devices(Aml *table, BusState *bus)
+void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope)
{
}
diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c
index c30b44fcf5..a20e57d465 100644
--- a/hw/acpi/ipmi.c
+++ b/hw/acpi/ipmi.c
@@ -62,46 +62,27 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info)
return crs;
}
-static Aml *aml_ipmi_device(IPMIFwInfo *info)
+void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope)
{
Aml *dev;
- uint16_t version = ((info->ipmi_spec_major_revision << 8)
- | (info->ipmi_spec_minor_revision << 4));
+ IPMIFwInfo info = {};
+ IPMIInterface *ii = IPMI_INTERFACE(adev);
+ IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
+ uint16_t version;
- assert(info->ipmi_spec_minor_revision <= 15);
+ iic->get_fwinfo(ii, &info);
+ assert(info.ipmi_spec_minor_revision <= 15);
+ version = ((info.ipmi_spec_major_revision << 8)
+ | (info.ipmi_spec_minor_revision << 4));
- dev = aml_device("MI%d", info->uuid);
+ dev = aml_device("MI%d", info.uuid);
aml_append(dev, aml_name_decl("_HID", aml_eisaid("IPI0001")));
aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
- info->interface_name)));
- aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
- aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info)));
- aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
+ info.interface_name)));
+ aml_append(dev, aml_name_decl("_UID", aml_int(info.uuid)));
+ aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(&info)));
+ aml_append(dev, aml_name_decl("_IFT", aml_int(info.interface_type)));
aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
- return dev;
-}
-
-void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
-{
-
- BusChild *kid;
-
- QTAILQ_FOREACH(kid, &bus->children, sibling) {
- IPMIInterface *ii;
- IPMIInterfaceClass *iic;
- IPMIFwInfo info;
- Object *obj = object_dynamic_cast(OBJECT(kid->child),
- TYPE_IPMI_INTERFACE);
-
- if (!obj) {
- continue;
- }
-
- ii = IPMI_INTERFACE(obj);
- iic = IPMI_INTERFACE_GET_CLASS(obj);
- memset(&info, 0, sizeof(info));
- iic->get_fwinfo(ii, &info);
- aml_append(scope, aml_ipmi_device(&info));
- }
+ aml_append(scope, dev);
}
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 6dce8354cc..ca5cab87ba 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -38,6 +38,7 @@
#include "hw/nvram/fw_cfg.h"
#include "hw/acpi/bios-linker-loader.h"
#include "hw/isa/isa.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/input/i8042.h"
#include "hw/acpi/memory_hotplug.h"
#include "sysemu/tpm.h"
@@ -71,7 +72,6 @@
#include "hw/i386/intel_iommu.h"
#include "hw/virtio/virtio-iommu.h"
-#include "hw/acpi/ipmi.h"
#include "hw/acpi/hmat.h"
#include "hw/acpi/viot.h"
@@ -870,7 +870,6 @@ static void build_isa_devices_aml(Aml *table)
assert(obj && !ambiguous);
scope = aml_scope("_SB.PCI0.ISA");
- build_acpi_ipmi_devices(scope, BUS(obj));
isa_build_aml(ISA_BUS(obj), scope);
aml_append(table, scope);
@@ -1397,13 +1396,21 @@ static Aml *build_q35_osc_method(bool enable_native_pcie_hotplug)
return method;
}
-static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
+static void build_smb0(Aml *table, int devnr, int func)
{
Aml *scope = aml_scope("_SB.PCI0");
Aml *dev = aml_device("SMB0");
+ bool ambiguous;
+ Object *obj;
+ /*
+ * temporarily fish out device hosting SMBUS, build_smb0 will be gone once
+ * PCI enumeration will be switched to call_dev_aml_func()
+ */
+ obj = object_resolve_path_type("", TYPE_ICH9_SMB_DEVICE, &ambiguous);
+ assert(obj && !ambiguous);
aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
- build_acpi_ipmi_devices(dev, BUS(smbus));
+ call_dev_aml_func(DEVICE(obj), dev);
aml_append(scope, dev);
aml_append(table, scope);
}
@@ -1504,7 +1511,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
}
build_q35_pci0_int(dsdt);
if (pcms->smbus && !pcmc->do_not_add_smb_acpi) {
- build_smb0(dsdt, pcms->smbus, ICH9_SMB_DEV, ICH9_SMB_FUNC);
+ build_smb0(dsdt, ICH9_SMB_DEV, ICH9_SMB_FUNC);
}
}
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 88aa734e9e..a83e7243d6 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -31,6 +31,7 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "qom/object.h"
+#include "hw/acpi/ipmi.h"
#define TYPE_ISA_IPMI_BT "isa-ipmi-bt"
OBJECT_DECLARE_SIMPLE_TYPE(ISAIPMIBTDevice, ISA_IPMI_BT)
@@ -144,6 +145,7 @@ static void isa_ipmi_bt_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
dc->realize = isa_ipmi_bt_realize;
device_class_set_props(dc, ipmi_isa_properties);
@@ -151,6 +153,7 @@ static void isa_ipmi_bt_class_init(ObjectClass *oc, void *data)
iic->get_backend_data = isa_ipmi_bt_get_backend_data;
ipmi_bt_class_init(iic);
iic->get_fwinfo = isa_ipmi_bt_get_fwinfo;
+ adevc->build_dev_aml = build_ipmi_dev_aml;
}
static const TypeInfo isa_ipmi_bt_info = {
@@ -161,6 +164,7 @@ static const TypeInfo isa_ipmi_bt_info = {
.class_init = isa_ipmi_bt_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_IPMI_INTERFACE },
+ { TYPE_ACPI_DEV_AML_IF },
{ }
}
};
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index afabb95ebe..b2ed70b9da 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -31,6 +31,7 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "qom/object.h"
+#include "hw/acpi/ipmi.h"
#define TYPE_ISA_IPMI_KCS "isa-ipmi-kcs"
OBJECT_DECLARE_SIMPLE_TYPE(ISAIPMIKCSDevice, ISA_IPMI_KCS)
@@ -151,6 +152,7 @@ static void isa_ipmi_kcs_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
dc->realize = ipmi_isa_realize;
device_class_set_props(dc, ipmi_isa_properties);
@@ -158,6 +160,7 @@ static void isa_ipmi_kcs_class_init(ObjectClass *oc, void *data)
iic->get_backend_data = isa_ipmi_kcs_get_backend_data;
ipmi_kcs_class_init(iic);
iic->get_fwinfo = isa_ipmi_kcs_get_fwinfo;
+ adevc->build_dev_aml = build_ipmi_dev_aml;
}
static const TypeInfo isa_ipmi_kcs_info = {
@@ -168,6 +171,7 @@ static const TypeInfo isa_ipmi_kcs_info = {
.class_init = isa_ipmi_kcs_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_IPMI_INTERFACE },
+ { TYPE_ACPI_DEV_AML_IF },
{ }
}
};
diff --git a/hw/ipmi/smbus_ipmi.c b/hw/ipmi/smbus_ipmi.c
index 1fdf0a66b6..9ef9112dd5 100644
--- a/hw/ipmi/smbus_ipmi.c
+++ b/hw/ipmi/smbus_ipmi.c
@@ -28,6 +28,7 @@
#include "qemu/error-report.h"
#include "hw/ipmi/ipmi.h"
#include "qom/object.h"
+#include "hw/acpi/ipmi.h"
#define TYPE_SMBUS_IPMI "smbus-ipmi"
OBJECT_DECLARE_SIMPLE_TYPE(SMBusIPMIDevice, SMBUS_IPMI)
@@ -353,6 +354,7 @@ static void smbus_ipmi_class_init(ObjectClass *oc, void *data)
DeviceClass *dc = DEVICE_CLASS(oc);
IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(oc);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
sc->receive_byte = ipmi_receive_byte;
sc->write_data = ipmi_write_data;
@@ -363,6 +365,7 @@ static void smbus_ipmi_class_init(ObjectClass *oc, void *data)
iic->handle_if_event = smbus_ipmi_handle_event;
iic->set_irq_enable = smbus_ipmi_set_irq_enable;
iic->get_fwinfo = smbus_ipmi_get_fwinfo;
+ adevc->build_dev_aml = build_ipmi_dev_aml;
}
static const TypeInfo smbus_ipmi_info = {
@@ -373,6 +376,7 @@ static const TypeInfo smbus_ipmi_info = {
.class_init = smbus_ipmi_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_IPMI_INTERFACE },
+ { TYPE_ACPI_DEV_AML_IF },
{ }
}
};
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 17/35] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (15 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 18/35] tests: acpi: white-list to be re-factored pc/q35 DSDT Igor Mammedov
` (19 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
by default we do not version ACPI AML as it's considered
a part of firmware. Drop do_not_add_smb_acpi that blocked
SMBUS AML description on 3.1 and older machine types without
providing justification.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
we can keep this bit if anyone can prove/report adverse effect
on VM.
---
include/hw/i386/pc.h | 1 -
hw/i386/acpi-build.c | 2 +-
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index aff8add155..da2ebfc33a 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -106,7 +106,6 @@ struct PCMachineClass {
bool rsdp_in_ram;
int legacy_acpi_table_size;
unsigned acpi_data_size;
- bool do_not_add_smb_acpi;
int pci_root_uid;
/* SMBIOS compat: */
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index ca5cab87ba..250a7c07af 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1510,7 +1510,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
}
build_q35_pci0_int(dsdt);
- if (pcms->smbus && !pcmc->do_not_add_smb_acpi) {
+ if (pcms->smbus) {
build_smb0(dsdt, ICH9_SMB_DEV, ICH9_SMB_FUNC);
}
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index f843dd906f..d4b37b4652 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -562,7 +562,6 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m)
pc_i440fx_4_0_machine_options(m);
m->is_default = false;
- pcmc->do_not_add_smb_acpi = true;
m->smbus_no_migration_support = true;
m->alias = NULL;
pcmc->pvh_enabled = false;
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 302288342a..ad3f519f77 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -512,7 +512,6 @@ static void pc_q35_3_1_machine_options(MachineClass *m)
pc_q35_4_0_machine_options(m);
m->default_kernel_irqchip_split = false;
- pcmc->do_not_add_smb_acpi = true;
m->smbus_no_migration_support = true;
m->alias = NULL;
pcmc->pvh_enabled = false;
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 18/35] tests: acpi: white-list to be re-factored pc/q35 DSDT
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (16 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 17/35] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 19/35] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors Igor Mammedov
` (18 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 31 +++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..d95f4b25c4 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,32 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/pc/DSDT.acpierst",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.hpbridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.nohpet",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.roothp",
+"tests/data/acpi/pc/DSDT.hpbrroot",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.acpierst",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.ivrs",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.multi-bridge",
+"tests/data/acpi/q35/DSDT.nohpet",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.viot",
+"tests/data/acpi/q35/DSDT.xapic",
+"tests/data/acpi/q35/DSDT.ipmismbus",
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 19/35] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (17 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 18/35] tests: acpi: white-list to be re-factored pc/q35 DSDT Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 20/35] acpi: q35: " Igor Mammedov
` (17 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
replaces ad-hoc build_isa_devices_aml() with generic AcpiDevAmlIf
way to build bridge AML including all devices that are attached to
its ISA bus.
Later when PCI is converted to AcpiDevAmlIf, build_piix4_isa_bridge()
will also be dropped since PCI parts itself will take care of
building device prologue/epilogue AML for each enumerated PCI
device.
Expected AML change is contextual, where ISA devices are moved
from separately declared _SB.PCI0.ISA scope , directly under
Device(ISA) node.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 16 +++++++++++-----
hw/isa/piix3.c | 17 +++++++++++++++++
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 250a7c07af..a5dd3e4fee 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1277,15 +1277,22 @@ static void build_piix4_isa_bridge(Aml *table)
{
Aml *dev;
Aml *scope;
+ Object *obj;
+ bool ambiguous;
+
+ /*
+ * temporarily fish out isa bridge, build_piix4_isa_bridge() will be dropped
+ * once PCI is converted to AcpiDevAmlIf and would be ble to generate
+ * AML for bridge itself
+ */
+ obj = object_resolve_path_type("", TYPE_PIIX3_PCI_DEVICE, &ambiguous);
+ assert(obj && !ambiguous);
scope = aml_scope("_SB.PCI0");
dev = aml_device("ISA");
aml_append(dev, aml_name_decl("_ADR", aml_int(0x00010000)));
- /* PIIX PCI to ISA irq remapping */
- aml_append(dev, aml_operation_region("P40C", AML_PCI_CONFIG,
- aml_int(0x60), 0x04));
-
+ call_dev_aml_func(DEVICE(obj), dev);
aml_append(scope, dev);
aml_append(table, scope);
}
@@ -1456,7 +1463,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
build_hpet_aml(dsdt);
}
build_piix4_isa_bridge(dsdt);
- build_isa_devices_aml(dsdt);
if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
}
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index dab901c9ad..bfccd666d4 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -32,6 +32,7 @@
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "migration/vmstate.h"
+#include "hw/acpi/acpi_aml_interface.h"
#define XEN_PIIX_NUM_PIRQS 128ULL
@@ -286,10 +287,24 @@ static void piix3_realize(PCIDevice *dev, Error **errp)
qemu_register_reset(piix3_reset, d);
}
+static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ BusChild *kid;
+ BusState *bus = qdev_get_child_bus(DEVICE(adev), "isa.0");
+
+ /* PIIX PCI to ISA irq remapping */
+ aml_append(scope, aml_operation_region("P40C", AML_PCI_CONFIG,
+ aml_int(0x60), 0x04));
+ QTAILQ_FOREACH(kid, &bus->children, sibling) {
+ call_dev_aml_func(DEVICE(kid->child), scope);
+ }
+}
+
static void pci_piix3_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);
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix3;
@@ -304,6 +319,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)
* pc_piix.c's pc_init1()
*/
dc->user_creatable = false;
+ adevc->build_dev_aml = build_pci_isa_aml;
}
static const TypeInfo piix3_pci_type_info = {
@@ -314,6 +330,7 @@ static const TypeInfo piix3_pci_type_info = {
.class_init = pci_piix3_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { TYPE_ACPI_DEV_AML_IF },
{ },
},
};
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 20/35] acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (18 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 19/35] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 21/35] tests: acpi: update expected blobs Igor Mammedov
` (16 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
replaces adhoc build_isa_devices_aml() with generic AcpiDevAmlIf
way to build bridge AML including all devices that are attached
to its ISA bus.
Later when PCI is converted to AcpiDevAmlIf, build_q35_isa_bridge()
will also be dropped since PCI parts itself will take care of
building device prologue/epilogue AML for each enumerated PCI device.
Expected AML change is contextual, where ISA devices are moved from
separately declared _SB.PCI0.ISA scope, directly under Device(ISA)
node.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 30 +++++++++++-------------------
hw/isa/lpc_ich9.c | 19 +++++++++++++++++++
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a5dd3e4fee..33ee5bfcfb 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -861,20 +861,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
return dev;
}
-static void build_isa_devices_aml(Aml *table)
-{
- bool ambiguous;
- Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
- Aml *scope;
-
- assert(obj && !ambiguous);
-
- scope = aml_scope("_SB.PCI0.ISA");
- isa_build_aml(ISA_BUS(obj), scope);
-
- aml_append(table, scope);
-}
-
static void build_dbg_aml(Aml *table)
{
Aml *field;
@@ -1260,15 +1246,22 @@ static void build_q35_isa_bridge(Aml *table)
{
Aml *dev;
Aml *scope;
+ Object *obj;
+ bool ambiguous;
+
+ /*
+ * temporarily fish out isa bridge, build_q35_isa_bridge() will be dropped
+ * once PCI is converted to AcpiDevAmlIf and would be ble to generate
+ * AML for bridge itself
+ */
+ obj = object_resolve_path_type("", TYPE_ICH9_LPC_DEVICE, &ambiguous);
+ assert(obj && !ambiguous);
scope = aml_scope("_SB.PCI0");
dev = aml_device("ISA");
aml_append(dev, aml_name_decl("_ADR", aml_int(0x001F0000)));
- /* ICH9 PCI to ISA irq remapping */
- aml_append(dev, aml_operation_region("PIRQ", AML_PCI_CONFIG,
- aml_int(0x60), 0x0C));
-
+ call_dev_aml_func(DEVICE(obj), dev);
aml_append(scope, dev);
aml_append(table, scope);
}
@@ -1511,7 +1504,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
build_hpet_aml(dsdt);
}
build_q35_isa_bridge(dsdt);
- build_isa_devices_aml(dsdt);
if (pm->pcihp_bridge_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
}
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 5f143dca17..4553b5925b 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -50,6 +50,7 @@
#include "hw/core/cpu.h"
#include "hw/nvram/fw_cfg.h"
#include "qemu/cutils.h"
+#include "hw/acpi/acpi_aml_interface.h"
/*****************************************************************************/
/* ICH9 LPC PCI to ISA bridge */
@@ -803,12 +804,28 @@ static void ich9_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
acpi_send_gpe_event(&s->pm.acpi_regs, s->pm.irq, ev);
}
+static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ BusChild *kid;
+ ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
+ BusState *bus = BUS(s->isa_bus);
+
+ /* ICH9 PCI to ISA irq remapping */
+ aml_append(scope, aml_operation_region("PIRQ", AML_PCI_CONFIG,
+ aml_int(0x60), 0x0C));
+
+ QTAILQ_FOREACH(kid, &bus->children, sibling) {
+ call_dev_aml_func(DEVICE(kid->child), scope);
+ }
+}
+
static void ich9_lpc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(klass);
+ AcpiDevAmlIfClass *amldevc = ACPI_DEV_AML_IF_CLASS(klass);
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->reset = ich9_lpc_reset;
@@ -833,6 +850,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
adevc->ospm_status = ich9_pm_ospm_status;
adevc->send_event = ich9_send_gpe;
adevc->madt_cpu = pc_madt_cpu_entry;
+ amldevc->build_dev_aml = build_ich9_isa_aml;
}
static const TypeInfo ich9_lpc_info = {
@@ -845,6 +863,7 @@ static const TypeInfo ich9_lpc_info = {
{ TYPE_HOTPLUG_HANDLER },
{ TYPE_ACPI_DEVICE_IF },
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { TYPE_ACPI_DEV_AML_IF },
{ }
}
};
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 21/35] tests: acpi: update expected blobs
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (19 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 20/35] acpi: q35: " Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 22/35] tests: acpi: add and white-list DSDT.applesmc expected blob Igor Mammedov
` (15 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Expected AML change:
ISA devices under separate _SB.PCI0.ISA scope are moved
directly under Device(ISA) node.
Example from PC machine, and q35 have similar changes:
{
Name (_ADR, 0x00010000) // _ADR: Address
OperationRegion (P40C, PCI_Config, 0x60, 0x04)
- }
- }
-
- Scope (_SB.PCI0.ISA)
- {
- Device (KBD)
- {
- Name (_HID, EisaId ("PNP0303") /* IBM Enhanced Keyboard (101/102-key, PS/2 Mouse) */) // _HID: Hardware ID
- Name (_STA, 0x0F) // _STA: Status
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ Device (KBD)
{
- IO (Decode16,
- 0x0060, // Range Minimum
- 0x0060, // Range Maximum
- 0x01, // Alignment
- 0x01, // Length
- )
- IO (Decode16,
- 0x0064, // Range Minimum
- 0x0064, // Range Maximum
- 0x01, // Alignment
- 0x01, // Length
- )
- IRQNoFlags ()
- {1}
- })
- }
-
- Device (MOU)
- {
- Name (_HID, EisaId ("PNP0F13") /* PS/2 Mouse */) // _HID: Hardware ID
- Name (_STA, 0x0F) // _STA: Status
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- IRQNoFlags ()
- {12}
- })
- }
+ Name (_HID, EisaId ("PNP0303") /* IBM Enhanced Keyboard (101/102-key, PS/2 Mouse) */) // _HID: Hardware ID
+ Name (_STA, 0x0F) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0060, // Range Minimum
+ 0x0060, // Range Maximum
+ 0x01, // Alignment
+ 0x01, // Length
+ )
+ IO (Decode16,
+ 0x0064, // Range Minimum
+ 0x0064, // Range Maximum
+ 0x01, // Alignment
+ 0x01, // Length
+ )
+ IRQNoFlags ()
+ {1}
+ })
+ }
- Device (FDC0)
- {
- Name (_HID, EisaId ("PNP0700")) // _HID: Hardware ID
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- IO (Decode16,
- 0x03F2, // Range Minimum
- 0x03F2, // Range Maximum
- 0x00, // Alignment
- 0x04, // Length
- )
- IO (Decode16,
- 0x03F7, // Range Minimum
- 0x03F7, // Range Maximum
- 0x00, // Alignment
- 0x01, // Length
- )
- IRQNoFlags ()
- {6}
- DMA (Compatibility, NotBusMaster, Transfer8, )
- {2}
- })
- Device (FLPA)
+ Device (MOU)
{
- Name (_ADR, Zero) // _ADR: Address
- Name (_FDI, Package (0x10) // _FDI: Floppy Drive Information
+ Name (_HID, EisaId ("PNP0F13") /* PS/2 Mouse */) // _HID: Hardware ID
+ Name (_STA, 0x0F) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
- Zero,
- 0x05,
- 0x4F,
- 0x30,
- One,
- 0xAF,
- 0x02,
- 0x25,
- 0x02,
- 0x12,
- 0x1B,
- 0xFF,
- 0x6C,
- 0xF6,
- 0x0F,
- 0x08
+ IRQNoFlags ()
+ {12}
})
}
- Name (_FDE, Buffer (0x14) // _FDE: Floppy Disk Enumerate
+ Device (FDC0)
{
- /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
- /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
- /* 0010 */ 0x02, 0x00, 0x00, 0x00 // ....
- })
- }
+ Name (_HID, EisaId ("PNP0700")) // _HID: Hardware ID
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x03F2, // Range Minimum
+ 0x03F2, // Range Maximum
+ 0x00, // Alignment
+ 0x04, // Length
+ )
+ IO (Decode16,
+ 0x03F7, // Range Minimum
+ 0x03F7, // Range Maximum
+ 0x00, // Alignment
+ 0x01, // Length
+ )
+ IRQNoFlags ()
+ {6}
+ DMA (Compatibility, NotBusMaster, Transfer8, )
+ {2}
+ })
+ Device (FLPA)
+ {
+ Name (_ADR, Zero) // _ADR: Address
+ Name (_FDI, Package (0x10) // _FDI: Floppy Drive Information
+ {
+ Zero,
+ 0x05,
+ 0x4F,
+ 0x30,
+ One,
+ 0xAF,
+ 0x02,
+ 0x25,
+ 0x02,
+ 0x12,
+ 0x1B,
+ 0xFF,
+ 0x6C,
+ 0xF6,
+ 0x0F,
+ 0x08
+ })
+ }
- Device (LPT1)
- {
- Name (_HID, EisaId ("PNP0400") /* Standard LPT Parallel Port */) // _HID: Hardware ID
- Name (_UID, One) // _UID: Unique ID
- Name (_STA, 0x0F) // _STA: Status
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ Name (_FDE, Buffer (0x14) // _FDE: Floppy Disk Enumerate
+ {
+ /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
+ /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
+ /* 0010 */ 0x02, 0x00, 0x00, 0x00 // ....
+ })
+ }
+
+ Device (LPT1)
{
- IO (Decode16,
- 0x0378, // Range Minimum
- 0x0378, // Range Maximum
- 0x08, // Alignment
- 0x08, // Length
- )
- IRQNoFlags ()
- {7}
- })
- }
+ Name (_HID, EisaId ("PNP0400") /* Standard LPT Parallel Port */) // _HID: Hardware ID
+ Name (_UID, One) // _UID: Unique ID
+ Name (_STA, 0x0F) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0378, // Range Minimum
+ 0x0378, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {7}
+ })
+ }
- Device (COM1)
- {
- Name (_HID, EisaId ("PNP0501") /* 16550A-compatible COM Serial Port */) // _HID: Hardware ID
- Name (_UID, One) // _UID: Unique ID
- Name (_STA, 0x0F) // _STA: Status
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ Device (COM1)
{
- IO (Decode16,
- 0x03F8, // Range Minimum
- 0x03F8, // Range Maximum
- 0x00, // Alignment
- 0x08, // Length
- )
- IRQNoFlags ()
- {4}
- })
- }
+ Name (_HID, EisaId ("PNP0501") /* 16550A-compatible COM Serial Port */) // _HID: Hardware ID
+ Name (_UID, One) // _UID: Unique ID
+ Name (_STA, 0x0F) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x03F8, // Range Minimum
+ 0x03F8, // Range Maximum
+ 0x00, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {4}
+ })
+ }
- Device (RTC)
- {
- Name (_HID, EisaId ("PNP0B00") /* AT Real-Time Clock */) // _HID: Hardware ID
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ Device (RTC)
{
- IO (Decode16,
- 0x0070, // Range Minimum
- 0x0070, // Range Maximum
- 0x01, // Alignment
- 0x08, // Length
- )
- IRQNoFlags ()
- {8}
- })
+ Name (_HID, EisaId ("PNP0B00") /* AT Real-Time Clock */) // _HID: Hardware ID
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0070, // Range Minimum
+ 0x0070, // Range Maximum
+ 0x01, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {8}
+ })
+ }
}
}
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 31 --------------------
tests/data/acpi/pc/DSDT | Bin 6002 -> 5987 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 5969 -> 5954 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7327 -> 7312 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 8668 -> 8653 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6466 -> 6451 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 7656 -> 7641 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 5969 -> 5954 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3069 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6074 -> 6059 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7361 -> 7346 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 5860 -> 5845 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6008 -> 5993 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6210 -> 6195 bytes
tests/data/acpi/q35/DSDT | Bin 8289 -> 8274 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8306 -> 8291 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9599 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 10988 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8738 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9943 -> 9928 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8349 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8378 -> 8363 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8306 -> 8291 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9633 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9404 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8583 -> 8568 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8132 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8295 -> 8280 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8900 -> 8885 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8921 -> 8906 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9398 -> 9383 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35652 -> 35637 bytes
32 files changed, 31 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index d95f4b25c4..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,32 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpierst",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.nohpet",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.roothp",
-"tests/data/acpi/pc/DSDT.hpbrroot",
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.acpierst",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.ivrs",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.multi-bridge",
-"tests/data/acpi/q35/DSDT.nohpet",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/DSDT.viot",
-"tests/data/acpi/q35/DSDT.xapic",
-"tests/data/acpi/q35/DSDT.ipmismbus",
diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
index cc1223773e9c459a8d2f20666c051a74338d40b7..e80bef30317b5ef3bf0d2fb7aaabd6def109adb6 100644
GIT binary patch
delta 44
zcmeyQ_gIh1CD<h-S)74^F@GbM7$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_LjM8EN6!Z&r
delta 60
zcmaE?_eqb-CD<jTNSuLzao$EQF-BfBz4&0K_yA{5gXkuy$@+|vf&zZx`phsv&tS*+
J%^r->VgT_=4|o6o
diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acpierst
index bb0593eeb8730d51a6f0fe51a00a00df9c83c419..d5a2ca51652dfc3637a817bac4a02d6ff6dc8ac2 100644
GIT binary patch
delta 44
zcmcbpcSw)RCD<jzNt}U!F>NE47$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_LjK4$y1_}%4
delta 60
zcmX@4cTtbaCD<h-P@I8*aq31cF-BfBz4&0K_yA{5gXkuy$@+|vf&zZx`phsv&tS*+
J%^r-uL;>5O59$B_
diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat
index 2d0678eb83277088b156d386067429b0f29f9338..f86c743c4d64041c7fbd9999cc700e88416770b7 100644
GIT binary patch
delta 44
zcmbPlIl+?4CD<iof(!!#qs~SyF-CqjNxk@Br}zM8PlM<tPl?I8jFOwf89k%{`}GS4
delta 60
zcmbPWIp31YCD<ioz6=8cWAsKYF-BfBz4&0K_yA{5gXkuy$@+|vf&zZx`phsv&tS*+
J%^r*%(g4m&4+#JO
diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
index 77778c3a69946efd501e7eff0a73af309b553f13..14ed0d995a9f6540deae5a25a7853ed4493a6e06 100644
GIT binary patch
delta 44
zcmccPeAb!ECD<k8tRe#gW9&vQF-CqjNxk@Br}zM8PlM<tPl?I8jFOwf8Cw+qBM1yi
delta 60
zcmX@>e8-u~CD<k8jv@mCW6wq|F-BfBz4&0K_yA{5gXkuy$@+|vf&zZx`phsv&tS*+
J%^r-c3IGLe5KI67
diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
index af046b40b0a150b4ab1e113bd9d77912c707074f..c653302a84a42d063a74a22c6adf910beeba7c60 100644
GIT binary patch
delta 44
zcmX?PwAqNuCD<jzSdxK(@$yD4F-CqjNxk@Br}zM8PlM<tPl?I8jFOwf8DEP701Yt=
AB>(^b
delta 60
zcmdmNbjXOyCD<jzNs@tqk!d5B7$dKmUVN}qe1Nm3L3ESUWPL_SK><H;eP)=TXRu@Z
JW)H^K;sCj54<`Ts
diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
index b56b2e089017f933f8a3089c4fd2389fb8ef1e40..247a1796b1cf31c24b1a981e48937609f84fe2cb 100644
GIT binary patch
delta 44
zcmaE1ebbuDCD<k8rYr*k<KB&2VvPK5l6vvMPVoWGo(9oPo)VLF86`J|GftEN05IST
A!T<mO
delta 60
zcmca<{lc2dCD<k8g)9RD<C~3KVvM|Mdhx+d@d3`B2GLDYll2)T1qJ-X^_gLUp23ds
Kn>`pO$^ZZwMi9gR
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index bb0593eeb8730d51a6f0fe51a00a00df9c83c419..d5a2ca51652dfc3637a817bac4a02d6ff6dc8ac2 100644
GIT binary patch
delta 44
zcmcbpcSw)RCD<jzNt}U!F>NE47$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_LjK4$y1_}%4
delta 60
zcmX@4cTtbaCD<h-P@I8*aq31cF-BfBz4&0K_yA{5gXkuy$@+|vf&zZx`phsv&tS*+
J%^r-uL;>5O59$B_
diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpbrroot
index 6ff6f198c7caf445d25c01117a6357b398358cbf..ec99b1622934a0fd8bc316291c33231e4c57dce0 100644
GIT binary patch
delta 44
zcmeB?_$$uk66_N4mz#lsk!d5B7$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_Lj9a+?2qz1y
delta 60
zcmew>-Xp=~66_Mf!^6P9Xt0q>jFDGOFFx2QKET=2Ai7CvvOc4vpn#vaJ~K?vGuSbH
Jvj^i=E�n4z2(I
diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
index 2e618e49d357ae1d0ac20d822f71d676ea90f2fc..f0d9e75841ea3d69fed9384e439bc4e94c7a4c4e 100644
GIT binary patch
delta 44
zcmdm`zgnNmCD<iowKxL<<M)kRVvPKLvU>5sPVoWGo(9oPj<S<=86`J|GbW1x03F5*
ADF6Tf
delta 60
zcmZ3jze}IXCD<iompB6hqtQk#F-BfBz4&0K_yA{5gXkuy$@+|vf&y+b`phsv&tS*+
J%^r-&VgS=C4=Vrw
diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
index c32d28575b967aff40afb9138822ecd3186dd4ce..d0a7c462094fea9a457cbf537784735e74f7d7d5 100644
GIT binary patch
delta 44
zcmX?Txyh2tCD<iolMDj`W8y|GF-CqjNxk@Br}zM8PlM<tPl?I8jFOwf8MCAT5|9hT
delta 60
zcmdmFdC-!}CD<k8pbP^8<AjY|VvM|Mdhx+d@d3`B2GLDYll2)T1qJ-X^_gLUp23ds
Jn>`q_qyg@S55@oh
diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet
index 623f06a900d12500d2197d101f76f6875e92ed64..cb7bf7d850f340e12a7237c987f570300fd9c92b 100644
GIT binary patch
delta 41
xcmaE&dsUaqCD<k8su%+Uqvb@d4t_UDz4&0K_yA{5gXkttiHY+iH=dLh0{{tT48i~a
delta 57
zcmcbr`$U(^CD<k8i5LR|W5z_T4qi3A_+Y2_0B28w=q9O&3nc{w{KWN{VPc-aj`16J
HNs9ph@NE#p
diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
index f0a3fa92de94f55d5406f0fafce331776dbb0317..2f512cfbe158f1739803c0c7009fe5e907bdec54 100644
GIT binary patch
delta 44
zcmeyN_fn6`CD<h-Q=EZ;QF0@f7$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_LjEZ6a4Z;gJ
delta 60
zcmaE<_d}1%CD<jTLY#qt(PJZ*7$dKmUVN}qe1Nm3L3ESUWPL_SK><H;eP)=TXRu@Z
JW)DV1F#zS+4>|w<
diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp
index cee3b4d80b51ad30153953ace46127923ce8b271..46e03d39e00ea70e55d6a12333ca2b98c5e5bb53 100644
GIT binary patch
delta 44
zcmX?Pu-SmiCD<jzSb~9pQEDTX7$d)%q+WcmQ+$B4r$Ka+r^IAkM#;_LjIYH2_NfbI
delta 60
zcmdmNaL9nmCD<jzNrHia(Q_l07$dKmUVN}qe1Nm3L3ESUWPL_SK><H;eP)=TXRu@Z
JW)H^KVgSVt4`=`Y
diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
index c1965f6051ef2af81dd8412abe169d87845bb033..2cd8d5fc470fc3159fbc464af97e76c8de2136e3 100644
GIT binary patch
delta 44
zcmaFpaLIwoCD<h-NP&TY@!CeNn~eO<f_m}6PVoWGo(9oPZUU1(FiLKgVse)Q064x4
AKL7v#
delta 80
zcmccQ@X&$FCD<h-QGtPh@z+MKn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
b0iHpDOk4?EJObYQ`phteAXS^WncU?7n<EtY
diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.acpierst
index cad26e3f0c27a40a33101155a5282ed9bcb1d441..0bc5de80652ae7328fdc07ccda34afff39ade56f 100644
GIT binary patch
delta 44
zcmez5@YsRNCD<h-S%HCpv1}vPO-6oaLB053r}zM8PlM<tH-X6?7$rALF-6D$05z!%
ABLDyZ
delta 80
zcmaFt@X3M8CD<jTNP&TYan?qzn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
b0iHpDOk4?EJObYQ`phteAXS^WnIhx>k-8M!
diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat
index f24d4874bff8d327a165ed7c36de507aea114edd..af10345e8806c78a0074b3a8819b5cfca4d70c01 100644
GIT binary patch
delta 44
zcmeD4{_n-*66_LEugbu{IC&%2O-6oaLB053r}zM8PlM<tH-X6?7$rALF_kC-05qiy
APXGV_
delta 80
zcmezG)#uIS66_Mvr^>*<xP2qnO-6Gyz4&0K_yA{5gXktH&tS)Rj(A6xARYz=d4}kQ
b0MDR6Cawf79szHDeP)<KkgCnxOeM+ylRy;-
diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
index 424d51bd1cb39ea73501ef7d0044ee52cec5bdac..d820098355e0b79dc69d714817fe906064852f4d 100644
GIT binary patch
delta 44
zcmewz`X-diCD<k8jTQp~<AaS{HyQbz1@+>Co#F$WJq@Cp+yo|nV3gb}#q>}E0AVT)
A?*IS*
delta 80
zcmaD8`a6`%CD<k8w-y5fBg;mvn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
c0iHpDOk4?EJObYQ`phteAXS^WnI38Y0H;3{sQ>@~
diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
index f1275606f68eeba54bfb11e63d818420385a62b9..ac8456a43d54209d77917163b282954d7429b331 100644
GIT binary patch
delta 44
zcmdn!vdD$YCD<iINr{1h(P|^tO-6oaLB053r}zM8PlM<tH-X6?7$rALF^MYx01*5O
A?*IS*
delta 80
zcmZ4FveAXhCD<jzP>F$oF>WK*O-6Gyz4&0K_yA{5gXktH&tS)Rj(A6xARYz=d4}kQ
b0MDR6Cawf79szHDeP)<KkgCnxOyUXvN|_U>
diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
index 76e451e829ec4c245315f7eed8731aa1be45a747..bb0eadf869fe366fc139f8b0fd2ed811d3b16814 100644
GIT binary patch
delta 44
zcmccad%~B?CD<k8gc<__qsm6En~eO<f_m}6PVoWGo(9oPZUU1(FiLKgV%n<$05+-(
AivR!s
delta 80
zcmX@%d)=4ICD<k8x*7umqsK<Bn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
c0iHpDOk4?EJObYQ`phteAXS^Wnf9sx0FqA?MF0Q*
diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
index 6ad2411d0ec95f204cfc64b430c537bce09c35bd..bb258279506e78b50545f6f9030bd25afe433c29 100644
GIT binary patch
delta 44
zcmZ4EIM<QOCD<iot^xxC<L`}JHyQc;MD^l>o#F$WJq@Cp97QL8V3gb}#WYC{05{ML
Ap#T5?
delta 80
zcmbR1xW<voCD<iojRFG$quxfYn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
c0iHpDOk4?EJOXYa`phteAXS^WnI_2r09(%#TL1t6
diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.ipmismbus
index 415fe08a407690c0e118743d872de79d22f01a4c..15000c357fdabf1bceef6f860bd35e9a33024927 100644
GIT binary patch
delta 44
zcmdnxxZ07+CD<iowE_bJW9UY%n~eO<f_m}6PVoWGo(9oPZUU1(FiLKgVp<>v04cW(
ABme*a
delta 80
zcmZ4OxXY2tCD<iomjVL=W93G!n~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
c0iHpDOk4?EJObYQ`phteAXS^WnHI<a0DH_7-T(jq
diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs
index cad26e3f0c27a40a33101155a5282ed9bcb1d441..0bc5de80652ae7328fdc07ccda34afff39ade56f 100644
GIT binary patch
delta 44
zcmez5@YsRNCD<h-S%HCpv1}vPO-6oaLB053r}zM8PlM<tH-X6?7$rALF-6D$05z!%
ABLDyZ
delta 80
zcmaFt@X3M8CD<jTNP&TYan?qzn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
b0iHpDOk4?EJObYQ`phteAXS^WnIhx>k-8M!
diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
index 4e9cb3dc6896bb79ccac0fe342a404549f6610e8..663456fc0d3c71a51b541f5ab952e05c9dac01e6 100644
GIT binary patch
delta 44
zcmdnsz0jM>CD<iop(+Cd<B5%2HyQbz1@+>Co#F$WJq@Cp+yo|nV3gb}#WYPB05)0;
AjQ{`u
delta 80
zcmZ4Jy}_HyCD<iogDL|9<C~3KHyO><^x}h^;scyL4WgT*JcAwMIpQ5%f_NAh<QbwH
c0z88PnYa?Tcm%xp^_gJ`L8>-$Gfh(l0GH<#M*si-
diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index eb5a1c7171c02d153487bfcecfb7019b7c1bf406..91afd01d598c7c2c733387dfb5140d0fcad54adb 100644
GIT binary patch
delta 44
zcmX@@xyO^sCD<ioj|u|=W6MUan~eO<f_m}6PVoWGo(9oPZUU1(FiLKgV%n$#06LHj
AuK)l5
delta 80
zcmdnvdD@f9CD<k8v<d?Q<BE-3HyO><^x}h^;scyL4WgT*JcAwMIpQ5%f_NAh<QbwH
c0z88PnYa?Tcm%xp^_gJ`L8>-$Gi_7?0G&M*X#fBK
diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 45808eb03b78d07ebbe853f674abfed589d35e26..afde339a181628ae9153251eee026b437ab685bc 100644
GIT binary patch
delta 44
zcmZp7{^7*s66_LEp~%3%n6;7XCL_PIpk92iQ+$B4r$Ka+o517`jFOwBm~!O-DNYRX
delta 80
zcmez2)b7mX66_MvuE@Z^*te1ECZoBUUVN}qe1Nm3L3ERpXRu>DN4%p;5Dx=`JVSIt
bfM-x36ITKkkAOG7J~K=qNY!R;rd)Xdd|?!<
diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet
index 83d1aa00ac5686df479673fb0d7830f946e25dea..0fb09121cf8f6ad8810587c8b77df9552dd31f42 100644
GIT binary patch
delta 65
zcmca?f5e{4CD<k8h&%%W<ARM`-i#W~f_m}6PVoWGo(9oPZUUacj`1AvjxIqw3=HxN
U(G3BfL4izM30ypzdl=p209?`#`2YX_
delta 80
zcmX?Nf7zbPCD<k8vOEI=<B^SA-i+pIdhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
b0iHpDOk4?EJObYQ`phteAXS@d8QtXof+7_8
diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
index 050aaa237b466b0bda8cca5cfaa06f84661d622e..e537669949a07adbaa4255021ea14bb4a9dc672f 100644
GIT binary patch
delta 44
zcmaFvaKnMiCD<h-LV<ySv0)?EO-6oaLB053r}zM8PlM<tH-X6?7$rALG5N{?05OaW
A0RR91
delta 80
zcmccN@Z5pRCD<h-U4emtamhxmn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
b0iHpDOk4?EJObYQ`phteAXS^WnSA8{ieVJH
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index fb9dd1f0599afd6b555ea570ecd00a3bb227aa84..0b5c97fdb5da8b7b55d6b5f2af498a447fda7bf8 100644
GIT binary patch
delta 44
zcmX@&y497-CD<ios}chP<Nl3YHyQbz1@+>Co#F$WJq@Cp+yo|nV3gb}#k5KR06d2c
A!T<mO
delta 80
zcmdn$dc>8>CD<k8h!O(><KvB7HyO><^x}h^;scyL4WgT*JcAwMIpQ5%f_NAh<QbwH
c0z88PnYa?Tcm%xp^_gJ`L8>-$Gp$kp0HY)od;kCd
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 00d732e46f5d9d056e557bd026fa30f9db3b8c30..4e16b126cc1c32f2346078fa69c5261c245d15e8 100644
GIT binary patch
delta 44
zcmccVddii{CD<k8loA62<CBeCHyQbz1@+>Co#F$WJq@Cp+yo|nV3gb}#k5}m07~=@
AI{*Lx
delta 80
zcmX@*defE5CD<k8rV;}KBgaOrn~dgadhx+d@d3`B2GLDYp23ds9Py4WK|Bl$@(j@p
c0iHpDOk4?EJObYQ`phteAXS^Wnf5CH0DYkp^#A|>
diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot
index 1c3b4da5cbe81ecab5e1ef50d383b561c5e0f55f..e20e4ee5e92e11ccf890a18fbdd78181c43f3b5c 100644
GIT binary patch
delta 44
zcmdnyx!jY>CD<ioxe5aVWAjF?n~eO<f_m}6PVoWGo(9oPZUU1(FiLKgVw$4_05Dq(
AS^xk5
delta 80
zcmZ4Pxy_TyCD<ion+gL1<MNGMHyO><^x}h^;scyL4WgT*JcAwMIpQ5%f_NAh<QbwH
c0z88PnYa?Tcm%xp^_gJ`L8>-$GtE%~0E!3|6aWAK
diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic
index 17552ce363ae81985f69f9ae85837a1540b79ae0..3cab5956eee60363251a6fab0cc981bbbda64443 100644
GIT binary patch
delta 46
zcmX>yjcMyNCN7s?mk`r#1_s8Sja)Yw`JDyz;)9*y1Drh#qMO_VCVya*+$_bU)d>Jm
Crw#`I
delta 82
zcmdlwjp@iVCN7s?mk^h31_s6r8@X;Wnycx>2Rp?FIC~mIH%WO0JH~UwJGun%Ffhn7
eL^lL@1_d&4C2;Wwc=PKs!xVy4ZRTdu>I4AAB^AK{
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 22/35] tests: acpi: add and white-list DSDT.applesmc expected blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (20 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 21/35] tests: acpi: update expected blobs Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 23/35] tests: acpi: add applesmc testcase Igor Mammedov
` (14 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
tests/data/acpi/q35/DSDT.applesmc | 0
2 files changed, 1 insertion(+)
create mode 100644 tests/data/acpi/q35/DSDT.applesmc
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..e893029d87 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.applesmc",
diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
new file mode 100644
index 0000000000..e69de29bb2
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 23/35] tests: acpi: add applesmc testcase
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (21 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 22/35] tests: acpi: add and white-list DSDT.applesmc expected blob Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
` (13 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 615cbdaf17..b7be634d23 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1582,6 +1582,17 @@ static void test_acpi_q35_slic(void)
free_test_data(&data);
}
+static void test_acpi_q35_applesmc(void)
+{
+ test_data data = {
+ .machine = MACHINE_Q35,
+ .variant = ".applesmc",
+ };
+
+ test_acpi_one("-device isa-applesmc", &data);
+ free_test_data(&data);
+}
+
static void test_oem_fields(test_data *data)
{
int i;
@@ -1740,6 +1751,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat);
qtest_add_func("acpi/piix4/acpierst", test_acpi_piix4_acpi_erst);
qtest_add_func("acpi/q35/acpierst", test_acpi_q35_acpi_erst);
+ qtest_add_func("acpi/q35/applesmc", test_acpi_q35_applesmc);
qtest_add_func("acpi/microvm", test_acpi_microvm_tcg);
qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg);
qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg);
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (22 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 23/35] tests: acpi: add applesmc testcase Igor Mammedov
@ 2022-05-16 15:25 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 25/35] tests: acpi: update expected blobs Igor Mammedov
` (12 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:25 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
.. and clean up not longer needed conditionals in DSTD build
code. applesmc AML will be fetched and included when ISA bridge
will build its own AML code (incl. attached devices).
Expected AML change:
the device under separate _SB.PCI0.ISA scope is moved directly
under Device(ISA) node.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/isa/isa.h | 14 --------------
hw/i386/acpi-build.c | 22 ----------------------
hw/misc/applesmc.c | 29 +++++++++++++++++++++++++++++
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 5c5a3d43a7..6f9380007d 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -16,20 +16,6 @@ OBJECT_DECLARE_TYPE(ISADevice, ISADeviceClass, ISA_DEVICE)
#define TYPE_ISA_BUS "ISA"
OBJECT_DECLARE_SIMPLE_TYPE(ISABus, ISA_BUS)
-#define TYPE_APPLE_SMC "isa-applesmc"
-#define APPLESMC_MAX_DATA_LENGTH 32
-#define APPLESMC_PROP_IO_BASE "iobase"
-
-static inline uint16_t applesmc_port(void)
-{
- Object *obj = object_resolve_path_type("", TYPE_APPLE_SMC, NULL);
-
- if (obj) {
- return object_property_get_uint(obj, APPLESMC_PROP_IO_BASE, NULL);
- }
- return 0;
-}
-
#define TYPE_ISADMA "isa-dma"
typedef struct IsaDmaClass IsaDmaClass;
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 33ee5bfcfb..517818cd9f 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -118,7 +118,6 @@ typedef struct AcpiMiscInfo {
const unsigned char *dsdt_code;
unsigned dsdt_size;
uint16_t pvpanic_port;
- uint16_t applesmc_io_base;
} AcpiMiscInfo;
typedef struct AcpiBuildPciBusHotplugState {
@@ -304,7 +303,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
info->tpm_version = tpm_get_version(tpm_find());
#endif
info->pvpanic_port = pvpanic_port();
- info->applesmc_io_base = applesmc_port();
}
/*
@@ -1751,26 +1749,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, scope);
}
- if (misc->applesmc_io_base) {
- scope = aml_scope("\\_SB.PCI0.ISA");
- dev = aml_device("SMC");
-
- aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0001")));
- /* device present, functioning, decoding, not shown in UI */
- aml_append(dev, aml_name_decl("_STA", aml_int(0xB)));
-
- crs = aml_resource_template();
- aml_append(crs,
- aml_io(AML_DECODE16, misc->applesmc_io_base, misc->applesmc_io_base,
- 0x01, APPLESMC_MAX_DATA_LENGTH)
- );
- aml_append(crs, aml_irq_no_flags(6));
- aml_append(dev, aml_name_decl("_CRS", crs));
-
- aml_append(scope, dev);
- aml_append(dsdt, scope);
- }
-
if (misc->pvpanic_port) {
scope = aml_scope("\\_SB.PCI0.ISA");
diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 81cd6b6423..5f9c742e50 100644
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -37,10 +37,14 @@
#include "qemu/module.h"
#include "qemu/timer.h"
#include "qom/object.h"
+#include "hw/acpi/acpi_aml_interface.h"
/* #define DEBUG_SMC */
#define APPLESMC_DEFAULT_IOBASE 0x300
+#define TYPE_APPLE_SMC "isa-applesmc"
+#define APPLESMC_MAX_DATA_LENGTH 32
+#define APPLESMC_PROP_IO_BASE "iobase"
enum {
APPLESMC_DATA_PORT = 0x00,
@@ -347,14 +351,35 @@ static Property applesmc_isa_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void build_applesmc_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ Aml *crs;
+ AppleSMCState *s = APPLE_SMC(adev);
+ uint32_t iobase = s->iobase;
+ Aml *dev = aml_device("SMC");
+
+ aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0001")));
+ /* device present, functioning, decoding, not shown in UI */
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xB)));
+ crs = aml_resource_template();
+ aml_append(crs,
+ aml_io(AML_DECODE16, iobase, iobase, 0x01, APPLESMC_MAX_DATA_LENGTH)
+ );
+ aml_append(crs, aml_irq_no_flags(6));
+ aml_append(dev, aml_name_decl("_CRS", crs));
+ aml_append(scope, dev);
+}
+
static void qdev_applesmc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = applesmc_isa_realize;
dc->reset = qdev_applesmc_isa_reset;
device_class_set_props(dc, applesmc_isa_properties);
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ adevc->build_dev_aml = build_applesmc_aml;
}
static const TypeInfo applesmc_isa_info = {
@@ -362,6 +387,10 @@ static const TypeInfo applesmc_isa_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(AppleSMCState),
.class_init = qdev_applesmc_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void applesmc_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 25/35] tests: acpi: update expected blobs
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (23 preceding siblings ...)
2022-05-16 15:25 ` [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob Igor Mammedov
` (11 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
@@ -145,6 +145,23 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Name (_ADR, 0x001F0000) // _ADR: Address
OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
+ Device (SMC)
+ {
+ Name (_HID, EisaId ("APP0001")) // _HID: Hardware ID
+ Name (_STA, 0x0B) // _STA: Status
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0300, // Range Minimum
+ 0x0300, // Range Maximum
+ 0x01, // Alignment
+ 0x20, // Length
+ )
+ IRQNoFlags ()
+ {6}
+ })
+ }
+
Device (KBD)
{
Name (_HID, EisaId ("PNP0303") /* IBM Enhanced Keyboard (101/102-key, PS/2 Mouse) */) // _HID: Hardware ID
@@ -3246,26 +3263,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
- Scope (\_SB.PCI0.ISA)
- {
- Device (SMC)
- {
- Name (_HID, EisaId ("APP0001")) // _HID: Hardware ID
- Name (_STA, 0x0B) // _STA: Status
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- IO (Decode16,
- 0x0300, // Range Minimum
- 0x0300, // Range Maximum
- 0x01, // Alignment
- 0x20, // Length
- )
- IRQNoFlags ()
- {6}
- })
- }
- }
-
Scope (\_SB)
{
Scope (PCI0)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
tests/data/acpi/q35/DSDT.applesmc | Bin 0 -> 8320 bytes
2 files changed, 1 deletion(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index e893029d87..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.applesmc",
diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.applesmc
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..00092aacc6ce44dd8792b00a0fa183e5b06d33c6 100644
GIT binary patch
literal 8320
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
Y3<fg}Ry~GIOPrjSCl~lhh8_|2f2v2oY5)KL
literal 0
HcmV?d00001
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (24 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 25/35] tests: acpi: update expected blobs Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 27/35] tests: acpi: add pvpanic-isa: testcase Igor Mammedov
` (10 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
tests/data/acpi/q35/DSDT.pvpanic-isa | 0
2 files changed, 1 insertion(+)
create mode 100644 tests/data/acpi/q35/DSDT.pvpanic-isa
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..d5cd7aa4f5 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.pvpanic-isa",
diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
new file mode 100644
index 0000000000..e69de29bb2
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 27/35] tests: acpi: add pvpanic-isa: testcase
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (25 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
` (9 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index b7be634d23..ecbb4dab5a 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1593,6 +1593,17 @@ static void test_acpi_q35_applesmc(void)
free_test_data(&data);
}
+static void test_acpi_q35_pvpanic_isa(void)
+{
+ test_data data = {
+ .machine = MACHINE_Q35,
+ .variant = ".pvpanic-isa",
+ };
+
+ test_acpi_one("-device pvpanic", &data);
+ free_test_data(&data);
+}
+
static void test_oem_fields(test_data *data)
{
int i;
@@ -1752,6 +1763,7 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/piix4/acpierst", test_acpi_piix4_acpi_erst);
qtest_add_func("acpi/q35/acpierst", test_acpi_q35_acpi_erst);
qtest_add_func("acpi/q35/applesmc", test_acpi_q35_applesmc);
+ qtest_add_func("acpi/q35/pvpanic-isa", test_acpi_q35_pvpanic_isa);
qtest_add_func("acpi/microvm", test_acpi_microvm_tcg);
qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg);
qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg);
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (26 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 27/35] tests: acpi: add pvpanic-isa: testcase Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 20:46 ` Michael S. Tsirkin
2022-05-16 15:26 ` [PATCH 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob Igor Mammedov
` (8 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
.. and clean up not longer needed conditionals in DSTD build code
pvpanic-isa AML will be fetched and included when ISA bridge will
build its own AML code (including attached devices).
Expected AML change:
the device under separate _SB.PCI0.ISA scope is moved directly
under Device(ISA) node.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/misc/pvpanic.h | 9 ---------
hw/i386/acpi-build.c | 37 ----------------------------------
hw/misc/pvpanic-isa.c | 42 +++++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
index 7f16cc9b16..e520566ab0 100644
--- a/include/hw/misc/pvpanic.h
+++ b/include/hw/misc/pvpanic.h
@@ -33,13 +33,4 @@ struct PVPanicState {
void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
-static inline uint16_t pvpanic_port(void)
-{
- Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
- if (!o) {
- return 0;
- }
- return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
-}
-
#endif
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 517818cd9f..a42f41f373 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -30,7 +30,6 @@
#include "hw/pci/pci.h"
#include "hw/core/cpu.h"
#include "target/i386/cpu.h"
-#include "hw/misc/pvpanic.h"
#include "hw/timer/hpet.h"
#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h"
@@ -117,7 +116,6 @@ typedef struct AcpiMiscInfo {
#endif
const unsigned char *dsdt_code;
unsigned dsdt_size;
- uint16_t pvpanic_port;
} AcpiMiscInfo;
typedef struct AcpiBuildPciBusHotplugState {
@@ -302,7 +300,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
#ifdef CONFIG_TPM
info->tpm_version = tpm_get_version(tpm_find());
#endif
- info->pvpanic_port = pvpanic_port();
}
/*
@@ -1749,40 +1746,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, scope);
}
- if (misc->pvpanic_port) {
- scope = aml_scope("\\_SB.PCI0.ISA");
-
- dev = aml_device("PEVT");
- aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
-
- crs = aml_resource_template();
- aml_append(crs,
- aml_io(AML_DECODE16, misc->pvpanic_port, misc->pvpanic_port, 1, 1)
- );
- aml_append(dev, aml_name_decl("_CRS", crs));
-
- aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
- aml_int(misc->pvpanic_port), 1));
- field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
- aml_append(field, aml_named_field("PEPT", 8));
- aml_append(dev, field);
-
- /* device present, functioning, decoding, shown in UI */
- aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
-
- method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
- aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
- aml_append(method, aml_return(aml_local(0)));
- aml_append(dev, method);
-
- method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
- aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
- aml_append(dev, method);
-
- aml_append(scope, dev);
- aml_append(dsdt, scope);
- }
-
sb_scope = aml_scope("\\_SB");
{
Object *pci_host;
diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
index b84d4d458d..ccec50f61b 100644
--- a/hw/misc/pvpanic-isa.c
+++ b/hw/misc/pvpanic-isa.c
@@ -22,6 +22,7 @@
#include "qom/object.h"
#include "hw/isa/isa.h"
#include "standard-headers/linux/pvpanic.h"
+#include "hw/acpi/acpi_aml_interface.h"
OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
@@ -63,6 +64,41 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
isa_register_ioport(d, &ps->mr, s->ioport);
}
+static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ Aml *crs, *field, *method;
+ PVPanicISAState *s = PVPANIC_ISA_DEVICE(adev);
+ Aml *dev = aml_device("PEVT");
+
+ aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
+
+ crs = aml_resource_template();
+ aml_append(crs,
+ aml_io(AML_DECODE16, s->ioport, s->ioport, 1, 1)
+ );
+ aml_append(dev, aml_name_decl("_CRS", crs));
+
+ aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
+ aml_int(s->ioport), 1));
+ field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
+ aml_append(field, aml_named_field("PEPT", 8));
+ aml_append(dev, field);
+
+ /* device present, functioning, decoding, shown in UI */
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
+
+ method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
+ aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
+ aml_append(method, aml_return(aml_local(0)));
+ aml_append(dev, method);
+
+ method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
+ aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
+ aml_append(dev, method);
+
+ aml_append(scope, dev);
+}
+
static Property pvpanic_isa_properties[] = {
DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events,
@@ -73,10 +109,12 @@ static Property pvpanic_isa_properties[] = {
static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = pvpanic_isa_realizefn;
device_class_set_props(dc, pvpanic_isa_properties);
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ adevc->build_dev_aml = build_pvpanic_isa_aml;
}
static const TypeInfo pvpanic_isa_info = {
@@ -85,6 +123,10 @@ static const TypeInfo pvpanic_isa_info = {
.instance_size = sizeof(PVPanicISAState),
.instance_init = pvpanic_isa_initfn,
.class_init = pvpanic_isa_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void pvpanic_register_types(void)
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (27 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs Igor Mammedov
` (7 subsequent siblings)
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
@@ -145,6 +145,37 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Name (_ADR, 0x001F0000) // _ADR: Address
OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
+ Device (PEVT)
+ {
+ Name (_HID, "QEMU0001") // _HID: Hardware ID
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ IO (Decode16,
+ 0x0505, // Range Minimum
+ 0x0505, // Range Maximum
+ 0x01, // Alignment
+ 0x01, // Length
+ )
+ })
+ OperationRegion (PEOR, SystemIO, 0x0505, One)
+ Field (PEOR, ByteAcc, NoLock, Preserve)
+ {
+ PEPT, 8
+ }
+
+ Name (_STA, 0x0F) // _STA: Status
+ Method (RDPT, 0, NotSerialized)
+ {
+ Local0 = PEPT /* \_SB_.PCI0.ISA_.PEVT.PEPT */
+ Return (Local0)
+ }
+
+ Method (WRPT, 1, NotSerialized)
+ {
+ PEPT = Arg0
+ }
+ }
+
Device (KBD)
{
Name (_HID, EisaId ("PNP0303") /* IBM Enhanced Keyboard (101/102-key, PS/2 Mouse) */) // _HID: Hardware ID
@@ -3246,40 +3277,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
- Scope (\_SB.PCI0.ISA)
- {
- Device (PEVT)
- {
- Name (_HID, "QEMU0001") // _HID: Hardware ID
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- IO (Decode16,
- 0x0505, // Range Minimum
- 0x0505, // Range Maximum
- 0x01, // Alignment
- 0x01, // Length
- )
- })
- OperationRegion (PEOR, SystemIO, 0x0505, One)
- Field (PEOR, ByteAcc, NoLock, Preserve)
- {
- PEPT, 8
- }
-
- Name (_STA, 0x0F) // _STA: Status
- Method (RDPT, 0, NotSerialized)
- {
- Local0 = PEPT /* \_SB_.PCI0.ISA_.PEVT.PEPT */
- Return (Local0)
- }
-
- Method (WRPT, 1, NotSerialized)
- {
- PEPT = Arg0
- }
- }
- }
-
Scope (\_SB)
{
Scope (PCI0)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 0 -> 8375 bytes
2 files changed, 1 deletion(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index d5cd7aa4f5..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.pvpanic-isa",
diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSDT.pvpanic-isa
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cc545b5d2505246d33f83d2482273968aa1be032 100644
GIT binary patch
literal 8375
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
B&uRbw
literal 0
HcmV?d00001
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (28 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-18 10:20 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope Igor Mammedov
` (6 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..7b3bf9a207 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,3 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT.tis.tpm2",
+"tests/data/acpi/q35/DSDT.tis.tpm12",
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (29 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-18 9:03 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus Igor Mammedov
` (5 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
tpm-tis, is not a PCI device but ISA one, move it
under ISA scope to fix incorrect placement.
Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a42f41f373..85a7313cad 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1764,15 +1764,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
#ifdef CONFIG_TPM
if (TPM_IS_TIS_ISA(tpm)) {
+ dev = aml_device("ISA.TPM");
if (misc->tpm_version == TPM_VERSION_2_0) {
- dev = aml_device("TPM");
aml_append(dev, aml_name_decl("_HID",
aml_string("MSFT0101")));
aml_append(dev,
aml_name_decl("_STR",
aml_string("TPM 2.0 Device")));
} else {
- dev = aml_device("ISA.TPM");
aml_append(dev, aml_name_decl("_HID",
aml_eisaid("PNP0C31")));
}
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (30 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-18 8:43 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
` (4 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 85a7313cad..414b9240b2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1748,16 +1748,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
sb_scope = aml_scope("\\_SB");
{
- Object *pci_host;
- PCIBus *bus = NULL;
-
- pci_host = acpi_get_i386_pci_host();
+ Object *pci_host = acpi_get_i386_pci_host();
if (pci_host) {
- bus = PCI_HOST_BRIDGE(pci_host)->bus;
- }
-
- if (bus) {
+ PCIBus *bus = PCI_HOST_BRIDGE(pci_host)->bus;
Aml *scope = aml_scope("PCI0");
/* Scan all PCI buses. Generate tables to support hotplug. */
build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (31 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-18 10:45 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs Igor Mammedov
` (3 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
.. and clean up not longer needed conditionals in DSTD build code
tpm-tis AML will be fetched and included when ISA bridge will
build its own AML code (including attached devices).
Expected AML change:
the device under separate _SB.PCI0.ISA scope is moved directly
under Device(ISA) node.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 34 ----------------------------------
hw/tpm/tpm_tis_isa.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 414b9240b2..58284438f8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1755,40 +1755,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
Aml *scope = aml_scope("PCI0");
/* Scan all PCI buses. Generate tables to support hotplug. */
build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
-
-#ifdef CONFIG_TPM
- if (TPM_IS_TIS_ISA(tpm)) {
- dev = aml_device("ISA.TPM");
- if (misc->tpm_version == TPM_VERSION_2_0) {
- aml_append(dev, aml_name_decl("_HID",
- aml_string("MSFT0101")));
- aml_append(dev,
- aml_name_decl("_STR",
- aml_string("TPM 2.0 Device")));
- } else {
- aml_append(dev, aml_name_decl("_HID",
- aml_eisaid("PNP0C31")));
- }
- aml_append(dev, aml_name_decl("_UID", aml_int(1)));
-
- aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
- crs = aml_resource_template();
- aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
- TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
- /*
- FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs,
- Rewrite to take IRQ from TPM device model and
- fix default IRQ value there to use some unused IRQ
- */
- /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */
- aml_append(dev, aml_name_decl("_CRS", crs));
-
- tpm_build_ppi_acpi(tpm, dev);
-
- aml_append(scope, dev);
- }
-#endif
-
aml_append(sb_scope, scope);
}
}
diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
index 3477afd735..91e3792248 100644
--- a/hw/tpm/tpm_tis_isa.c
+++ b/hw/tpm/tpm_tis_isa.c
@@ -30,6 +30,7 @@
#include "tpm_prop.h"
#include "tpm_tis.h"
#include "qom/object.h"
+#include "hw/acpi/acpi_aml_interface.h"
struct TPMStateISA {
/*< private >*/
@@ -138,10 +139,39 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
}
}
+static void build_tpm_tis_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
+{
+ Aml *dev, *crs;
+ TPMStateISA *isadev = TPM_TIS_ISA(adev);
+ TPMIf *ti = TPM_IF(isadev);
+
+ dev = aml_device("TPM");
+ if (tpm_tis_isa_get_tpm_version(ti) == TPM_VERSION_2_0) {
+ aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));
+ aml_append(dev, aml_name_decl("_STR", aml_string("TPM 2.0 Device")));
+ } else {
+ aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
+ }
+ aml_append(dev, aml_name_decl("_UID", aml_int(1)));
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
+ crs = aml_resource_template();
+ aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE,
+ AML_READ_WRITE));
+ /*
+ * FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs,
+ * fix default TPM_TIS_IRQ value there to use some unused IRQ
+ */
+ /* aml_append(crs, aml_irq_no_flags(isadev->state.irq_num)); */
+ aml_append(dev, aml_name_decl("_CRS", crs));
+ tpm_build_ppi_acpi(ti, dev);
+ aml_append(scope, dev);
+}
+
static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
TPMIfClass *tc = TPM_IF_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
device_class_set_props(dc, tpm_tis_isa_properties);
dc->vmsd = &vmstate_tpm_tis_isa;
@@ -151,6 +181,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
tc->request_completed = tpm_tis_isa_request_completed;
tc->get_version = tpm_tis_isa_get_tpm_version;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ adevc->build_dev_aml = build_tpm_tis_isa_aml;
}
static const TypeInfo tpm_tis_isa_info = {
@@ -161,6 +192,7 @@ static const TypeInfo tpm_tis_isa_info = {
.class_init = tpm_tis_isa_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_TPM_IF },
+ { TYPE_ACPI_DEV_AML_IF },
{ }
}
};
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (32 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-18 10:49 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 35/35] x86: acpi-build: do not include hw/isa/isa.h directly Igor Mammedov
` (2 subsequent siblings)
36 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
expected move of tmp-tis device description directly under
Device(ISA) node.
for tpm-tis 2.0:
@@ -145,6 +145,189 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Name (_ADR, 0x001F0000) // _ADR: Address
OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
+ Device (TPM)
+ {
+ Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID
+ Name (_STR, "TPM 2.0 Device") // _STR: Description String
+ Name (_UID, One) // _UID: Unique ID
+ Name (_STA, 0x0F) // _STA: Status
...
+ }
@@ -3281,189 +3464,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
Method (PCNT, 0, NotSerialized)
{
}
-
- Device (TPM)
- {
- Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID
- Name (_STR, "TPM 2.0 Device") // _STR: Description String
- Name (_UID, One) // _UID: Unique ID
- Name (_STA, 0x0F) // _STA: Status
...
- }
for tpm-tis 1.2:
@@ -145,6 +145,188 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Name (_ADR, 0x001F0000) // _ADR: Address
OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
+ Device (TPM)
+ {
+ Name (_HID, EisaId ("PNP0C31")) // _HID: Hardware ID
+ Name (_UID, One) // _UID: Unique ID
+ Name (_STA, 0x0F) // _STA: Status
...
+ }
@@ -3281,188 +3463,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
Method (PCNT, 0, NotSerialized)
{
}
-
- Device (ISA.TPM)
- {
- Name (_HID, EisaId ("PNP0C31")) // _HID: Hardware ID
- Name (_UID, One) // _UID: Unique ID
- Name (_STA, 0x0F) // _STA: Status
...
- }
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 2 --
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8885 -> 8880 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8906 bytes
3 files changed, 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 7b3bf9a207..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/DSDT.tis.tpm12",
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
index 0b5c97fdb5da8b7b55d6b5f2af498a447fda7bf8..a97d884c50485f848054c6ac95ecfa055ff59e5b 100644
GIT binary patch
delta 89
zcmdn$y1|vpCD<iogAxM+quxfYn~XZHW_t0#PVoWGo(9oP9;Tkbj`1AvjxIqw3=HxN
r(G3BfL4izM30yqUO%AG?(-r)fHghwv%5nLz#DKI3xUo!@Qg8tPLai3C
delta 95
zcmdnsy497-CD<ios}chP<Nl3YHyJgY1@+>Co#F$WJq@Cp+yp#>9pgFT9bJNW7#QRk
vq8kD{g94ej61aFa$Fi`>ak*;6fK&_kYEI5ka^Z|_a#hs>Y1z!r<i`X6>g5>c
diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index 4e16b126cc1c32f2346078fa69c5261c245d15e8..1f5392919b5ea69696b49ff13aab5c37d0615919 100644
GIT binary patch
delta 85
zcmX@*ddii{CD<k8loA62<JFB^HyJhj&Gq7go#F$WJq@CpoXkCg9pgFT9bJNW7#QRk
nq8kD{g94ej61aFa$0_76ZRTcTmE-bbi2-R5aATP)rQiYpDU=p=
delta 85
zcmX@*ddii{CD<k8loA62<CBeCHyJgY1@+>Co#F$WJq@Cp+yp#>9pgFT9bJNW7#QRk
nq8kD{g94ej61aFam$R_Sad~OSfK&@OX-{rba@owyl*0r7A8!`n
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH 35/35] x86: acpi-build: do not include hw/isa/isa.h directly
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (33 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs Igor Mammedov
@ 2022-05-16 15:26 ` Igor Mammedov
2022-05-16 20:47 ` [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Michael S. Tsirkin
2022-05-17 8:17 ` Gerd Hoffmann
36 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-16 15:26 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, ani, minyard, stefanb, marcandre.lureau, kraxel
the last remaining dependency on ISA in acpi-build.c
is iapc_boot_arch_8042() which pulls in in isa.h
in its own header hw/input/i8042.h. Clean up
not longer needed direct inclusion of isa.h in
acpi-build.c
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 58284438f8..cf7901c3bf 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -36,7 +36,6 @@
#include "hw/acpi/cpu.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/acpi/bios-linker-loader.h"
-#include "hw/isa/isa.h"
#include "hw/acpi/acpi_aml_interface.h"
#include "hw/input/i8042.h"
#include "hw/acpi/memory_hotplug.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 15:26 ` [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
@ 2022-05-16 20:46 ` Michael S. Tsirkin
2022-05-17 8:13 ` Gerd Hoffmann
` (2 more replies)
0 siblings, 3 replies; 56+ messages in thread
From: Michael S. Tsirkin @ 2022-05-16 20:46 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 11:26:03AM -0400, Igor Mammedov wrote:
> .. and clean up not longer needed conditionals in DSTD build code
> pvpanic-isa AML will be fetched and included when ISA bridge will
> build its own AML code (including attached devices).
>
> Expected AML change:
> the device under separate _SB.PCI0.ISA scope is moved directly
> under Device(ISA) node.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> include/hw/misc/pvpanic.h | 9 ---------
> hw/i386/acpi-build.c | 37 ----------------------------------
> hw/misc/pvpanic-isa.c | 42 +++++++++++++++++++++++++++++++++++++++
> 3 files changed, 42 insertions(+), 46 deletions(-)
>
> diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> index 7f16cc9b16..e520566ab0 100644
> --- a/include/hw/misc/pvpanic.h
> +++ b/include/hw/misc/pvpanic.h
> @@ -33,13 +33,4 @@ struct PVPanicState {
>
> void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
>
> -static inline uint16_t pvpanic_port(void)
> -{
> - Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
> - if (!o) {
> - return 0;
> - }
> - return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
> -}
> -
> #endif
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 517818cd9f..a42f41f373 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -30,7 +30,6 @@
> #include "hw/pci/pci.h"
> #include "hw/core/cpu.h"
> #include "target/i386/cpu.h"
> -#include "hw/misc/pvpanic.h"
> #include "hw/timer/hpet.h"
> #include "hw/acpi/acpi-defs.h"
> #include "hw/acpi/acpi.h"
> @@ -117,7 +116,6 @@ typedef struct AcpiMiscInfo {
> #endif
> const unsigned char *dsdt_code;
> unsigned dsdt_size;
> - uint16_t pvpanic_port;
> } AcpiMiscInfo;
>
> typedef struct AcpiBuildPciBusHotplugState {
> @@ -302,7 +300,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
> #ifdef CONFIG_TPM
> info->tpm_version = tpm_get_version(tpm_find());
> #endif
> - info->pvpanic_port = pvpanic_port();
> }
>
> /*
> @@ -1749,40 +1746,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> aml_append(dsdt, scope);
> }
>
> - if (misc->pvpanic_port) {
> - scope = aml_scope("\\_SB.PCI0.ISA");
> -
> - dev = aml_device("PEVT");
> - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> -
> - crs = aml_resource_template();
> - aml_append(crs,
> - aml_io(AML_DECODE16, misc->pvpanic_port, misc->pvpanic_port, 1, 1)
> - );
> - aml_append(dev, aml_name_decl("_CRS", crs));
> -
> - aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> - aml_int(misc->pvpanic_port), 1));
> - field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> - aml_append(field, aml_named_field("PEPT", 8));
> - aml_append(dev, field);
> -
> - /* device present, functioning, decoding, shown in UI */
> - aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> -
> - method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> - aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> - aml_append(method, aml_return(aml_local(0)));
> - aml_append(dev, method);
> -
> - method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> - aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> - aml_append(dev, method);
> -
> - aml_append(scope, dev);
> - aml_append(dsdt, scope);
> - }
> -
> sb_scope = aml_scope("\\_SB");
> {
> Object *pci_host;
> diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
> index b84d4d458d..ccec50f61b 100644
> --- a/hw/misc/pvpanic-isa.c
> +++ b/hw/misc/pvpanic-isa.c
> @@ -22,6 +22,7 @@
> #include "qom/object.h"
> #include "hw/isa/isa.h"
> #include "standard-headers/linux/pvpanic.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
> OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
>
> @@ -63,6 +64,41 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
> isa_register_ioport(d, &ps->mr, s->ioport);
> }
>
> +static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
> +{
> + Aml *crs, *field, *method;
> + PVPanicISAState *s = PVPANIC_ISA_DEVICE(adev);
> + Aml *dev = aml_device("PEVT");
> +
> + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> +
> + crs = aml_resource_template();
> + aml_append(crs,
> + aml_io(AML_DECODE16, s->ioport, s->ioport, 1, 1)
> + );
> + aml_append(dev, aml_name_decl("_CRS", crs));
> +
> + aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> + aml_int(s->ioport), 1));
> + field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> + aml_append(field, aml_named_field("PEPT", 8));
> + aml_append(dev, field);
> +
> + /* device present, functioning, decoding, shown in UI */
> + aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> +
> + method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> + aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> + aml_append(method, aml_return(aml_local(0)));
> + aml_append(dev, method);
> +
> + method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> + aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> + aml_append(dev, method);
> +
> + aml_append(scope, dev);
> +}
> +
> static Property pvpanic_isa_properties[] = {
> DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
> DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events,
> @@ -73,10 +109,12 @@ static Property pvpanic_isa_properties[] = {
> static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
>
> dc->realize = pvpanic_isa_realizefn;
> device_class_set_props(dc, pvpanic_isa_properties);
> set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> + adevc->build_dev_aml = build_pvpanic_isa_aml;
> }
>
> static const TypeInfo pvpanic_isa_info = {
So this really makes the device depend on ACPI.
What if the device is also built for a platform without ACPI?
Looks like it will fail to build.
E.g. mips has ISA too. What if one was to add pvpanic there?
I am not sure how important this is at the moment, but
I think the APIs should support this cleanly.
How about an inline function along the lines of:
acpi_set_build_dev_aml(DeviceClass *dc, ....)
the build function itself is static, so compiler will
remove it if unused.
> @@ -85,6 +123,10 @@ static const TypeInfo pvpanic_isa_info = {
> .instance_size = sizeof(PVPanicISAState),
> .instance_init = pvpanic_isa_initfn,
> .class_init = pvpanic_isa_class_init,
> + .interfaces = (InterfaceInfo[]) {
> + { TYPE_ACPI_DEV_AML_IF },
> + { },
> + },
> };
>
> static void pvpanic_register_types(void)
> --
> 2.31.1
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (34 preceding siblings ...)
2022-05-16 15:26 ` [PATCH 35/35] x86: acpi-build: do not include hw/isa/isa.h directly Igor Mammedov
@ 2022-05-16 20:47 ` Michael S. Tsirkin
2022-05-17 16:09 ` Igor Mammedov
2022-05-17 8:17 ` Gerd Hoffmann
36 siblings, 1 reply; 56+ messages in thread
From: Michael S. Tsirkin @ 2022-05-16 20:47 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 11:25:35AM -0400, Igor Mammedov wrote:
>
> Series is excerpt form larger refactoring that does
> the same for PCI devices, but it's too large at this
> point, so I've split off a relatively self-contained
> ISA/SMBUS patches into a smaller separate series, and
> PCI refactoring will follow up on top of this series
> using the same AcpiDevAmlIf interface.
>
> Series consolidates and unifies how pc/q35 machine
> generates AML for ISA and SMBUS devices. It adds
> a new more generic interface 'AcpiDevAmlIf' that
> replaces ISA specific ISADeviceClass::build_aml
> hook and should allow to use the same approach
> (i.e. ask a device to provide its own AML) but
> not limited to ISA bus.
> Series applies AcpiDevAmlIf interface to a few
> ISA devices that were already using
> ISADeviceClass::build_aml and to devices /tpm,
> applesmc,pvpanic,ipmi/ that were generated in
> custom way. The AML generation for the later
> class is normalized to behave like any other
> ISA device that were using ISADeviceClass::build_aml
> and converted to interface 'AcpiDevAmlIf'.
> It simplifies process of building DSDT and
> eliminates custom probing/wiring for those devices
> as AML for them is generated at the time ISA/SMBUS
> is enumerated.
>
> Changes to DSDT tables QEMU generates are mostly
> contextual where devices scattered across DSDT
> are consolidated under respective device that
> hosts bus they are attached to.
I like this. Have one further enhancement idea before
applying this, sent on list.
> PS:
> + series adds several ACPI tests for devices
> that were missing them.
>
> Igor Mammedov (35):
> acpi: add interface to build device specific AML
> acpi: make isa_build_aml() support AcpiDevAmlIf interface
> acpi: fdc-isa: replace ISADeviceClass::build_aml with
> AcpiDevAmlIfClass:build_dev_aml
> acpi: parallel port: replace ISADeviceClass::build_aml with
> AcpiDevAmlIfClass:build_dev_aml
> acpi: serial-is: replace ISADeviceClass::build_aml with
> AcpiDevAmlIfClass:build_dev_aml
> acpi: mc146818rtc: replace ISADeviceClass::build_aml with
> AcpiDevAmlIfClass:build_dev_aml
> acpi: pckbd: replace ISADeviceClass::build_aml with
> AcpiDevAmlIfClass:build_dev_aml
> isa-bus: drop no longer used ISADeviceClass::build_aml
> tests: acpi: add and whitelist DSDT.ipmismbus expected blob
> tests: acpi: q35: add test for smbus-ipmi device
> tests: acpi: update expected blob DSDT.ipmismbus
> tests: acpi: whitelist DSDT.ipmismbus expected blob
> ipmi: acpi: use relative path to resource source
> tests: acpi: update expected DSDT.ipmismbus blob
> acpi: ich9-smb: add support for AcpiDevAmlIf interface
> acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device
> descriptors
> q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi
> tests: acpi: white-list to be re-factored pc/q35 DSDT
> acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device
> descriptors
> acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device
> descriptors
> tests: acpi: update expected blobs
> tests: acpi: add and white-list DSDT.applesmc expected blob
> tests: acpi: add applesmc testcase
> acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide
> device's AML
> tests: acpi: update expected blobs
> tests: acpi: white-lists expected DSDT.pvpanic-isa blob
> tests: acpi: add pvpanic-isa: testcase
> acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide
> device's AML
> tests: acpi: update expected DSDT.pvpanic-isa blob
> tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs
> acpi: pc/q35: tpm-tis: fix TPM device scope
> acpi: pc/q35: remove not needed 'if' condition on pci bus
> acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's
> AML
> tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs
> x86: acpi-build: do not include hw/isa/isa.h directly
>
> include/hw/acpi/acpi_aml_interface.h | 40 ++++++
> include/hw/acpi/ipmi.h | 9 +-
> include/hw/i386/pc.h | 1 -
> include/hw/isa/isa.h | 15 ---
> include/hw/misc/pvpanic.h | 9 --
> hw/acpi/acpi_interface.c | 8 ++
> hw/acpi/ipmi-stub.c | 2 +-
> hw/acpi/ipmi.c | 53 +++-----
> hw/acpi/meson.build | 2 +-
> hw/block/fdc-isa.c | 16 ++-
> hw/char/parallel.c | 14 ++-
> hw/char/serial-isa.c | 14 ++-
> hw/i2c/smbus_ich9.c | 15 +++
> hw/i386/acpi-build.c | 171 ++++++--------------------
> hw/i386/pc_piix.c | 1 -
> hw/i386/pc_q35.c | 1 -
> hw/input/pckbd.c | 14 ++-
> hw/ipmi/isa_ipmi_bt.c | 4 +
> hw/ipmi/isa_ipmi_kcs.c | 4 +
> hw/ipmi/smbus_ipmi.c | 4 +
> hw/isa/isa-bus.c | 9 +-
> hw/isa/lpc_ich9.c | 19 +++
> hw/isa/piix3.c | 17 +++
> hw/misc/applesmc.c | 29 +++++
> hw/misc/pvpanic-isa.c | 42 +++++++
> hw/rtc/mc146818rtc.c | 14 ++-
> hw/tpm/tpm_tis_isa.c | 32 +++++
> tests/data/acpi/pc/DSDT | Bin 6002 -> 5987 bytes
> tests/data/acpi/pc/DSDT.acpierst | Bin 5969 -> 5954 bytes
> tests/data/acpi/pc/DSDT.acpihmat | Bin 7327 -> 7312 bytes
> tests/data/acpi/pc/DSDT.bridge | Bin 8668 -> 8653 bytes
> tests/data/acpi/pc/DSDT.cphp | Bin 6466 -> 6451 bytes
> tests/data/acpi/pc/DSDT.dimmpxm | Bin 7656 -> 7641 bytes
> tests/data/acpi/pc/DSDT.hpbridge | Bin 5969 -> 5954 bytes
> tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3069 bytes
> tests/data/acpi/pc/DSDT.ipmikcs | Bin 6074 -> 6059 bytes
> tests/data/acpi/pc/DSDT.memhp | Bin 7361 -> 7346 bytes
> tests/data/acpi/pc/DSDT.nohpet | Bin 5860 -> 5845 bytes
> tests/data/acpi/pc/DSDT.numamem | Bin 6008 -> 5993 bytes
> tests/data/acpi/pc/DSDT.roothp | Bin 6210 -> 6195 bytes
> tests/data/acpi/q35/DSDT | Bin 8289 -> 8274 bytes
> tests/data/acpi/q35/DSDT.acpierst | Bin 8306 -> 8291 bytes
> tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9599 bytes
> tests/data/acpi/q35/DSDT.applesmc | Bin 0 -> 8320 bytes
> tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 10988 bytes
> tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8738 bytes
> tests/data/acpi/q35/DSDT.dimmpxm | Bin 9943 -> 9928 bytes
> tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8349 bytes
> tests/data/acpi/q35/DSDT.ipmismbus | Bin 0 -> 8363 bytes
> tests/data/acpi/q35/DSDT.ivrs | Bin 8306 -> 8291 bytes
> tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9633 bytes
> tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9404 bytes
> tests/data/acpi/q35/DSDT.multi-bridge | Bin 8583 -> 8568 bytes
> tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8132 bytes
> tests/data/acpi/q35/DSDT.numamem | Bin 8295 -> 8280 bytes
> tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 0 -> 8375 bytes
> tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8900 -> 8880 bytes
> tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8921 -> 8906 bytes
> tests/data/acpi/q35/DSDT.viot | Bin 9398 -> 9383 bytes
> tests/data/acpi/q35/DSDT.xapic | Bin 35652 -> 35637 bytes
> tests/qtest/bios-tables-test.c | 40 ++++++
> 61 files changed, 360 insertions(+), 239 deletions(-)
> create mode 100644 include/hw/acpi/acpi_aml_interface.h
> create mode 100644 tests/data/acpi/q35/DSDT.applesmc
> create mode 100644 tests/data/acpi/q35/DSDT.ipmismbus
> create mode 100644 tests/data/acpi/q35/DSDT.pvpanic-isa
>
> --
> 2.31.1
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 20:46 ` Michael S. Tsirkin
@ 2022-05-17 8:13 ` Gerd Hoffmann
2022-05-18 16:29 ` Michael S. Tsirkin
2022-05-17 16:01 ` Igor Mammedov
2022-05-19 17:56 ` Igor Mammedov
2 siblings, 1 reply; 56+ messages in thread
From: Gerd Hoffmann @ 2022-05-17 8:13 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Igor Mammedov, qemu-devel, ani, minyard, stefanb, marcandre.lureau
On Mon, May 16, 2022 at 04:46:29PM -0400, Michael S. Tsirkin wrote:
> On Mon, May 16, 2022 at 11:26:03AM -0400, Igor Mammedov wrote:
> > .. and clean up not longer needed conditionals in DSTD build code
> > pvpanic-isa AML will be fetched and included when ISA bridge will
> > build its own AML code (including attached devices).
> >
> > Expected AML change:
> > the device under separate _SB.PCI0.ISA scope is moved directly
> > under Device(ISA) node.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > include/hw/misc/pvpanic.h | 9 ---------
> > hw/i386/acpi-build.c | 37 ----------------------------------
> > hw/misc/pvpanic-isa.c | 42 +++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 42 insertions(+), 46 deletions(-)
> >
> > diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> > index 7f16cc9b16..e520566ab0 100644
> > --- a/include/hw/misc/pvpanic.h
> > +++ b/include/hw/misc/pvpanic.h
> > @@ -33,13 +33,4 @@ struct PVPanicState {
> >
> > void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
> >
> > -static inline uint16_t pvpanic_port(void)
> > -{
> > - Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
> > - if (!o) {
> > - return 0;
> > - }
> > - return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
> > -}
> > -
> > #endif
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 517818cd9f..a42f41f373 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -30,7 +30,6 @@
> > #include "hw/pci/pci.h"
> > #include "hw/core/cpu.h"
> > #include "target/i386/cpu.h"
> > -#include "hw/misc/pvpanic.h"
> > #include "hw/timer/hpet.h"
> > #include "hw/acpi/acpi-defs.h"
> > #include "hw/acpi/acpi.h"
> > @@ -117,7 +116,6 @@ typedef struct AcpiMiscInfo {
> > #endif
> > const unsigned char *dsdt_code;
> > unsigned dsdt_size;
> > - uint16_t pvpanic_port;
> > } AcpiMiscInfo;
> >
> > typedef struct AcpiBuildPciBusHotplugState {
> > @@ -302,7 +300,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
> > #ifdef CONFIG_TPM
> > info->tpm_version = tpm_get_version(tpm_find());
> > #endif
> > - info->pvpanic_port = pvpanic_port();
> > }
> >
> > /*
> > @@ -1749,40 +1746,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> > aml_append(dsdt, scope);
> > }
> >
> > - if (misc->pvpanic_port) {
> > - scope = aml_scope("\\_SB.PCI0.ISA");
> > -
> > - dev = aml_device("PEVT");
> > - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > -
> > - crs = aml_resource_template();
> > - aml_append(crs,
> > - aml_io(AML_DECODE16, misc->pvpanic_port, misc->pvpanic_port, 1, 1)
> > - );
> > - aml_append(dev, aml_name_decl("_CRS", crs));
> > -
> > - aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > - aml_int(misc->pvpanic_port), 1));
> > - field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > - aml_append(field, aml_named_field("PEPT", 8));
> > - aml_append(dev, field);
> > -
> > - /* device present, functioning, decoding, shown in UI */
> > - aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > -
> > - method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > - aml_append(method, aml_return(aml_local(0)));
> > - aml_append(dev, method);
> > -
> > - method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > - aml_append(dev, method);
> > -
> > - aml_append(scope, dev);
> > - aml_append(dsdt, scope);
> > - }
> > -
> > sb_scope = aml_scope("\\_SB");
> > {
> > Object *pci_host;
> > diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
> > index b84d4d458d..ccec50f61b 100644
> > --- a/hw/misc/pvpanic-isa.c
> > +++ b/hw/misc/pvpanic-isa.c
> > @@ -22,6 +22,7 @@
> > #include "qom/object.h"
> > #include "hw/isa/isa.h"
> > #include "standard-headers/linux/pvpanic.h"
> > +#include "hw/acpi/acpi_aml_interface.h"
> >
> > OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
> >
> > @@ -63,6 +64,41 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
> > isa_register_ioport(d, &ps->mr, s->ioport);
> > }
> >
> > +static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
> > +{
> > + Aml *crs, *field, *method;
> > + PVPanicISAState *s = PVPANIC_ISA_DEVICE(adev);
> > + Aml *dev = aml_device("PEVT");
> > +
> > + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > +
> > + crs = aml_resource_template();
> > + aml_append(crs,
> > + aml_io(AML_DECODE16, s->ioport, s->ioport, 1, 1)
> > + );
> > + aml_append(dev, aml_name_decl("_CRS", crs));
> > +
> > + aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > + aml_int(s->ioport), 1));
> > + field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > + aml_append(field, aml_named_field("PEPT", 8));
> > + aml_append(dev, field);
> > +
> > + /* device present, functioning, decoding, shown in UI */
> > + aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > +
> > + method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > + aml_append(method, aml_return(aml_local(0)));
> > + aml_append(dev, method);
> > +
> > + method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > + aml_append(dev, method);
> > +
> > + aml_append(scope, dev);
> > +}
> > +
> > static Property pvpanic_isa_properties[] = {
> > DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
> > DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events,
> > @@ -73,10 +109,12 @@ static Property pvpanic_isa_properties[] = {
> > static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
> >
> > dc->realize = pvpanic_isa_realizefn;
> > device_class_set_props(dc, pvpanic_isa_properties);
> > set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> > + adevc->build_dev_aml = build_pvpanic_isa_aml;
> > }
> >
> > static const TypeInfo pvpanic_isa_info = {
>
>
> So this really makes the device depend on ACPI.
> What if the device is also built for a platform without ACPI?
> Looks like it will fail to build.
That problem isn't new and we already have a bunch of aml_* stubs
because of that. I expect it'll work just fine, at worst we'll
have to add a stub or two in case some calls are not covered yet.
take care,
Gerd
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
` (35 preceding siblings ...)
2022-05-16 20:47 ` [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Michael S. Tsirkin
@ 2022-05-17 8:17 ` Gerd Hoffmann
36 siblings, 0 replies; 56+ messages in thread
From: Gerd Hoffmann @ 2022-05-17 8:17 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, ani, minyard, stefanb, marcandre.lureau
On Mon, May 16, 2022 at 11:25:35AM -0400, Igor Mammedov wrote:
>
> Series is excerpt form larger refactoring that does
> the same for PCI devices, but it's too large at this
> point, so I've split off a relatively self-contained
> ISA/SMBUS patches into a smaller separate series, and
> PCI refactoring will follow up on top of this series
> using the same AcpiDevAmlIf interface.
>
> Series consolidates and unifies how pc/q35 machine
> generates AML for ISA and SMBUS devices. It adds
> a new more generic interface 'AcpiDevAmlIf' that
> replaces ISA specific ISADeviceClass::build_aml
> hook and should allow to use the same approach
> (i.e. ask a device to provide its own AML) but
> not limited to ISA bus.
> Series applies AcpiDevAmlIf interface to a few
> ISA devices that were already using
> ISADeviceClass::build_aml and to devices /tpm,
> applesmc,pvpanic,ipmi/ that were generated in
> custom way. The AML generation for the later
> class is normalized to behave like any other
> ISA device that were using ISADeviceClass::build_aml
> and converted to interface 'AcpiDevAmlIf'.
> It simplifies process of building DSDT and
> eliminates custom probing/wiring for those devices
> as AML for them is generated at the time ISA/SMBUS
> is enumerated.
>
> Changes to DSDT tables QEMU generates are mostly
> contextual where devices scattered across DSDT
> are consolidated under respective device that
> hosts bus they are attached to.
Promoting the ISADeviceClass::build_aml idea to a more general approach
certainly makes sense. ISA update is fine. Skimmed the other updates
too, looks all sane to me.
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
take care,
Gerd
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 20:46 ` Michael S. Tsirkin
2022-05-17 8:13 ` Gerd Hoffmann
@ 2022-05-17 16:01 ` Igor Mammedov
2022-05-19 17:56 ` Igor Mammedov
2 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-17 16:01 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel
On Mon, 16 May 2022 16:46:29 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Mon, May 16, 2022 at 11:26:03AM -0400, Igor Mammedov wrote:
> > .. and clean up not longer needed conditionals in DSTD build code
> > pvpanic-isa AML will be fetched and included when ISA bridge will
> > build its own AML code (including attached devices).
> >
> > Expected AML change:
> > the device under separate _SB.PCI0.ISA scope is moved directly
> > under Device(ISA) node.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > include/hw/misc/pvpanic.h | 9 ---------
> > hw/i386/acpi-build.c | 37 ----------------------------------
> > hw/misc/pvpanic-isa.c | 42 +++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 42 insertions(+), 46 deletions(-)
> >
> > diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> > index 7f16cc9b16..e520566ab0 100644
> > --- a/include/hw/misc/pvpanic.h
> > +++ b/include/hw/misc/pvpanic.h
> > @@ -33,13 +33,4 @@ struct PVPanicState {
> >
> > void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
> >
> > -static inline uint16_t pvpanic_port(void)
> > -{
> > - Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
> > - if (!o) {
> > - return 0;
> > - }
> > - return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
> > -}
> > -
> > #endif
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 517818cd9f..a42f41f373 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -30,7 +30,6 @@
> > #include "hw/pci/pci.h"
> > #include "hw/core/cpu.h"
> > #include "target/i386/cpu.h"
> > -#include "hw/misc/pvpanic.h"
> > #include "hw/timer/hpet.h"
> > #include "hw/acpi/acpi-defs.h"
> > #include "hw/acpi/acpi.h"
> > @@ -117,7 +116,6 @@ typedef struct AcpiMiscInfo {
> > #endif
> > const unsigned char *dsdt_code;
> > unsigned dsdt_size;
> > - uint16_t pvpanic_port;
> > } AcpiMiscInfo;
> >
> > typedef struct AcpiBuildPciBusHotplugState {
> > @@ -302,7 +300,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
> > #ifdef CONFIG_TPM
> > info->tpm_version = tpm_get_version(tpm_find());
> > #endif
> > - info->pvpanic_port = pvpanic_port();
> > }
> >
> > /*
> > @@ -1749,40 +1746,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> > aml_append(dsdt, scope);
> > }
> >
> > - if (misc->pvpanic_port) {
> > - scope = aml_scope("\\_SB.PCI0.ISA");
> > -
> > - dev = aml_device("PEVT");
> > - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > -
> > - crs = aml_resource_template();
> > - aml_append(crs,
> > - aml_io(AML_DECODE16, misc->pvpanic_port, misc->pvpanic_port, 1, 1)
> > - );
> > - aml_append(dev, aml_name_decl("_CRS", crs));
> > -
> > - aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > - aml_int(misc->pvpanic_port), 1));
> > - field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > - aml_append(field, aml_named_field("PEPT", 8));
> > - aml_append(dev, field);
> > -
> > - /* device present, functioning, decoding, shown in UI */
> > - aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > -
> > - method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > - aml_append(method, aml_return(aml_local(0)));
> > - aml_append(dev, method);
> > -
> > - method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > - aml_append(dev, method);
> > -
> > - aml_append(scope, dev);
> > - aml_append(dsdt, scope);
> > - }
> > -
> > sb_scope = aml_scope("\\_SB");
> > {
> > Object *pci_host;
> > diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
> > index b84d4d458d..ccec50f61b 100644
> > --- a/hw/misc/pvpanic-isa.c
> > +++ b/hw/misc/pvpanic-isa.c
> > @@ -22,6 +22,7 @@
> > #include "qom/object.h"
> > #include "hw/isa/isa.h"
> > #include "standard-headers/linux/pvpanic.h"
> > +#include "hw/acpi/acpi_aml_interface.h"
> >
> > OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
> >
> > @@ -63,6 +64,41 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
> > isa_register_ioport(d, &ps->mr, s->ioport);
> > }
> >
> > +static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
> > +{
> > + Aml *crs, *field, *method;
> > + PVPanicISAState *s = PVPANIC_ISA_DEVICE(adev);
> > + Aml *dev = aml_device("PEVT");
> > +
> > + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > +
> > + crs = aml_resource_template();
> > + aml_append(crs,
> > + aml_io(AML_DECODE16, s->ioport, s->ioport, 1, 1)
> > + );
> > + aml_append(dev, aml_name_decl("_CRS", crs));
> > +
> > + aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > + aml_int(s->ioport), 1));
> > + field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > + aml_append(field, aml_named_field("PEPT", 8));
> > + aml_append(dev, field);
> > +
> > + /* device present, functioning, decoding, shown in UI */
> > + aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > +
> > + method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > + aml_append(method, aml_return(aml_local(0)));
> > + aml_append(dev, method);
> > +
> > + method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > + aml_append(dev, method);
> > +
> > + aml_append(scope, dev);
> > +}
> > +
> > static Property pvpanic_isa_properties[] = {
> > DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
> > DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events,
> > @@ -73,10 +109,12 @@ static Property pvpanic_isa_properties[] = {
> > static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
> >
> > dc->realize = pvpanic_isa_realizefn;
> > device_class_set_props(dc, pvpanic_isa_properties);
> > set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> > + adevc->build_dev_aml = build_pvpanic_isa_aml;
> > }
> >
> > static const TypeInfo pvpanic_isa_info = {
>
>
> So this really makes the device depend on ACPI.
> What if the device is also built for a platform without ACPI?
> Looks like it will fail to build.
>
> E.g. mips has ISA too. What if one was to add pvpanic there?
>
> I am not sure how important this is at the moment, but
> I think the APIs should support this cleanly.
it compiles/passes tests with current code,
but otherwise as Gerd already mentioned,
current pattern for such issues is stub functions.
Also we are currently pulling in aml_build library
for ISA devices (this series spreads it to some
more devices). We can isolate aml device builder
into separate files (aka set of foo-device-acpi.c)
to compile it out completely, but I'd prefer to do it
separately from this refactoring, if you'd like to
go this direction.
It's just another pre-existing issue, and out of
scope of this refactoring (which is already too big
for my taste). As you can notice this series mostly
moves ad-hoc AML to respective devices without
rewriting it, to keep it simple and review-able,
the other issues can be solved on top to keep it
manageable.
> How about an inline function along the lines of:
>
> acpi_set_build_dev_aml(DeviceClass *dc, ....)
>
> the build function itself is static, so compiler will
> remove it if unused.
lets see how PCI conversion will end up, if stubs
become to much of a burden, I for sure will try
inline function idea. Or another a bit worse idea
would be to use similar macro keyed of ACPI
define.
>
> > @@ -85,6 +123,10 @@ static const TypeInfo pvpanic_isa_info = {
> > .instance_size = sizeof(PVPanicISAState),
> > .instance_init = pvpanic_isa_initfn,
> > .class_init = pvpanic_isa_class_init,
> > + .interfaces = (InterfaceInfo[]) {
> > + { TYPE_ACPI_DEV_AML_IF },
> > + { },
> > + },
> > };
> >
> > static void pvpanic_register_types(void)
> > --
> > 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation
2022-05-16 20:47 ` [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Michael S. Tsirkin
@ 2022-05-17 16:09 ` Igor Mammedov
0 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-17 16:09 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel
On Mon, 16 May 2022 16:47:20 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Mon, May 16, 2022 at 11:25:35AM -0400, Igor Mammedov wrote:
> >
> > Series is excerpt form larger refactoring that does
> > the same for PCI devices, but it's too large at this
> > point, so I've split off a relatively self-contained
> > ISA/SMBUS patches into a smaller separate series, and
> > PCI refactoring will follow up on top of this series
> > using the same AcpiDevAmlIf interface.
> >
> > Series consolidates and unifies how pc/q35 machine
> > generates AML for ISA and SMBUS devices. It adds
> > a new more generic interface 'AcpiDevAmlIf' that
> > replaces ISA specific ISADeviceClass::build_aml
> > hook and should allow to use the same approach
> > (i.e. ask a device to provide its own AML) but
> > not limited to ISA bus.
> > Series applies AcpiDevAmlIf interface to a few
> > ISA devices that were already using
> > ISADeviceClass::build_aml and to devices /tpm,
> > applesmc,pvpanic,ipmi/ that were generated in
> > custom way. The AML generation for the later
> > class is normalized to behave like any other
> > ISA device that were using ISADeviceClass::build_aml
> > and converted to interface 'AcpiDevAmlIf'.
> > It simplifies process of building DSDT and
> > eliminates custom probing/wiring for those devices
> > as AML for them is generated at the time ISA/SMBUS
> > is enumerated.
> >
> > Changes to DSDT tables QEMU generates are mostly
> > contextual where devices scattered across DSDT
> > are consolidated under respective device that
> > hosts bus they are attached to.
>
> I like this. Have one further enhancement idea before
> applying this, sent on list.
I'd prefer to implement that enhancement on top of this
series (and may be on top of follow up PCI conversion)
if we have to do it (as the enhancement would be a bit
of off-topic churn, i.e. solving another issue that we
already have).
> > PS:
> > + series adds several ACPI tests for devices
> > that were missing them.
> >
> > Igor Mammedov (35):
> > acpi: add interface to build device specific AML
> > acpi: make isa_build_aml() support AcpiDevAmlIf interface
> > acpi: fdc-isa: replace ISADeviceClass::build_aml with
> > AcpiDevAmlIfClass:build_dev_aml
> > acpi: parallel port: replace ISADeviceClass::build_aml with
> > AcpiDevAmlIfClass:build_dev_aml
> > acpi: serial-is: replace ISADeviceClass::build_aml with
> > AcpiDevAmlIfClass:build_dev_aml
> > acpi: mc146818rtc: replace ISADeviceClass::build_aml with
> > AcpiDevAmlIfClass:build_dev_aml
> > acpi: pckbd: replace ISADeviceClass::build_aml with
> > AcpiDevAmlIfClass:build_dev_aml
> > isa-bus: drop no longer used ISADeviceClass::build_aml
> > tests: acpi: add and whitelist DSDT.ipmismbus expected blob
> > tests: acpi: q35: add test for smbus-ipmi device
> > tests: acpi: update expected blob DSDT.ipmismbus
> > tests: acpi: whitelist DSDT.ipmismbus expected blob
> > ipmi: acpi: use relative path to resource source
> > tests: acpi: update expected DSDT.ipmismbus blob
> > acpi: ich9-smb: add support for AcpiDevAmlIf interface
> > acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device
> > descriptors
> > q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi
> > tests: acpi: white-list to be re-factored pc/q35 DSDT
> > acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device
> > descriptors
> > acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device
> > descriptors
> > tests: acpi: update expected blobs
> > tests: acpi: add and white-list DSDT.applesmc expected blob
> > tests: acpi: add applesmc testcase
> > acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide
> > device's AML
> > tests: acpi: update expected blobs
> > tests: acpi: white-lists expected DSDT.pvpanic-isa blob
> > tests: acpi: add pvpanic-isa: testcase
> > acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide
> > device's AML
> > tests: acpi: update expected DSDT.pvpanic-isa blob
> > tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs
> > acpi: pc/q35: tpm-tis: fix TPM device scope
> > acpi: pc/q35: remove not needed 'if' condition on pci bus
> > acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's
> > AML
> > tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs
> > x86: acpi-build: do not include hw/isa/isa.h directly
> >
> > include/hw/acpi/acpi_aml_interface.h | 40 ++++++
> > include/hw/acpi/ipmi.h | 9 +-
> > include/hw/i386/pc.h | 1 -
> > include/hw/isa/isa.h | 15 ---
> > include/hw/misc/pvpanic.h | 9 --
> > hw/acpi/acpi_interface.c | 8 ++
> > hw/acpi/ipmi-stub.c | 2 +-
> > hw/acpi/ipmi.c | 53 +++-----
> > hw/acpi/meson.build | 2 +-
> > hw/block/fdc-isa.c | 16 ++-
> > hw/char/parallel.c | 14 ++-
> > hw/char/serial-isa.c | 14 ++-
> > hw/i2c/smbus_ich9.c | 15 +++
> > hw/i386/acpi-build.c | 171 ++++++--------------------
> > hw/i386/pc_piix.c | 1 -
> > hw/i386/pc_q35.c | 1 -
> > hw/input/pckbd.c | 14 ++-
> > hw/ipmi/isa_ipmi_bt.c | 4 +
> > hw/ipmi/isa_ipmi_kcs.c | 4 +
> > hw/ipmi/smbus_ipmi.c | 4 +
> > hw/isa/isa-bus.c | 9 +-
> > hw/isa/lpc_ich9.c | 19 +++
> > hw/isa/piix3.c | 17 +++
> > hw/misc/applesmc.c | 29 +++++
> > hw/misc/pvpanic-isa.c | 42 +++++++
> > hw/rtc/mc146818rtc.c | 14 ++-
> > hw/tpm/tpm_tis_isa.c | 32 +++++
> > tests/data/acpi/pc/DSDT | Bin 6002 -> 5987 bytes
> > tests/data/acpi/pc/DSDT.acpierst | Bin 5969 -> 5954 bytes
> > tests/data/acpi/pc/DSDT.acpihmat | Bin 7327 -> 7312 bytes
> > tests/data/acpi/pc/DSDT.bridge | Bin 8668 -> 8653 bytes
> > tests/data/acpi/pc/DSDT.cphp | Bin 6466 -> 6451 bytes
> > tests/data/acpi/pc/DSDT.dimmpxm | Bin 7656 -> 7641 bytes
> > tests/data/acpi/pc/DSDT.hpbridge | Bin 5969 -> 5954 bytes
> > tests/data/acpi/pc/DSDT.hpbrroot | Bin 3084 -> 3069 bytes
> > tests/data/acpi/pc/DSDT.ipmikcs | Bin 6074 -> 6059 bytes
> > tests/data/acpi/pc/DSDT.memhp | Bin 7361 -> 7346 bytes
> > tests/data/acpi/pc/DSDT.nohpet | Bin 5860 -> 5845 bytes
> > tests/data/acpi/pc/DSDT.numamem | Bin 6008 -> 5993 bytes
> > tests/data/acpi/pc/DSDT.roothp | Bin 6210 -> 6195 bytes
> > tests/data/acpi/q35/DSDT | Bin 8289 -> 8274 bytes
> > tests/data/acpi/q35/DSDT.acpierst | Bin 8306 -> 8291 bytes
> > tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9599 bytes
> > tests/data/acpi/q35/DSDT.applesmc | Bin 0 -> 8320 bytes
> > tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 10988 bytes
> > tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8738 bytes
> > tests/data/acpi/q35/DSDT.dimmpxm | Bin 9943 -> 9928 bytes
> > tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8349 bytes
> > tests/data/acpi/q35/DSDT.ipmismbus | Bin 0 -> 8363 bytes
> > tests/data/acpi/q35/DSDT.ivrs | Bin 8306 -> 8291 bytes
> > tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9633 bytes
> > tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9404 bytes
> > tests/data/acpi/q35/DSDT.multi-bridge | Bin 8583 -> 8568 bytes
> > tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8132 bytes
> > tests/data/acpi/q35/DSDT.numamem | Bin 8295 -> 8280 bytes
> > tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 0 -> 8375 bytes
> > tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8900 -> 8880 bytes
> > tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8921 -> 8906 bytes
> > tests/data/acpi/q35/DSDT.viot | Bin 9398 -> 9383 bytes
> > tests/data/acpi/q35/DSDT.xapic | Bin 35652 -> 35637 bytes
> > tests/qtest/bios-tables-test.c | 40 ++++++
> > 61 files changed, 360 insertions(+), 239 deletions(-)
> > create mode 100644 include/hw/acpi/acpi_aml_interface.h
> > create mode 100644 tests/data/acpi/q35/DSDT.applesmc
> > create mode 100644 tests/data/acpi/q35/DSDT.ipmismbus
> > create mode 100644 tests/data/acpi/q35/DSDT.pvpanic-isa
> >
> > --
> > 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus
2022-05-16 15:26 ` [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus Igor Mammedov
@ 2022-05-18 8:43 ` Ani Sinha
0 siblings, 0 replies; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 8:43 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
> ---
> hw/i386/acpi-build.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 85a7313cad..414b9240b2 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1748,16 +1748,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>
> sb_scope = aml_scope("\\_SB");
> {
> - Object *pci_host;
> - PCIBus *bus = NULL;
> -
> - pci_host = acpi_get_i386_pci_host();
> + Object *pci_host = acpi_get_i386_pci_host();
>
> if (pci_host) {
> - bus = PCI_HOST_BRIDGE(pci_host)->bus;
> - }
> -
> - if (bus) {
> + PCIBus *bus = PCI_HOST_BRIDGE(pci_host)->bus;
> Aml *scope = aml_scope("PCI0");
> /* Scan all PCI buses. Generate tables to support hotplug. */
> build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope
2022-05-16 15:26 ` [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope Igor Mammedov
@ 2022-05-18 9:03 ` Ani Sinha
2022-05-19 12:55 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 9:03 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> tpm-tis, is not a PCI device but ISA one, move it
> under ISA scope to fix incorrect placement.
This description is a little misleading. What we fix here is for
TPM-tis 2.0 only. TPM 1.2 was already previously under ISA scope.
>
> Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101)
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
modulo that above comment,
Reviewed-by: Ani Sinha <ani@anisinha.ca>
> ---
> hw/i386/acpi-build.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a42f41f373..85a7313cad 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1764,15 +1764,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>
> #ifdef CONFIG_TPM
> if (TPM_IS_TIS_ISA(tpm)) {
> + dev = aml_device("ISA.TPM");
> if (misc->tpm_version == TPM_VERSION_2_0) {
> - dev = aml_device("TPM");
> aml_append(dev, aml_name_decl("_HID",
> aml_string("MSFT0101")));
> aml_append(dev,
> aml_name_decl("_STR",
> aml_string("TPM 2.0 Device")));
> } else {
> - dev = aml_device("ISA.TPM");
> aml_append(dev, aml_name_decl("_HID",
> aml_eisaid("PNP0C31")));
> }
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 01/35] acpi: add interface to build device specific AML
2022-05-16 15:25 ` [PATCH 01/35] acpi: add interface to build device specific AML Igor Mammedov
@ 2022-05-18 10:00 ` Ani Sinha
2022-05-19 12:54 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 10:00 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> There is already ISADeviceClass::build_aml() callback which
> builds device specific AML blob for some ISA devices.
> To extend the same idea to other devices, add TYPE_ACPI_DEV_AML_IF
> Interface that will provide a more generic callback which
> will be used not only for ISA but other devices. It will
> allow get rid of some data-mining and ad-hoc AML building,
> by asking device(s) to generate its own AML blob like it's
> done for ISA devices.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> include/hw/acpi/acpi_aml_interface.h | 40 ++++++++++++++++++++++++++++
> hw/acpi/acpi_interface.c | 8 ++++++
> hw/acpi/meson.build | 2 +-
> 3 files changed, 49 insertions(+), 1 deletion(-)
> create mode 100644 include/hw/acpi/acpi_aml_interface.h
>
> diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
> new file mode 100644
> index 0000000000..ab76f0e55d
> --- /dev/null
> +++ b/include/hw/acpi/acpi_aml_interface.h
> @@ -0,0 +1,40 @@
> +#ifndef ACPI_AML_INTERFACE_H
> +#define ACPI_AML_INTERFACE_H
> +
> +#include "qom/object.h"
> +#include "hw/acpi/aml-build.h"
> +
> +#define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface"
> +typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass;
> +DECLARE_CLASS_CHECKERS(AcpiDevAmlIfClass, ACPI_DEV_AML_IF, TYPE_ACPI_DEV_AML_IF)
> +#define ACPI_DEV_AML_IF(obj) \
> + INTERFACE_CHECK(AcpiDevAmlIf, (obj), TYPE_ACPI_DEV_AML_IF)
> +
> +typedef struct AcpiDevAmlIf AcpiDevAmlIf;
I do not see where struct AcpiDevAmlIf is defined. I guess this is
through the macro magic.
> +typedef void (*dev_aml_fn)(AcpiDevAmlIf *adev, Aml *scope);
> +
> +/**
> + * AcpiDevAmlIfClass:
> + *
> + * build_dev_aml: adds device specific AML blob to provided scope
> + *
> + * Interface is designed for providing generic callback that builds device
> + * specific AML blob.
> + */
> +struct AcpiDevAmlIfClass {
> + /* <private> */
> + InterfaceClass parent_class;
> +
> + /* <public> */
> + dev_aml_fn build_dev_aml;
> +};
> +
> +static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
> +{
> + if (object_dynamic_cast(OBJECT(dev), TYPE_ACPI_DEV_AML_IF)) {
> + AcpiDevAmlIfClass *klass = ACPI_DEV_AML_IF_GET_CLASS(dev);
> + klass->build_dev_aml(ACPI_DEV_AML_IF(dev), scope);
> + }
> +}
> +
> +#endif
> diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c
> index 6583917b8e..c668d361f6 100644
> --- a/hw/acpi/acpi_interface.c
> +++ b/hw/acpi/acpi_interface.c
> @@ -1,5 +1,6 @@
> #include "qemu/osdep.h"
> #include "hw/acpi/acpi_dev_interface.h"
> +#include "hw/acpi/acpi_aml_interface.h"
> #include "qemu/module.h"
>
> void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event)
> @@ -18,8 +19,15 @@ static void register_types(void)
> .parent = TYPE_INTERFACE,
> .class_size = sizeof(AcpiDeviceIfClass),
> };
> + static const TypeInfo acpi_dev_aml_if_info = {
> + .name = TYPE_ACPI_DEV_AML_IF,
> + .parent = TYPE_INTERFACE,
> + .class_size = sizeof(AcpiDevAmlIfClass),
> + };
> +
>
> type_register_static(&acpi_dev_if_info);
> + type_register_static(&acpi_dev_aml_if_info);
> }
>
> type_init(register_types)
> diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
> index 8bea2e6933..9504f5ce09 100644
> --- a/hw/acpi/meson.build
> +++ b/hw/acpi/meson.build
> @@ -28,7 +28,7 @@ acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
> if have_tpm
> acpi_ss.add(files('tpm.c'))
> endif
> -softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
> +softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
This is wrong. It should be the stub file not the real thing.
> softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
> softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
> 'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c',
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface
2022-05-16 15:25 ` [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface Igor Mammedov
@ 2022-05-18 10:13 ` Ani Sinha
0 siblings, 0 replies; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 10:13 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> To allow incremental conversion from ISADeviceClass::build_aml
> to AcpiDevAmlIf, add support for the later without removing
> the former. Once conversion is complete, another commit will
> drop ISADeviceClass::build_aml related code.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
> ---
> hw/isa/isa-bus.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
> index cd5ad3687d..237e2cee12 100644
> --- a/hw/isa/isa-bus.c
> +++ b/hw/isa/isa-bus.c
> @@ -24,6 +24,7 @@
> #include "hw/sysbus.h"
> #include "sysemu/sysemu.h"
> #include "hw/isa/isa.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
> static ISABus *isabus;
>
> @@ -196,8 +197,12 @@ void isa_build_aml(ISABus *bus, Aml *scope)
> QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) {
> dev = ISA_DEVICE(kid->child);
> dc = ISA_DEVICE_GET_CLASS(dev);
> + bool has_build_dev_aml = !!object_dynamic_cast(OBJECT(dev),
> + TYPE_ACPI_DEV_AML_IF);
> if (dc->build_aml) {
> dc->build_aml(dev, scope);
> + } else if (has_build_dev_aml) {
> + call_dev_aml_func(DEVICE(dev), scope);
> }
> }
> }
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs
2022-05-16 15:26 ` [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs Igor Mammedov
@ 2022-05-18 10:20 ` Ani Sinha
0 siblings, 0 replies; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 10:20 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Ani Sinha <ani@anisinha.ca>
> ---
> tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..7b3bf9a207 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,3 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/q35/DSDT.tis.tpm2",
> +"tests/data/acpi/q35/DSDT.tis.tpm12",
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 15:26 ` [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
@ 2022-05-18 10:45 ` Ani Sinha
0 siblings, 0 replies; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 10:45 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> .. and clean up not longer needed conditionals in DSTD build code
> tpm-tis AML will be fetched and included when ISA bridge will
> build its own AML code (including attached devices).
>
> Expected AML change:
> the device under separate _SB.PCI0.ISA scope is moved directly
> under Device(ISA) node.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
> ---
> hw/i386/acpi-build.c | 34 ----------------------------------
> hw/tpm/tpm_tis_isa.c | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 32 insertions(+), 34 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 414b9240b2..58284438f8 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1755,40 +1755,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> Aml *scope = aml_scope("PCI0");
> /* Scan all PCI buses. Generate tables to support hotplug. */
> build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
> -
> -#ifdef CONFIG_TPM
> - if (TPM_IS_TIS_ISA(tpm)) {
> - dev = aml_device("ISA.TPM");
> - if (misc->tpm_version == TPM_VERSION_2_0) {
> - aml_append(dev, aml_name_decl("_HID",
> - aml_string("MSFT0101")));
> - aml_append(dev,
> - aml_name_decl("_STR",
> - aml_string("TPM 2.0 Device")));
> - } else {
> - aml_append(dev, aml_name_decl("_HID",
> - aml_eisaid("PNP0C31")));
> - }
> - aml_append(dev, aml_name_decl("_UID", aml_int(1)));
> -
> - aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> - crs = aml_resource_template();
> - aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
> - TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
> - /*
> - FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs,
> - Rewrite to take IRQ from TPM device model and
> - fix default IRQ value there to use some unused IRQ
> - */
> - /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */
> - aml_append(dev, aml_name_decl("_CRS", crs));
> -
> - tpm_build_ppi_acpi(tpm, dev);
> -
> - aml_append(scope, dev);
> - }
> -#endif
> -
> aml_append(sb_scope, scope);
> }
> }
> diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
> index 3477afd735..91e3792248 100644
> --- a/hw/tpm/tpm_tis_isa.c
> +++ b/hw/tpm/tpm_tis_isa.c
> @@ -30,6 +30,7 @@
> #include "tpm_prop.h"
> #include "tpm_tis.h"
> #include "qom/object.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
> struct TPMStateISA {
> /*< private >*/
> @@ -138,10 +139,39 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
> }
> }
>
> +static void build_tpm_tis_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
> +{
> + Aml *dev, *crs;
> + TPMStateISA *isadev = TPM_TIS_ISA(adev);
> + TPMIf *ti = TPM_IF(isadev);
> +
> + dev = aml_device("TPM");
> + if (tpm_tis_isa_get_tpm_version(ti) == TPM_VERSION_2_0) {
> + aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));
> + aml_append(dev, aml_name_decl("_STR", aml_string("TPM 2.0 Device")));
> + } else {
> + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> + }
> + aml_append(dev, aml_name_decl("_UID", aml_int(1)));
> + aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> + crs = aml_resource_template();
> + aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE,
> + AML_READ_WRITE));
> + /*
> + * FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs,
> + * fix default TPM_TIS_IRQ value there to use some unused IRQ
> + */
> + /* aml_append(crs, aml_irq_no_flags(isadev->state.irq_num)); */
> + aml_append(dev, aml_name_decl("_CRS", crs));
> + tpm_build_ppi_acpi(ti, dev);
> + aml_append(scope, dev);
> +}
> +
> static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> TPMIfClass *tc = TPM_IF_CLASS(klass);
> + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
>
> device_class_set_props(dc, tpm_tis_isa_properties);
> dc->vmsd = &vmstate_tpm_tis_isa;
> @@ -151,6 +181,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
> tc->request_completed = tpm_tis_isa_request_completed;
> tc->get_version = tpm_tis_isa_get_tpm_version;
> set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> + adevc->build_dev_aml = build_tpm_tis_isa_aml;
> }
>
> static const TypeInfo tpm_tis_isa_info = {
> @@ -161,6 +192,7 @@ static const TypeInfo tpm_tis_isa_info = {
> .class_init = tpm_tis_isa_class_init,
> .interfaces = (InterfaceInfo[]) {
> { TYPE_TPM_IF },
> + { TYPE_ACPI_DEV_AML_IF },
> { }
> }
> };
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs
2022-05-16 15:26 ` [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs Igor Mammedov
@ 2022-05-18 10:49 ` Ani Sinha
0 siblings, 0 replies; 56+ messages in thread
From: Ani Sinha @ 2022-05-18 10:49 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote:
>
> expected move of tmp-tis device description directly under
> Device(ISA) node.
>
> for tpm-tis 2.0:
>
> @@ -145,6 +145,189 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
> {
> Name (_ADR, 0x001F0000) // _ADR: Address
> OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
> + Device (TPM)
> + {
> + Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID
> + Name (_STR, "TPM 2.0 Device") // _STR: Description String
> + Name (_UID, One) // _UID: Unique ID
> + Name (_STA, 0x0F) // _STA: Status
> ...
> + }
>
> @@ -3281,189 +3464,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
> Method (PCNT, 0, NotSerialized)
> {
> }
> -
> - Device (TPM)
> - {
> - Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID
> - Name (_STR, "TPM 2.0 Device") // _STR: Description String
> - Name (_UID, One) // _UID: Unique ID
> - Name (_STA, 0x0F) // _STA: Status
> ...
> - }
>
> for tpm-tis 1.2:
>
> @@ -145,6 +145,188 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
> {
> Name (_ADR, 0x001F0000) // _ADR: Address
> OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
> + Device (TPM)
> + {
> + Name (_HID, EisaId ("PNP0C31")) // _HID: Hardware ID
> + Name (_UID, One) // _UID: Unique ID
> + Name (_STA, 0x0F) // _STA: Status
> ...
> + }
>
> @@ -3281,188 +3463,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
> Method (PCNT, 0, NotSerialized)
> {
> }
> -
> - Device (ISA.TPM)
> - {
> - Name (_HID, EisaId ("PNP0C31")) // _HID: Hardware ID
> - Name (_UID, One) // _UID: Unique ID
> - Name (_STA, 0x0F) // _STA: Status
> ...
> - }
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Ani Sinha <ani@anisinha.ca>
> ---
> tests/qtest/bios-tables-test-allowed-diff.h | 2 --
> tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8885 -> 8880 bytes
> tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8906 -> 8906 bytes
> 3 files changed, 2 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index 7b3bf9a207..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,3 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/q35/DSDT.tis.tpm2",
> -"tests/data/acpi/q35/DSDT.tis.tpm12",
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.tis.tpm12
> index 0b5c97fdb5da8b7b55d6b5f2af498a447fda7bf8..a97d884c50485f848054c6ac95ecfa055ff59e5b 100644
> GIT binary patch
> delta 89
> zcmdn$y1|vpCD<iogAxM+quxfYn~XZHW_t0#PVoWGo(9oP9;Tkbj`1AvjxIqw3=HxN
> r(G3BfL4izM30yqUO%AG?(-r)fHghwv%5nLz#DKI3xUo!@Qg8tPLai3C
>
> delta 95
> zcmdnsy497-CD<ios}chP<Nl3YHyJgY1@+>Co#F$WJq@Cp+yp#>9pgFT9bJNW7#QRk
> vq8kD{g94ej61aFa$Fi`>ak*;6fK&_kYEI5ka^Z|_a#hs>Y1z!r<i`X6>g5>c
>
> diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
> index 4e16b126cc1c32f2346078fa69c5261c245d15e8..1f5392919b5ea69696b49ff13aab5c37d0615919 100644
> GIT binary patch
> delta 85
> zcmX@*ddii{CD<k8loA62<JFB^HyJhj&Gq7go#F$WJq@CpoXkCg9pgFT9bJNW7#QRk
> nq8kD{g94ej61aFa$0_76ZRTcTmE-bbi2-R5aATP)rQiYpDU=p=
>
> delta 85
> zcmX@*ddii{CD<k8loA62<CBeCHyJgY1@+>Co#F$WJq@Cp+yp#>9pgFT9bJNW7#QRk
> nq8kD{g94ej61aFam$R_Sad~OSfK&@OX-{rba@owyl*0r7A8!`n
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-17 8:13 ` Gerd Hoffmann
@ 2022-05-18 16:29 ` Michael S. Tsirkin
2022-05-19 11:52 ` Igor Mammedov
2022-05-26 13:57 ` Igor Mammedov
0 siblings, 2 replies; 56+ messages in thread
From: Michael S. Tsirkin @ 2022-05-18 16:29 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Igor Mammedov, qemu-devel, ani, minyard, stefanb, marcandre.lureau
On Tue, May 17, 2022 at 10:13:51AM +0200, Gerd Hoffmann wrote:
> That problem isn't new and we already have a bunch of aml_* stubs
> because of that. I expect it'll work just fine, at worst we'll
> have to add a stub or two in case some calls are not covered yet.
Right but adding these stubs is a bother, we keep missing some.
If possible I'd like the solution to be cleaner than the status quo.
Is adding a wrapper instead of setting a method directly such
a big problem really?
--
MST
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-18 16:29 ` Michael S. Tsirkin
@ 2022-05-19 11:52 ` Igor Mammedov
2022-05-26 13:57 ` Igor Mammedov
1 sibling, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-19 11:52 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Gerd Hoffmann, qemu-devel, ani, minyard, stefanb, marcandre.lureau
On Wed, 18 May 2022 12:29:25 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Tue, May 17, 2022 at 10:13:51AM +0200, Gerd Hoffmann wrote:
> > That problem isn't new and we already have a bunch of aml_* stubs
> > because of that. I expect it'll work just fine, at worst we'll
> > have to add a stub or two in case some calls are not covered yet.
>
> Right but adding these stubs is a bother, we keep missing some.
> If possible I'd like the solution to be cleaner than the status quo.
> Is adding a wrapper instead of setting a method directly such
> a big problem really?
Stubs are the bother but not much compared to alternatives.
I can't recall missing stubs recently (it's hard to miss them
as it's build time failure that won't pass CI).
However wrapper would introduce ifdeffenry instead of a stub.
And my understanding was that it's not acceptable and stubs are
what consensus approach is/was to eliminate/minimize ifdefs
in the code.
Also adding wrapper won't help anything, we also need to
decouple AML code into separate source files to avoid
dependency on AML routines and that is a bigger crunch
that includes not only new source files but spreading
CONFIG_APCI all over the tree, so I'm not sure if end
result won't be worse compared to stubs. Stubs are not
the cleanest ways around the issue but they would be
simpler to maintain in the end.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 01/35] acpi: add interface to build device specific AML
2022-05-18 10:00 ` Ani Sinha
@ 2022-05-19 12:54 ` Igor Mammedov
0 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-19 12:54 UTC (permalink / raw)
To: Ani Sinha; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Wed, 18 May 2022 15:30:07 +0530
Ani Sinha <ani@anisinha.ca> wrote:
> On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > There is already ISADeviceClass::build_aml() callback which
> > builds device specific AML blob for some ISA devices.
> > To extend the same idea to other devices, add TYPE_ACPI_DEV_AML_IF
> > Interface that will provide a more generic callback which
> > will be used not only for ISA but other devices. It will
> > allow get rid of some data-mining and ad-hoc AML building,
> > by asking device(s) to generate its own AML blob like it's
> > done for ISA devices.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > include/hw/acpi/acpi_aml_interface.h | 40 ++++++++++++++++++++++++++++
> > hw/acpi/acpi_interface.c | 8 ++++++
> > hw/acpi/meson.build | 2 +-
> > 3 files changed, 49 insertions(+), 1 deletion(-)
> > create mode 100644 include/hw/acpi/acpi_aml_interface.h
> >
> > diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
> > new file mode 100644
> > index 0000000000..ab76f0e55d
> > --- /dev/null
> > +++ b/include/hw/acpi/acpi_aml_interface.h
> > @@ -0,0 +1,40 @@
> > +#ifndef ACPI_AML_INTERFACE_H
> > +#define ACPI_AML_INTERFACE_H
> > +
> > +#include "qom/object.h"
> > +#include "hw/acpi/aml-build.h"
> > +
> > +#define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface"
> > +typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass;
> > +DECLARE_CLASS_CHECKERS(AcpiDevAmlIfClass, ACPI_DEV_AML_IF, TYPE_ACPI_DEV_AML_IF)
> > +#define ACPI_DEV_AML_IF(obj) \
> > + INTERFACE_CHECK(AcpiDevAmlIf, (obj), TYPE_ACPI_DEV_AML_IF)
> > +
> > +typedef struct AcpiDevAmlIf AcpiDevAmlIf;
>
> I do not see where struct AcpiDevAmlIf is defined. I guess this is
> through the macro magic.
it's used for type checking only of opaque pointer
(Interfaces are not supposed to have any state)
> > +typedef void (*dev_aml_fn)(AcpiDevAmlIf *adev, Aml *scope);
> > +
> > +/**
> > + * AcpiDevAmlIfClass:
> > + *
> > + * build_dev_aml: adds device specific AML blob to provided scope
> > + *
> > + * Interface is designed for providing generic callback that builds device
> > + * specific AML blob.
> > + */
> > +struct AcpiDevAmlIfClass {
> > + /* <private> */
> > + InterfaceClass parent_class;
> > +
> > + /* <public> */
> > + dev_aml_fn build_dev_aml;
> > +};
> > +
> > +static inline void call_dev_aml_func(DeviceState *dev, Aml *scope)
> > +{
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_ACPI_DEV_AML_IF)) {
> > + AcpiDevAmlIfClass *klass = ACPI_DEV_AML_IF_GET_CLASS(dev);
> > + klass->build_dev_aml(ACPI_DEV_AML_IF(dev), scope);
> > + }
> > +}
> > +
> > +#endif
> > diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c
> > index 6583917b8e..c668d361f6 100644
> > --- a/hw/acpi/acpi_interface.c
> > +++ b/hw/acpi/acpi_interface.c
> > @@ -1,5 +1,6 @@
> > #include "qemu/osdep.h"
> > #include "hw/acpi/acpi_dev_interface.h"
> > +#include "hw/acpi/acpi_aml_interface.h"
> > #include "qemu/module.h"
> >
> > void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event)
> > @@ -18,8 +19,15 @@ static void register_types(void)
> > .parent = TYPE_INTERFACE,
> > .class_size = sizeof(AcpiDeviceIfClass),
> > };
> > + static const TypeInfo acpi_dev_aml_if_info = {
> > + .name = TYPE_ACPI_DEV_AML_IF,
> > + .parent = TYPE_INTERFACE,
> > + .class_size = sizeof(AcpiDevAmlIfClass),
> > + };
> > +
> >
> > type_register_static(&acpi_dev_if_info);
> > + type_register_static(&acpi_dev_aml_if_info);
> > }
> >
> > type_init(register_types)
> > diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
> > index 8bea2e6933..9504f5ce09 100644
> > --- a/hw/acpi/meson.build
> > +++ b/hw/acpi/meson.build
> > @@ -28,7 +28,7 @@ acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
> > if have_tpm
> > acpi_ss.add(files('tpm.c'))
> > endif
> > -softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
> > +softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
>
> This is wrong. It should be the stub file not the real thing.
I can put type definition into acpi-stub.c, but will be exact duplicate
(i.e. you can't stub QOM type definition), hence acpi_interface.c (which is
mostly QOM type definitions) is being included in non acpi build to avoid
duplication.
>
> > softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
> > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
> > 'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c',
> > --
> > 2.31.1
> >
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope
2022-05-18 9:03 ` Ani Sinha
@ 2022-05-19 12:55 ` Igor Mammedov
0 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-19 12:55 UTC (permalink / raw)
To: Ani Sinha; +Cc: qemu-devel, mst, minyard, stefanb, marcandre.lureau, kraxel
On Wed, 18 May 2022 14:33:12 +0530
Ani Sinha <ani@anisinha.ca> wrote:
> On Mon, May 16, 2022 at 8:57 PM Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > tpm-tis, is not a PCI device but ISA one, move it
> > under ISA scope to fix incorrect placement.
>
> This description is a little misleading. What we fix here is for
> TPM-tis 2.0 only. TPM 1.2 was already previously under ISA scope.
I'll fix it up on respin
> >
> > Fixes: 24cf5413aa0 (acpi: Make TPM 2.0 with TIS available as MSFT0101)
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>
> modulo that above comment,
> Reviewed-by: Ani Sinha <ani@anisinha.ca>
>
> > ---
> > hw/i386/acpi-build.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index a42f41f373..85a7313cad 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -1764,15 +1764,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> >
> > #ifdef CONFIG_TPM
> > if (TPM_IS_TIS_ISA(tpm)) {
> > + dev = aml_device("ISA.TPM");
> > if (misc->tpm_version == TPM_VERSION_2_0) {
> > - dev = aml_device("TPM");
> > aml_append(dev, aml_name_decl("_HID",
> > aml_string("MSFT0101")));
> > aml_append(dev,
> > aml_name_decl("_STR",
> > aml_string("TPM 2.0 Device")));
> > } else {
> > - dev = aml_device("ISA.TPM");
> > aml_append(dev, aml_name_decl("_HID",
> > aml_eisaid("PNP0C31")));
> > }
> > --
> > 2.31.1
> >
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-16 20:46 ` Michael S. Tsirkin
2022-05-17 8:13 ` Gerd Hoffmann
2022-05-17 16:01 ` Igor Mammedov
@ 2022-05-19 17:56 ` Igor Mammedov
2 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-19 17:56 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel,
Paolo Bonzini
On Mon, 16 May 2022 16:46:29 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Mon, May 16, 2022 at 11:26:03AM -0400, Igor Mammedov wrote:
> > .. and clean up not longer needed conditionals in DSTD build code
> > pvpanic-isa AML will be fetched and included when ISA bridge will
> > build its own AML code (including attached devices).
> >
> > Expected AML change:
> > the device under separate _SB.PCI0.ISA scope is moved directly
> > under Device(ISA) node.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > include/hw/misc/pvpanic.h | 9 ---------
> > hw/i386/acpi-build.c | 37 ----------------------------------
> > hw/misc/pvpanic-isa.c | 42 +++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 42 insertions(+), 46 deletions(-)
> >
> > diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> > index 7f16cc9b16..e520566ab0 100644
> > --- a/include/hw/misc/pvpanic.h
> > +++ b/include/hw/misc/pvpanic.h
> > @@ -33,13 +33,4 @@ struct PVPanicState {
> >
> > void pvpanic_setup_io(PVPanicState *s, DeviceState *dev, unsigned size);
> >
> > -static inline uint16_t pvpanic_port(void)
> > -{
> > - Object *o = object_resolve_path_type("", TYPE_PVPANIC_ISA_DEVICE, NULL);
> > - if (!o) {
> > - return 0;
> > - }
> > - return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
> > -}
> > -
> > #endif
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 517818cd9f..a42f41f373 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -30,7 +30,6 @@
> > #include "hw/pci/pci.h"
> > #include "hw/core/cpu.h"
> > #include "target/i386/cpu.h"
> > -#include "hw/misc/pvpanic.h"
> > #include "hw/timer/hpet.h"
> > #include "hw/acpi/acpi-defs.h"
> > #include "hw/acpi/acpi.h"
> > @@ -117,7 +116,6 @@ typedef struct AcpiMiscInfo {
> > #endif
> > const unsigned char *dsdt_code;
> > unsigned dsdt_size;
> > - uint16_t pvpanic_port;
> > } AcpiMiscInfo;
> >
> > typedef struct AcpiBuildPciBusHotplugState {
> > @@ -302,7 +300,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info)
> > #ifdef CONFIG_TPM
> > info->tpm_version = tpm_get_version(tpm_find());
> > #endif
> > - info->pvpanic_port = pvpanic_port();
> > }
> >
> > /*
> > @@ -1749,40 +1746,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> > aml_append(dsdt, scope);
> > }
> >
> > - if (misc->pvpanic_port) {
> > - scope = aml_scope("\\_SB.PCI0.ISA");
> > -
> > - dev = aml_device("PEVT");
> > - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > -
> > - crs = aml_resource_template();
> > - aml_append(crs,
> > - aml_io(AML_DECODE16, misc->pvpanic_port, misc->pvpanic_port, 1, 1)
> > - );
> > - aml_append(dev, aml_name_decl("_CRS", crs));
> > -
> > - aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > - aml_int(misc->pvpanic_port), 1));
> > - field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > - aml_append(field, aml_named_field("PEPT", 8));
> > - aml_append(dev, field);
> > -
> > - /* device present, functioning, decoding, shown in UI */
> > - aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > -
> > - method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > - aml_append(method, aml_return(aml_local(0)));
> > - aml_append(dev, method);
> > -
> > - method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > - aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > - aml_append(dev, method);
> > -
> > - aml_append(scope, dev);
> > - aml_append(dsdt, scope);
> > - }
> > -
> > sb_scope = aml_scope("\\_SB");
> > {
> > Object *pci_host;
> > diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
> > index b84d4d458d..ccec50f61b 100644
> > --- a/hw/misc/pvpanic-isa.c
> > +++ b/hw/misc/pvpanic-isa.c
> > @@ -22,6 +22,7 @@
> > #include "qom/object.h"
> > #include "hw/isa/isa.h"
> > #include "standard-headers/linux/pvpanic.h"
> > +#include "hw/acpi/acpi_aml_interface.h"
> >
> > OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
> >
> > @@ -63,6 +64,41 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
> > isa_register_ioport(d, &ps->mr, s->ioport);
> > }
> >
> > +static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
> > +{
> > + Aml *crs, *field, *method;
> > + PVPanicISAState *s = PVPANIC_ISA_DEVICE(adev);
> > + Aml *dev = aml_device("PEVT");
> > +
> > + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> > +
> > + crs = aml_resource_template();
> > + aml_append(crs,
> > + aml_io(AML_DECODE16, s->ioport, s->ioport, 1, 1)
> > + );
> > + aml_append(dev, aml_name_decl("_CRS", crs));
> > +
> > + aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO,
> > + aml_int(s->ioport), 1));
> > + field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
> > + aml_append(field, aml_named_field("PEPT", 8));
> > + aml_append(dev, field);
> > +
> > + /* device present, functioning, decoding, shown in UI */
> > + aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > +
> > + method = aml_method("RDPT", 0, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_name("PEPT"), aml_local(0)));
> > + aml_append(method, aml_return(aml_local(0)));
> > + aml_append(dev, method);
> > +
> > + method = aml_method("WRPT", 1, AML_NOTSERIALIZED);
> > + aml_append(method, aml_store(aml_arg(0), aml_name("PEPT")));
> > + aml_append(dev, method);
> > +
> > + aml_append(scope, dev);
> > +}
> > +
> > static Property pvpanic_isa_properties[] = {
> > DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505),
> > DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events,
> > @@ -73,10 +109,12 @@ static Property pvpanic_isa_properties[] = {
> > static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
> >
> > dc->realize = pvpanic_isa_realizefn;
> > device_class_set_props(dc, pvpanic_isa_properties);
> > set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> > + adevc->build_dev_aml = build_pvpanic_isa_aml;
> > }
> >
> > static const TypeInfo pvpanic_isa_info = {
>
>
> So this really makes the device depend on ACPI.
> What if the device is also built for a platform without ACPI?
> Looks like it will fail to build.
>
> E.g. mips has ISA too. What if one was to add pvpanic there?
it turns out meson somehow figures out dependency and pulls in
CONFIG_ACPI implicitly for mips (well and the same for a bunch
of other targets where acpi doesn't have any stake).
> I am not sure how important this is at the moment, but
> I think the APIs should support this cleanly.
>
> How about an inline function along the lines of:
>
> acpi_set_build_dev_aml(DeviceClass *dc, ....)
current docs/devel/build-system.rst suggests using
stubs for conditional code (it even uses CONFIG_ACPI
as example of such usage)
> the build function itself is static, so compiler will
> remove it if unused.
what you are essentially suggesting is to make target
in-depended file (that is built once. ex: fdc-isa)
into several target dependent builds (due to dependency
on build_aml_foo() symbol). While stubs allow to keep
file independent by substituting build_aml_foo() with
dummy stub. So I'm not sure we would like go that route.
Anyways, I did try to give it a shot and failed,
or maybe I misunderstood your idea completely
resistance I've met:
- CONFIG_ACPI define is poisoned (hacked around it,
pretty sure in wrong way)
- couldn't figure out meson.build rule that depends on several symbols yet
(meson docs suggest it's possble)
(i.e. add/build new fdc-isa-acpi.c file if both CONFIG_FDC_ISA & CONFIG_ACPI defined)
we can use only CONFIG_ACPI and hope that linker will discard object file
as unused if target has ACPI but does not have CONFIG_FDC_ISA (it's still
lost build time on use-less object).
- CONFIG_ACPI is not visible for target in-depended devices
gave up here ...
my ugly attempt is here:
https://gitlab.com/imammedo/qemu/-/commit/9cb126c903a72582ac2f1643664b06414e25e0af
> > @@ -85,6 +123,10 @@ static const TypeInfo pvpanic_isa_info = {
> > .instance_size = sizeof(PVPanicISAState),
> > .instance_init = pvpanic_isa_initfn,
> > .class_init = pvpanic_isa_class_init,
> > + .interfaces = (InterfaceInfo[]) {
> > + { TYPE_ACPI_DEV_AML_IF },
> > + { },
> > + },
> > };
> >
> > static void pvpanic_register_types(void)
> > --
> > 2.31.1
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML
2022-05-18 16:29 ` Michael S. Tsirkin
2022-05-19 11:52 ` Igor Mammedov
@ 2022-05-26 13:57 ` Igor Mammedov
1 sibling, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2022-05-26 13:57 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Gerd Hoffmann, qemu-devel, ani, minyard, stefanb, marcandre.lureau
On Wed, 18 May 2022 12:29:25 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Tue, May 17, 2022 at 10:13:51AM +0200, Gerd Hoffmann wrote:
> > That problem isn't new and we already have a bunch of aml_* stubs
> > because of that. I expect it'll work just fine, at worst we'll
> > have to add a stub or two in case some calls are not covered yet.
>
> Right but adding these stubs is a bother, we keep missing some.
> If possible I'd like the solution to be cleaner than the status quo.
> Is adding a wrapper instead of setting a method directly such
> a big problem really?
>
here is stub based ACPI decoupling for isa devices we currently
have in the tree:
https://gitlab.com/imammedo/qemu/-/commits/decouple_build_aml_v1/
If it looks acceptable to you, I can prep/post it first and
then rebase this series on top to reduce unnecessary churning.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors
2022-05-16 15:25 ` [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors Igor Mammedov
@ 2022-06-07 10:56 ` Michael S. Tsirkin
0 siblings, 0 replies; 56+ messages in thread
From: Michael S. Tsirkin @ 2022-06-07 10:56 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, ani, minyard, stefanb, marcandre.lureau, kraxel
On Mon, May 16, 2022 at 11:25:51AM -0400, Igor Mammedov wrote:
> convert ad-hoc way we use to generate AML for ISA/SMB IPMI devices
> to a generic approach (i.e. make devices provide its own AML blobs
> like it is done with other ISA devices (ex. KBD))
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
could not apply this. rebase and repost?
> ---
> include/hw/acpi/ipmi.h | 9 ++------
> hw/acpi/ipmi-stub.c | 2 +-
> hw/acpi/ipmi.c | 49 +++++++++++++-----------------------------
> hw/i386/acpi-build.c | 17 ++++++++++-----
> hw/ipmi/isa_ipmi_bt.c | 4 ++++
> hw/ipmi/isa_ipmi_kcs.c | 4 ++++
> hw/ipmi/smbus_ipmi.c | 4 ++++
> 7 files changed, 42 insertions(+), 47 deletions(-)
>
> diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h
> index c38483565c..6c8079c97a 100644
> --- a/include/hw/acpi/ipmi.h
> +++ b/include/hw/acpi/ipmi.h
> @@ -9,13 +9,8 @@
> #ifndef HW_ACPI_IPMI_H
> #define HW_ACPI_IPMI_H
>
> -#include "hw/acpi/aml-build.h"
> +#include "hw/acpi/acpi_aml_interface.h"
>
> -/*
> - * Add ACPI IPMI entries for all registered IPMI devices whose parent
> - * bus matches the given bus. The resource is the ACPI resource that
> - * contains the IPMI device, this is required for the I2C CRS.
> - */
> -void build_acpi_ipmi_devices(Aml *table, BusState *bus);
> +void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope);
>
> #endif /* HW_ACPI_IPMI_H */
> diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c
> index f525f71c2d..befaf0a882 100644
> --- a/hw/acpi/ipmi-stub.c
> +++ b/hw/acpi/ipmi-stub.c
> @@ -10,6 +10,6 @@
> #include "qemu/osdep.h"
> #include "hw/acpi/ipmi.h"
>
> -void build_acpi_ipmi_devices(Aml *table, BusState *bus)
> +void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope)
> {
> }
> diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c
> index c30b44fcf5..a20e57d465 100644
> --- a/hw/acpi/ipmi.c
> +++ b/hw/acpi/ipmi.c
> @@ -62,46 +62,27 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info)
> return crs;
> }
>
> -static Aml *aml_ipmi_device(IPMIFwInfo *info)
> +void build_ipmi_dev_aml(AcpiDevAmlIf *adev, Aml *scope)
> {
> Aml *dev;
> - uint16_t version = ((info->ipmi_spec_major_revision << 8)
> - | (info->ipmi_spec_minor_revision << 4));
> + IPMIFwInfo info = {};
> + IPMIInterface *ii = IPMI_INTERFACE(adev);
> + IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
> + uint16_t version;
>
> - assert(info->ipmi_spec_minor_revision <= 15);
> + iic->get_fwinfo(ii, &info);
> + assert(info.ipmi_spec_minor_revision <= 15);
> + version = ((info.ipmi_spec_major_revision << 8)
> + | (info.ipmi_spec_minor_revision << 4));
>
> - dev = aml_device("MI%d", info->uuid);
> + dev = aml_device("MI%d", info.uuid);
> aml_append(dev, aml_name_decl("_HID", aml_eisaid("IPI0001")));
> aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
> - info->interface_name)));
> - aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
> - aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info)));
> - aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
> + info.interface_name)));
> + aml_append(dev, aml_name_decl("_UID", aml_int(info.uuid)));
> + aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(&info)));
> + aml_append(dev, aml_name_decl("_IFT", aml_int(info.interface_type)));
> aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
>
> - return dev;
> -}
> -
> -void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
> -{
> -
> - BusChild *kid;
> -
> - QTAILQ_FOREACH(kid, &bus->children, sibling) {
> - IPMIInterface *ii;
> - IPMIInterfaceClass *iic;
> - IPMIFwInfo info;
> - Object *obj = object_dynamic_cast(OBJECT(kid->child),
> - TYPE_IPMI_INTERFACE);
> -
> - if (!obj) {
> - continue;
> - }
> -
> - ii = IPMI_INTERFACE(obj);
> - iic = IPMI_INTERFACE_GET_CLASS(obj);
> - memset(&info, 0, sizeof(info));
> - iic->get_fwinfo(ii, &info);
> - aml_append(scope, aml_ipmi_device(&info));
> - }
> + aml_append(scope, dev);
> }
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 6dce8354cc..ca5cab87ba 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -38,6 +38,7 @@
> #include "hw/nvram/fw_cfg.h"
> #include "hw/acpi/bios-linker-loader.h"
> #include "hw/isa/isa.h"
> +#include "hw/acpi/acpi_aml_interface.h"
> #include "hw/input/i8042.h"
> #include "hw/acpi/memory_hotplug.h"
> #include "sysemu/tpm.h"
> @@ -71,7 +72,6 @@
> #include "hw/i386/intel_iommu.h"
> #include "hw/virtio/virtio-iommu.h"
>
> -#include "hw/acpi/ipmi.h"
> #include "hw/acpi/hmat.h"
> #include "hw/acpi/viot.h"
>
> @@ -870,7 +870,6 @@ static void build_isa_devices_aml(Aml *table)
> assert(obj && !ambiguous);
>
> scope = aml_scope("_SB.PCI0.ISA");
> - build_acpi_ipmi_devices(scope, BUS(obj));
> isa_build_aml(ISA_BUS(obj), scope);
>
> aml_append(table, scope);
> @@ -1397,13 +1396,21 @@ static Aml *build_q35_osc_method(bool enable_native_pcie_hotplug)
> return method;
> }
>
> -static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
> +static void build_smb0(Aml *table, int devnr, int func)
> {
> Aml *scope = aml_scope("_SB.PCI0");
> Aml *dev = aml_device("SMB0");
> + bool ambiguous;
> + Object *obj;
> + /*
> + * temporarily fish out device hosting SMBUS, build_smb0 will be gone once
> + * PCI enumeration will be switched to call_dev_aml_func()
> + */
> + obj = object_resolve_path_type("", TYPE_ICH9_SMB_DEVICE, &ambiguous);
> + assert(obj && !ambiguous);
>
> aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
> - build_acpi_ipmi_devices(dev, BUS(smbus));
> + call_dev_aml_func(DEVICE(obj), dev);
> aml_append(scope, dev);
> aml_append(table, scope);
> }
> @@ -1504,7 +1511,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> }
> build_q35_pci0_int(dsdt);
> if (pcms->smbus && !pcmc->do_not_add_smb_acpi) {
> - build_smb0(dsdt, pcms->smbus, ICH9_SMB_DEV, ICH9_SMB_FUNC);
> + build_smb0(dsdt, ICH9_SMB_DEV, ICH9_SMB_FUNC);
> }
> }
>
> diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
> index 88aa734e9e..a83e7243d6 100644
> --- a/hw/ipmi/isa_ipmi_bt.c
> +++ b/hw/ipmi/isa_ipmi_bt.c
> @@ -31,6 +31,7 @@
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
> #include "qom/object.h"
> +#include "hw/acpi/ipmi.h"
>
> #define TYPE_ISA_IPMI_BT "isa-ipmi-bt"
> OBJECT_DECLARE_SIMPLE_TYPE(ISAIPMIBTDevice, ISA_IPMI_BT)
> @@ -144,6 +145,7 @@ static void isa_ipmi_bt_class_init(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
> + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
>
> dc->realize = isa_ipmi_bt_realize;
> device_class_set_props(dc, ipmi_isa_properties);
> @@ -151,6 +153,7 @@ static void isa_ipmi_bt_class_init(ObjectClass *oc, void *data)
> iic->get_backend_data = isa_ipmi_bt_get_backend_data;
> ipmi_bt_class_init(iic);
> iic->get_fwinfo = isa_ipmi_bt_get_fwinfo;
> + adevc->build_dev_aml = build_ipmi_dev_aml;
> }
>
> static const TypeInfo isa_ipmi_bt_info = {
> @@ -161,6 +164,7 @@ static const TypeInfo isa_ipmi_bt_info = {
> .class_init = isa_ipmi_bt_class_init,
> .interfaces = (InterfaceInfo[]) {
> { TYPE_IPMI_INTERFACE },
> + { TYPE_ACPI_DEV_AML_IF },
> { }
> }
> };
> diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
> index afabb95ebe..b2ed70b9da 100644
> --- a/hw/ipmi/isa_ipmi_kcs.c
> +++ b/hw/ipmi/isa_ipmi_kcs.c
> @@ -31,6 +31,7 @@
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
> #include "qom/object.h"
> +#include "hw/acpi/ipmi.h"
>
> #define TYPE_ISA_IPMI_KCS "isa-ipmi-kcs"
> OBJECT_DECLARE_SIMPLE_TYPE(ISAIPMIKCSDevice, ISA_IPMI_KCS)
> @@ -151,6 +152,7 @@ static void isa_ipmi_kcs_class_init(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
> + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
>
> dc->realize = ipmi_isa_realize;
> device_class_set_props(dc, ipmi_isa_properties);
> @@ -158,6 +160,7 @@ static void isa_ipmi_kcs_class_init(ObjectClass *oc, void *data)
> iic->get_backend_data = isa_ipmi_kcs_get_backend_data;
> ipmi_kcs_class_init(iic);
> iic->get_fwinfo = isa_ipmi_kcs_get_fwinfo;
> + adevc->build_dev_aml = build_ipmi_dev_aml;
> }
>
> static const TypeInfo isa_ipmi_kcs_info = {
> @@ -168,6 +171,7 @@ static const TypeInfo isa_ipmi_kcs_info = {
> .class_init = isa_ipmi_kcs_class_init,
> .interfaces = (InterfaceInfo[]) {
> { TYPE_IPMI_INTERFACE },
> + { TYPE_ACPI_DEV_AML_IF },
> { }
> }
> };
> diff --git a/hw/ipmi/smbus_ipmi.c b/hw/ipmi/smbus_ipmi.c
> index 1fdf0a66b6..9ef9112dd5 100644
> --- a/hw/ipmi/smbus_ipmi.c
> +++ b/hw/ipmi/smbus_ipmi.c
> @@ -28,6 +28,7 @@
> #include "qemu/error-report.h"
> #include "hw/ipmi/ipmi.h"
> #include "qom/object.h"
> +#include "hw/acpi/ipmi.h"
>
> #define TYPE_SMBUS_IPMI "smbus-ipmi"
> OBJECT_DECLARE_SIMPLE_TYPE(SMBusIPMIDevice, SMBUS_IPMI)
> @@ -353,6 +354,7 @@ static void smbus_ipmi_class_init(ObjectClass *oc, void *data)
> DeviceClass *dc = DEVICE_CLASS(oc);
> IPMIInterfaceClass *iic = IPMI_INTERFACE_CLASS(oc);
> SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(oc);
> + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(oc);
>
> sc->receive_byte = ipmi_receive_byte;
> sc->write_data = ipmi_write_data;
> @@ -363,6 +365,7 @@ static void smbus_ipmi_class_init(ObjectClass *oc, void *data)
> iic->handle_if_event = smbus_ipmi_handle_event;
> iic->set_irq_enable = smbus_ipmi_set_irq_enable;
> iic->get_fwinfo = smbus_ipmi_get_fwinfo;
> + adevc->build_dev_aml = build_ipmi_dev_aml;
> }
>
> static const TypeInfo smbus_ipmi_info = {
> @@ -373,6 +376,7 @@ static const TypeInfo smbus_ipmi_info = {
> .class_init = smbus_ipmi_class_init,
> .interfaces = (InterfaceInfo[]) {
> { TYPE_IPMI_INTERFACE },
> + { TYPE_ACPI_DEV_AML_IF },
> { }
> }
> };
> --
> 2.31.1
^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2022-06-07 11:53 UTC | newest]
Thread overview: 56+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-16 15:25 [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Igor Mammedov
2022-05-16 15:25 ` [PATCH 01/35] acpi: add interface to build device specific AML Igor Mammedov
2022-05-18 10:00 ` Ani Sinha
2022-05-19 12:54 ` Igor Mammedov
2022-05-16 15:25 ` [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface Igor Mammedov
2022-05-18 10:13 ` Ani Sinha
2022-05-16 15:25 ` [PATCH 03/35] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml Igor Mammedov
2022-05-16 15:25 ` [PATCH 04/35] acpi: parallel port: " Igor Mammedov
2022-05-16 15:25 ` [PATCH 05/35] acpi: serial-is: " Igor Mammedov
2022-05-16 15:25 ` [PATCH 06/35] acpi: mc146818rtc: " Igor Mammedov
2022-05-16 15:25 ` [PATCH 07/35] acpi: pckbd: " Igor Mammedov
2022-05-16 15:25 ` [PATCH 08/35] isa-bus: drop no longer used ISADeviceClass::build_aml Igor Mammedov
2022-05-16 15:25 ` [PATCH 09/35] tests: acpi: add and whitelist DSDT.ipmismbus expected blob Igor Mammedov
2022-05-16 15:25 ` [PATCH 10/35] tests: acpi: q35: add test for smbus-ipmi device Igor Mammedov
2022-05-16 15:25 ` [PATCH 11/35] tests: acpi: update expected blob DSDT.ipmismbus Igor Mammedov
2022-05-16 15:25 ` [PATCH 12/35] tests: acpi: whitelist DSDT.ipmismbus expected blob Igor Mammedov
2022-05-16 15:25 ` [PATCH 13/35] ipmi: acpi: use relative path to resource source Igor Mammedov
2022-05-16 15:25 ` [PATCH 14/35] tests: acpi: update expected DSDT.ipmismbus blob Igor Mammedov
2022-05-16 15:25 ` [PATCH 15/35] acpi: ich9-smb: add support for AcpiDevAmlIf interface Igor Mammedov
2022-05-16 15:25 ` [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors Igor Mammedov
2022-06-07 10:56 ` Michael S. Tsirkin
2022-05-16 15:25 ` [PATCH 17/35] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi Igor Mammedov
2022-05-16 15:25 ` [PATCH 18/35] tests: acpi: white-list to be re-factored pc/q35 DSDT Igor Mammedov
2022-05-16 15:25 ` [PATCH 19/35] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors Igor Mammedov
2022-05-16 15:25 ` [PATCH 20/35] acpi: q35: " Igor Mammedov
2022-05-16 15:25 ` [PATCH 21/35] tests: acpi: update expected blobs Igor Mammedov
2022-05-16 15:25 ` [PATCH 22/35] tests: acpi: add and white-list DSDT.applesmc expected blob Igor Mammedov
2022-05-16 15:25 ` [PATCH 23/35] tests: acpi: add applesmc testcase Igor Mammedov
2022-05-16 15:25 ` [PATCH 24/35] acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
2022-05-16 15:26 ` [PATCH 25/35] tests: acpi: update expected blobs Igor Mammedov
2022-05-16 15:26 ` [PATCH 26/35] tests: acpi: white-lists expected DSDT.pvpanic-isa blob Igor Mammedov
2022-05-16 15:26 ` [PATCH 27/35] tests: acpi: add pvpanic-isa: testcase Igor Mammedov
2022-05-16 15:26 ` [PATCH 28/35] acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
2022-05-16 20:46 ` Michael S. Tsirkin
2022-05-17 8:13 ` Gerd Hoffmann
2022-05-18 16:29 ` Michael S. Tsirkin
2022-05-19 11:52 ` Igor Mammedov
2022-05-26 13:57 ` Igor Mammedov
2022-05-17 16:01 ` Igor Mammedov
2022-05-19 17:56 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 29/35] tests: acpi: update expected DSDT.pvpanic-isa blob Igor Mammedov
2022-05-16 15:26 ` [PATCH 30/35] tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobs Igor Mammedov
2022-05-18 10:20 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 31/35] acpi: pc/q35: tpm-tis: fix TPM device scope Igor Mammedov
2022-05-18 9:03 ` Ani Sinha
2022-05-19 12:55 ` Igor Mammedov
2022-05-16 15:26 ` [PATCH 32/35] acpi: pc/q35: remove not needed 'if' condition on pci bus Igor Mammedov
2022-05-18 8:43 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 33/35] acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AML Igor Mammedov
2022-05-18 10:45 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 34/35] tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobs Igor Mammedov
2022-05-18 10:49 ` Ani Sinha
2022-05-16 15:26 ` [PATCH 35/35] x86: acpi-build: do not include hw/isa/isa.h directly Igor Mammedov
2022-05-16 20:47 ` [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation Michael S. Tsirkin
2022-05-17 16:09 ` Igor Mammedov
2022-05-17 8:17 ` Gerd Hoffmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.