qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	peter.maydell@linaro.org, imammedo@redhat.com,
	gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com,
	shannon.zhaosl@gmail.com
Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com,
	philmd@linaro.org, alex.bennee@linaro.org
Subject: [PATCH v3 10/29] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change
Date: Mon, 16 Jun 2025 11:46:39 +0200	[thread overview]
Message-ID: <20250616094903.885753-11-eric.auger@redhat.com> (raw)
In-Reply-To: <20250616094903.885753-1-eric.auger@redhat.com>

Update the reference DSDT blobs after GPEX _OSC change. The _OSC change
affects the aarch64 'virt' and the x86 'microvm' machines.

DSDT diff is the same for all the machines/tests:
@@ -1798,6 +1798,8 @@
                     0x0000008000000000, // Length
                     ,, , AddressRangeMemory, TypeStatic)
             })
+            Name (SUPP, Zero)
+            Name (CTRL, Zero)
             Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities
             {
                 CreateDWordField (Arg3, Zero, CDW1)
@@ -1805,26 +1807,27 @@
                 {
                     CreateDWordField (Arg3, 0x04, CDW2)
                     CreateDWordField (Arg3, 0x08, CDW3)
-                    Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
-                    Local0 &= 0x1F
+                    SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */
+                    CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */
+                    CTRL &= 0x1F
                     If ((Arg1 != One))
                     {
                         CDW1 |= 0x08
                     }

-                    If ((CDW3 != Local0))
+                    If ((CDW3 != CTRL))
                     {
                         CDW1 |= 0x10
                     }

-                    CDW3 = Local0
+                    CDW3 = CTRL /* \_SB_.PCI0.CTRL */
+                    Return (Arg3)
                 }
                 Else
                 {
                     CDW1 |= 0x04
+                    Return (Arg3)
                 }
-
-                Return (Arg3)
             }

             Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
 tests/qtest/bios-tables-test-allowed-diff.h   |   6 ------
 tests/data/acpi/aarch64/virt/DSDT             | Bin 5196 -> 5158 bytes
 .../data/acpi/aarch64/virt/DSDT.acpihmatvirt  | Bin 5282 -> 5244 bytes
 tests/data/acpi/aarch64/virt/DSDT.memhp       | Bin 6557 -> 6519 bytes
 tests/data/acpi/aarch64/virt/DSDT.pxb         | Bin 7679 -> 7603 bytes
 tests/data/acpi/aarch64/virt/DSDT.topology    | Bin 5398 -> 5360 bytes
 tests/data/acpi/x86/microvm/DSDT.pcie         | Bin 3023 -> 2985 bytes
 7 files changed, 6 deletions(-)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 75f057767e..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,7 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/aarch64/virt/DSDT",
-"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt",
-"tests/data/acpi/aarch64/virt/DSDT.memhp",
-"tests/data/acpi/aarch64/virt/DSDT.pxb",
-"tests/data/acpi/aarch64/virt/DSDT.topology",
-"tests/data/acpi/x86/microvm/DSDT.pcie",
diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT
index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..acab6e65febbc210158d4c39be0680bbb90250f5 100644
GIT binary patch
delta 114
zcmX@3u}p)@CD<iIO@x7g>C8kfX{JVpjp}Y(OkR^V=X2?C2#NTx$NL96vvg%MIJ<-!
zF7RWWyjw`i#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;W@BMV
FMgSUfAKd@|

delta 152
zcmZ3caYlp7CD<jzM}&caNqQoeG*i3NMs+tXCWon;^SSgm<T!#u0|FR0oI`?q7)0DS
z<Nbr3S-P?roL#~V7kIEwUN5BOX9QAG;Or7^3{q7MBDmy1<N|?7lQS7>L29`;z&gYx
bO@^t12n&FO3qXoN;!Cm@@@?i7mSh9~5Tq&5

diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt
index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..54c27e7d95b4956ed1b5dee0d299ccb08dc2a73e 100644
GIT binary patch
delta 114
zcmZ3a`A37xCD<jTMudTZsdFNiG*i3lM)f&dOkR^VALY{H5EAiWkM|FDX6ediaCQkd
zT;Rt#Sx{KZ#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=1yTr
FMgUJNAb|h?

delta 152
zcmeyPu}G84CD<iokq83=(~XH-(oDVX8`bA<F*!`#e3VO%LyjXjG$4S1!#O0#he5=R
zGu}VgnWZb6!PzC;aDfN=WL9A<KO>Nm0%w<SW00z95Wyu6A{Piunw-g43sTF)0oEZl
bX);V5L|6bMTmVuG5?_+NkZ*Icup}b@<J&8B

diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp
index 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..4330bc97cba0950191c45ac833533db7a190db81 100644
GIT binary patch
delta 114
zcmbPh{N0GlCD<jTT#|u->Fq==X{M&B8`a&on7k%!&gatO5EAiWkM|FDX6ediaCQkd
zT;Rt#dAE?3iE%=80+)Qk0)a`BGZ||^GF%*BdErTuon69>6Ch#&AhCi3kjO%w&Bnr6
FYyg6XAvXX3

delta 152
zcmexvG}oBRCD<iot|S8klg&gfX{L_p8`a&om>i~V&gatOkmCpr4G3W1a1IIbVGwcS
zjQ0<AX6ediaCQkdT;RbzdA*R9pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H&
bG#RE2A}jzBE&wS8i7&}s$hVnSIExJcpiV0*

diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb b/tests/data/acpi/aarch64/virt/DSDT.pxb
index c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..7fdbc03e2bf9fb7d35704779253de36e362f0bf9 100644
GIT binary patch
delta 207
zcmexwz1f<}CD<iovn&Gx)9r~|(oB6fHmbXEG5NM`&ga^|E+pc^9`7IQ%+i(3;Or7^
zxWJEfa-NKqiE%=80+)Qk0)a`BGZ||^GF%*BdErTuon69>6Ch#&AhCi3kjO%w$<JhL
aH-8e+V`TE0v{^|+kAs?qZ+<2t$p`>t?mg51

delta 282
zcmdmN{ok6)CD<k8zbpd-Q^!OuX{N5b8`a&on4CK{=W}gfm*WTy4G3W1a1IIbVGwcS
zjQ0<AX6ediaCQkdT;Rbz*-%K!&j_TXz}Y3-7^JEiL~zN2$OQtECTB9%g4A+xfOUvX
unhaA15f%Um7l0Il#Fu0*<lEdYl+DQGFm>}EVLcA|TR*v9$aeB|nL7Yd7E^Zs

diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology
index 029d03eecc4efddc001e5377e85ac8e831294362..969b4f6560d3ae39f5b7e0064b7122905476fce8 100644
GIT binary patch
delta 114
zcmbQH^+A)%CD<k8g9rly)24}B(oEex8`TB4nY<=#w&d315EAiWkM|FDX6ediaCQkd
zT;Rt#xm8%p#5kckflEGNfxx86nT)j{87>a6yzr#S&Mx7`2@o*>kXS(iNMs?;=D)&{
Fi~vUbAmso6

delta 152
zcmeyMIZcbpCD<iIOq79viGL!OG*hGhMs)#hCWon;ExGkL<T!#u0|FR0oI`?q7)0DS
z<Nbr3S-P?roL#~V7kIEwt`yetGXg0oaCQkd2C1qB5nS>ha)H34$(f9`Ahlc^U>#zU
bCd1T0gatst1t7&B@g>;{`8Hn{mSh9~yBaCk

diff --git a/tests/data/acpi/x86/microvm/DSDT.pcie b/tests/data/acpi/x86/microvm/DSDT.pcie
index 8eacd21d6ecdf9a3cd3e4f03cf1b40748dcbf53e..ba258f454dc0e59ef2fd67e0ce37e270e7c122e8 100644
GIT binary patch
delta 113
zcmX>vzEYgaCD<ioB{u^D)Axy7(oD|VH>#&HG5Ji`+{YxqAtd6%9`7IQ%+i(3;Or7^
zxWJEf@*XZN6XS&H1TMLR1p<>MXEN4;WVkrM^1_oQJG+D%CqTpmKw<?6Ad!VUlTEm1
F0{}^9AprmY

delta 151
zcmZ1}eqNl*CD<k8JU0Ualj}q-X(rE|8`V>pn4BhW?qd?*kmCpr4G3W1a1IIbVGwcS
zjQ0<AX6ediaCQkdT;Rbzc>|Z0pAkq&fwN1vF-TQ4h~Sb3kqZPSP0nPj1*zrY0P7H&
aG#RE2A}jzBE&wS8i7&}s$Tyjfdo}=5#47aw

-- 
2.49.0



  parent reply	other threads:[~2025-06-16  9:59 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-16  9:46 [PATCH v3 00/29] ACPI PCI Hotplug support on ARM Eric Auger
2025-06-16  9:46 ` [PATCH v3 01/29] hw/i386/acpi-build: Make aml_pci_device_dsm() static Eric Auger
2025-06-16  9:46 ` [PATCH v3 02/29] hw/acpi/ged: Add a acpi-pci-hotplug-with-bridge-support property Eric Auger
2025-06-20  8:53   ` Jonathan Cameron via
2025-06-20 11:09     ` Igor Mammedov
2025-06-20 11:27       ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 03/29] hw/acpi: Rename and move build_x86_acpi_pci_hotplug to pcihp Eric Auger
2025-06-16  9:46 ` [PATCH v3 04/29] hw/pci-host/gpex-acpi: Add native_pci_hotplug arg to acpi_dsdt_add_pci_osc Eric Auger
2025-06-20  8:45   ` Jonathan Cameron via
2025-06-16  9:46 ` [PATCH v3 05/29] tests/qtest/bios-tables-test: Prepare for changes in the DSDT table Eric Auger
2025-06-20  8:49   ` Jonathan Cameron via
2025-06-20 11:29     ` Eric Auger
2025-06-20 11:11   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 06/29] hw/pci-host/gpex-acpi: Split host bridge OSC and DSM generation Eric Auger
2025-06-20  8:50   ` Jonathan Cameron via
2025-06-20 11:48   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 07/29] hw/pci-host/gpex-acpi: retrieve and use GED acpi_pcihp setting Eric Auger
2025-06-20  8:52   ` Jonathan Cameron via
2025-06-20 12:07   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 08/29] hw/i386/acpi-build: Turn build_q35_osc_method into a generic method Eric Auger
2025-06-20  8:54   ` Jonathan Cameron via
2025-06-20 12:11   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 09/29] hw/pci-host/gpex-acpi: Use build_pci_host_bridge_osc_method Eric Auger
2025-06-20  8:57   ` Jonathan Cameron via
2025-06-20 12:16   ` Igor Mammedov
2025-06-16  9:46 ` Eric Auger [this message]
2025-06-20  8:59   ` [PATCH v3 10/29] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change Jonathan Cameron via
2025-06-20 11:33     ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 11/29] hw/i386/acpi-build: Introduce build_append_pcihp_resources() helper Eric Auger
2025-06-16  9:46 ` [PATCH v3 12/29] hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug Eric Auger
2025-06-16  9:46 ` [PATCH v3 13/29] hw/i386/acpi-build: Move build_append_notification_callback to pcihp Eric Auger
2025-06-16  9:46 ` [PATCH v3 14/29] hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots " Eric Auger
2025-06-16  9:46 ` [PATCH v3 15/29] hw/i386/acpi-build: Use AcpiPciHpState::root in acpi_set_pci_info Eric Auger
2025-06-20  9:05   ` Jonathan Cameron via
2025-06-20 12:20   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 16/29] hw/i386/acpi-build: Move aml_pci_edsm to a generic place Eric Auger
2025-06-20  9:19   ` Jonathan Cameron via
2025-06-20  9:28     ` Jonathan Cameron via
2025-06-20 12:27     ` Igor Mammedov
2025-06-24 16:05       ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 17/29] hw/arm/virt-acpi-build: Modify the DSDT ACPI table to enable ACPI PCI hotplug Eric Auger
2025-06-20  9:35   ` Jonathan Cameron via
2025-06-20 12:38     ` Igor Mammedov
2025-06-20 16:13       ` Jonathan Cameron via
2025-06-25 15:23         ` Eric Auger
2025-06-26  8:44           ` Eric Auger
2025-06-24 15:51       ` Eric Auger
2025-06-20 12:33   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 18/29] hw/acpi/ged: Add a bus link property Eric Auger
2025-06-20  9:37   ` Jonathan Cameron via
2025-06-20 12:45   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 19/29] hw/arm/virt: Pass the bus on the ged creation Eric Auger
2025-06-20  9:38   ` Jonathan Cameron via
2025-06-24 15:56     ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events Eric Auger
2025-06-20  9:44   ` Jonathan Cameron via
2025-06-25 14:31     ` Eric Auger
2025-06-20 12:57   ` Igor Mammedov
2025-06-25 14:21     ` Eric Auger
2025-06-20 13:01   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 21/29] hw/acpi/ged: Call pcihp plug callbacks in hotplug handler implementation Eric Auger
2025-06-20 10:09   ` Jonathan Cameron via
2025-06-20 12:53   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 22/29] hw/acpi/ged: Support migration of AcpiPciHpState Eric Auger
2025-06-16  9:46 ` [PATCH v3 23/29] hw/core/sysbus: Introduce sysbus_mmio_map_name() helper Eric Auger
2025-06-20 10:13   ` Jonathan Cameron via
2025-06-16  9:46 ` [PATCH v3 24/29] hw/arm/virt: Use a SysBusDevice variable in create_acpi_ged() Eric Auger
2025-06-20 10:18   ` Jonathan Cameron via
2025-06-16  9:46 ` [PATCH v3 25/29] hw/arm/virt: Let virt support pci hotplug/unplug GED event Eric Auger
2025-06-20 10:17   ` Jonathan Cameron via
2025-06-25 13:36     ` Eric Auger
2025-06-20 13:06   ` Igor Mammedov
2025-06-25 13:37     ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 26/29] hw/arm/virt: Plug pcihp hotplug/hotunplug callbacks Eric Auger
2025-06-20 10:28   ` Jonathan Cameron via
2025-06-20 13:10   ` Igor Mammedov
2025-06-26  8:16     ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 27/29] tests/qtest/bios-tables-test: Prepare for addition of acpi pci hp tests Eric Auger
2025-06-20 10:31   ` Jonathan Cameron via
2025-06-20 13:11     ` Igor Mammedov
2025-06-23 15:07     ` Eric Auger
2025-06-16  9:46 ` [PATCH v3 28/29] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test Eric Auger
2025-06-20 10:40   ` Jonathan Cameron via
2025-06-20 13:22     ` Igor Mammedov
2025-06-26 10:04       ` Eric Auger
2025-06-20 13:18   ` Igor Mammedov
2025-06-16  9:46 ` [PATCH v3 29/29] qtest/bios-tables-test: Create DSDT 'acpipcihp" variant blob Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250616094903.885753-11-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=alex.bennee@linaro.org \
    --cc=anisinha@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=gustavo.romero@linaro.org \
    --cc=imammedo@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=shannon.zhaosl@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).