Skip to content

pc/q35: refactor ISA and SMBUS AML generation

Igor Mammedov qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest35 patches 2 repliesIn review
  2. v135 patches 20 repliesSuperseded

Changes in v2 from the cover letter

* add tis 2.0 clarification to commit message (Ani Sinha)
* rebase on top of pci tree
* pick up acks

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/35acpi: add interface to build device specific AMLhw/acpi/acpi_interface.c hw/acpi/meson.build include/hw/acpi/acpi_aml_interface.h+49 -10 replies
2/35acpi: make isa_build_aml() support AcpiDevAmlIf interfacehw/isa/isa-bus.c+5 -00 replies
3/35acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_amlhw/block/fdc-isa.c hw/i386/acpi-build.c+10 -70 replies
4/35acpi: parallel port: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_amlhw/char/parallel.c+9 -50 replies
5/35acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_amlhw/char/serial-isa.c+9 -50 replies
6/35acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_amlhw/rtc/mc146818rtc.c+9 -50 replies
7/35acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_amlhw/input/pckbd.c+9 -50 replies
8/35isa-bus: drop no longer used ISADeviceClass::build_amlhw/isa/isa-bus.c include/hw/isa/isa.h+1 -120 replies
9/35tests: acpi: add and whitelist DSDT.ipmismbus expected blobtests/data/acpi/q35/DSDT.ipmismbus tests/qtest/bios-tables-test-allowed-diff.h+1 -00 replies
10/35tests: acpi: q35: add test for smbus-ipmi devicetests/qtest/bios-tables-test.c+16 -00 replies
11/35tests: acpi: update expected blob DSDT.ipmismbustests/data/acpi/q35/DSDT.ipmismbus tests/qtest/bios-tables-test-allowed-diff.h+0 -10 replies
12/35tests: acpi: whitelist DSDT.ipmismbus expected blobtests/qtest/bios-tables-test-allowed-diff.h+1 -00 replies
13/35ipmi: acpi: use relative path to resource sourcehw/acpi/ipmi-stub.c hw/acpi/ipmi.c hw/i386/acpi-build.c +1 more+10 -100 replies
14/35tests: acpi: update expected DSDT.ipmismbus blobtests/data/acpi/q35/DSDT.ipmismbus tests/qtest/bios-tables-test-allowed-diff.h+0 -10 replies
15/35acpi: ich9-smb: add support for AcpiDevAmlIf interfacehw/i2c/smbus_ich9.c+15 -00 replies
16/35acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptorshw/acpi/ipmi-stub.c hw/acpi/ipmi.c hw/i386/acpi-build.c +4 more+42 -470 replies
17/35q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpihw/i386/acpi-build.c hw/i386/pc_piix.c hw/i386/pc_q35.c +1 more+1 -40 replies
18/35tests: acpi: white-list to be re-factored pc/q35 DSDTtests/qtest/bios-tables-test-allowed-diff.h+31 -01 reply
19/35acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptorshw/i386/acpi-build.c hw/isa/piix3.c+28 -50 replies
20/35acpi: q35: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptorshw/i386/acpi-build.c hw/isa/lpc_ich9.c+30 -190 replies
21/35tests: acpi: update expected blobstests/data/acpi/pc/DSDT tests/data/acpi/pc/DSDT.acpierst tests/data/acpi/pc/DSDT.acpihmat +29 more+0 -311 reply
22/35tests: acpi: add and white-list DSDT.applesmc expected blobtests/data/acpi/q35/DSDT.applesmc tests/qtest/bios-tables-test-allowed-diff.h+1 -00 replies
23/35tests: acpi: add applesmc testcasetests/qtest/bios-tables-test.c+12 -00 replies
24/35acpi: applesmc: use AcpiDevAmlIfClass:build_dev_aml to provide device's AMLhw/i386/acpi-build.c hw/misc/applesmc.c include/hw/isa/isa.h+29 -360 replies
25/35tests: acpi: update expected blobstests/data/acpi/q35/DSDT.applesmc tests/qtest/bios-tables-test-allowed-diff.h+0 -10 replies
26/35tests: acpi: white-lists expected DSDT.pvpanic-isa blobtests/data/acpi/q35/DSDT.pvpanic-isa tests/qtest/bios-tables-test-allowed-diff.h+1 -00 replies
27/35tests: acpi: add pvpanic-isa: testcasetests/qtest/bios-tables-test.c+12 -00 replies
28/35acpi: pvpanic-isa: use AcpiDevAmlIfClass:build_dev_aml to provide device's AMLhw/i386/acpi-build.c hw/misc/pvpanic-isa.c include/hw/misc/pvpanic.h+42 -460 replies
29/35tests: acpi: update expected DSDT.pvpanic-isa blobtests/data/acpi/q35/DSDT.pvpanic-isa tests/qtest/bios-tables-test-allowed-diff.h+0 -10 replies
30/35tests: acpi: white-list DSDT.tis.tpm2/DSDT.tis.tpm12 expected blobstests/qtest/bios-tables-test-allowed-diff.h+2 -00 replies
31/35acpi: pc/q35: tpm-tis: fix TPM device scopehw/i386/acpi-build.c+1 -20 replies
32/35acpi: pc/q35: remove not needed 'if' condition on pci bushw/i386/acpi-build.c+2 -80 replies
33/35acpi: tpm-tis: use AcpiDevAmlIfClass:build_dev_aml to provide device's AMLhw/i386/acpi-build.c hw/tpm/tpm_tis_isa.c+32 -340 replies
34/35tests: acpi: update expected DSDT.tis.tpm2/DSDT.tis.tpm12 blobstests/data/acpi/q35/DSDT.tis.tpm12 tests/data/acpi/q35/DSDT.tis.tpm2 tests/qtest/bios-tables-test-allowed-diff.h+0 -20 replies
35/35x86: acpi-build: do not include hw/isa/isa.h directlyhw/i386/acpi-build.c+0 -10 replies

Reviews trailers per patch

25 of 35 patches have a Reviewed-by or Acked-by.

PatchGerd HoffmannAni Sinha
1/35A-b
2/35A-b R-b
3/35A-b
4/35A-b
5/35A-b
6/35A-b
7/35A-b
8/35A-b
9/35
10/35A-b
11/35
12/35
13/35A-b
14/35
15/35A-b
16/35A-b
17/35A-b
18/35
19/35A-b
20/35A-b
21/35
22/35
23/35A-b
24/35A-b
25/35
26/35
27/35A-b
28/35A-b
29/35
30/35A-b
31/35A-b R-b
32/35A-b R-b
33/35A-b R-b
34/35A-b
35/35A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/35] pc/q35: refactor ISA and SMBUS AML generation

Changelog:
since v1:
* add tis 2.0 clarification to commit message (Ani Sinha)
* rebase on top of pci tree
* pick up acks

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
Signature · 1 line
2.31.1