qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, ani@anisinha.ca, berrange@redhat.com
Subject: [PATCH 09/33] tests: acpi: update expected blobs
Date: Fri, 24 Feb 2023 16:37:48 +0100	[thread overview]
Message-ID: <20230224153812.4176226-10-imammedo@redhat.com> (raw)
In-Reply-To: <20230224153812.4176226-1-imammedo@redhat.com>

BNUM numbering changes across DSDT due to addition of new bridges.

Fixed missing PCI tree brunch (q35/DSDT.multi-bridge case):

  //  -device pcie-root-port,id=rpnohp,chassis=8,addr=0xA.0,hotplug=off
  +            Device (S50)
  +            {
  +                Name (_ADR, 0x000A0000)  // _ADR: Address
  //  -device pcie-root-port,id=rp3,chassis=9,bus=rpnohp
  +                Device (S00)
  +                {
  +                    Name (_ADR, Zero)  // _ADR: Address
  +                    Name (BSEL, Zero)
  +                    Device (S00)
  +                    {
  +                        Name (_ADR, Zero)  // _ADR: Address
  +                        Name (ASUN, Zero)
  +                        Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
  +                        {
  +                            Local0 = Package (0x02)
  +                                {
  +                                    BSEL,
  +                                    ASUN
  +                                }
  +                            Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
  +                        }
  +
  +                        Name (_SUN, Zero)  // _SUN: Slot User Number
  +                        Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
  +                        {
  +                            PCEJ (BSEL, _SUN)
  +                        }
  +                    }
  +
  +                    Method (DVNT, 2, NotSerialized)
  +                    {
  +                        If ((Arg0 & One))
  +                        {
  +                            Notify (S00, Arg1)
  +                        }
  +                    }
  +                }
  +            }

Fixed hotplug notification for leaf root port (hotplug=on) attached to
intermediate root port (hotplug=off) (q35/DSDT.multi-bridge case)

  //  -device pcie-root-port,id=rpnohp,chassis=8,addr=0xA.0,hotplug=off
  +        Scope (S50)
  +        {
  //  -device pcie-root-port,id=rp3,chassis=9,bus=rpnohp
  +            Scope (S00)
  +            {
  +                Method (PCNT, 0, NotSerialized)
  +                {
  +                    BNUM = Zero
  +                    DVNT (PCIU, One)
  +                    DVNT (PCID, 0x03)
  +                }
  +            }
  +
  +            Method (PCNT, 0, NotSerialized)
  +            {
  +                ^S00.PCNT ()
  +            }
  +        }
  ...
           Method (PCNT, 0, NotSerialized)
           {
  +            ^S50.PCNT ()
               ^S13.PCNT ()

Populated slots being described on coldplugged bridges even if
ACPI bridge hotplug is disabled.
(pc/DSDT.hpbridge and pc/DSDT.hpbrroot)
  ...
               Device (S18)
               {
                   Name (_ADR, 0x00030000)  // _ADR: Address
  +                Device (S08)
  +                {
  +                    Name (_ADR, 0x00010000)  // _ADR: Address
  +                }
  +
  +                Device (S10)
  +                {
  +                    Name (_ADR, 0x00020000)  // _ADR: Address
  +                }
               }
  ...
               Device (S18)
               {
                   Name (_ADR, 0x00030000)  // _ADR: Address
  +                Device (S00)
  +                {
  +                    Name (_ADR, Zero)  // _ADR: Address
  +                }
               }

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h |   4 ----
 tests/data/acpi/pc/DSDT.hpbridge            | Bin 6289 -> 6323 bytes
 tests/data/acpi/pc/DSDT.hpbrroot            | Bin 3115 -> 3166 bytes
 tests/data/acpi/q35/DSDT.multi-bridge       | Bin 12337 -> 12545 bytes
 tests/data/acpi/q35/DSDT.noacpihp           | Bin 7932 -> 8022 bytes
 5 files changed, 4 deletions(-)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index a0dbb28cde..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,5 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.multi-bridge",
-"tests/data/acpi/pc/DSDT.hpbridge",
-"tests/data/acpi/pc/DSDT.hpbrroot",
-"tests/data/acpi/q35/DSDT.noacpihp",
diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge
index 834c27002edbd3e2298a71c9ff1b501e3a3314f7..5dea100bc9492bb2367aac8660522201785c1efb 100644
GIT binary patch
delta 89
zcmbPexY>})CD<iovjhVJqvb}fa&9iSGcobOPVoYMr#E+Ve`ho>3^ufg=ZJT73F2X3
bU}lJJ;tw`J2rz;L3=QBam^M$~W#k3`PB0c2

delta 55
zcmdmNIMI;HCD<ioq67m2qvA%ca&9h{Q!(+uPVoXhCpUL<e`n<54>q)j=ZJT73F2X3
LVBWlmmysI)zZnl0

diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpbrroot
index d77752960285a5afa6d0c0a04e400842f6acd2ed..893ab221c2cca1829937a4c26152680313633df4 100644
GIT binary patch
delta 121
zcmZ22aZiHFCD<h-j)#GPaneSvdz@Tu>M`-bPVoYMYMVcCerGf=3^p=|=ZJT72?DBN
iVTf+x4>quX3owEO3=t}rCV%HvRZs{vMyO%O)C2%vb{qNt

delta 70
zcmca7v08%5CD<iIn}>mc@#99Wdz@U(DlzfFPVoZX%9}rNerM$44>mH0=ZJT72?DBN
SnJmep%FiEcYylTyX8-`NSP<#}

diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge
index 66b39be294a261a6bd991c6bcbd8e2a04a03403f..f2f60fdbb3b44ab9adb69bb36e4a80978536af9b 100644
GIT binary patch
delta 312
zcmdm((3r&K66_MfXvo08IA<eQqa05Y2V+cpuv5H1Cp+Whsd7n-?2|vrM@|luS7u}e
zu^7E4pO;shTr3|y*-t@k@(1~-$;T7|CV!W6-5jmBoSUCjgv}+)FNBH1DcIGAi)FH)
zu9T4zN3f|uJV(5vOArqO0~bSdlLLFO0aSzmtP&{Z$$}7@{9i6;v$k#wqqwtlj2_56
z0nVNV0yZFX1XO|QCeP4Q6cZ5$aP|vfh|>dU1Tle9hQ^ck>8bJ<#fvC_B@4KiCNI<%
zpL}1BALs!Pi%nm4@&bLy$u{~Nla=))CdcRtPj=B)5)e=eHZ(wJV+Sgh5OijNSpl>e
K#GJfezX$-13sfWk

delta 216
zcmZon+L*xQ66_LUXu!b0*uIggQI5;|e@uL^Q@nul|H;$kk{H=07brwdz97#sIb2?T
z@@M(D$yem%Cg&?eP4-n#Vq^fyu4H5dk}jL$6qj?Wvxu;{g!zRqaX1CL`fxErdC^V$
z!A2JG9Py4WK|Bl$tPGns=*BS$dWps8f$R!!_B0Ss4K_5Mtg5fb3St>ej?q`;F^m^c
z2ypfbVJP5YnyjxcKKZo1EYLE2eTm6B23nJ~4LB!n2C{t&BqzVnmt?a5tDW3$Py_&m
C13TgX

diff --git a/tests/data/acpi/q35/DSDT.noacpihp b/tests/data/acpi/q35/DSDT.noacpihp
index f35338db30a44638cc3a55d2870e0e377af4246f..4ea982de2df3cf7cd89cb3b4467a350eaf8f5d29 100644
GIT binary patch
delta 213
zcmexkd(Do^CD<h-OrC*(F=8Xv3mGmKwV3!|r+5J$)yaQk0_qiljSS*B;vHRrco-O1
z7^0i_gAFX;0*pWbpbCTlD>fA}!Nv$P*nldygAJepKn_qAp`RU1R<}tv*aV@O1FYTz
Op`H^({pNYHaf|>-)-eG9

delta 122
zcmca+_s5pYCD<k8j~oL7<Ase}FJ!p96k_6oo#F+Y6ej<X2?*j3HZq9kh<9`e;$dK5
jVTf)53Ru7eSiu6u2o-D)0fY*6uz(3d1;^$evT=+6@ys3p

-- 
2.39.1



  parent reply	other threads:[~2023-02-24 15:41 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24 15:37 [PATCH 00/33] pci(pc/q35): acpi-index support on non-hotpluggable slots Igor Mammedov
2023-02-24 15:37 ` [PATCH 01/33] tests: acpi: whitelist new q35.noacpihp test and pc.hpbrroot Igor Mammedov
2023-02-24 15:37 ` [PATCH 02/33] tests: acpi: add test_acpi_q35_tcg_no_acpi_hotplug test and extend test_acpi_piix4_no_acpi_pci_hotplug Igor Mammedov
2023-02-24 15:37 ` [PATCH 03/33] tests: acpi: update expected blobs Igor Mammedov
2023-02-24 15:37 ` [PATCH 04/33] tests: acpi: whitelist q35/DSDT.multi-bridge before extending testcase Igor Mammedov
2023-02-24 15:37 ` [PATCH 05/33] tests: acpi: extend multi-bridge case with case 'root-port, id=HOHP, hotplug=off root-port, bus=NOHP' Igor Mammedov
2023-02-24 15:37 ` [PATCH 06/33] x86: pcihp: fix missing PCNT callchain when intermediate root-port has 'hotplug=off' set Igor Mammedov
2023-02-24 15:37 ` [PATCH 07/33] tests: acpi: whitelist pc/DSDT.hpbrroot and pc/DSDT.hpbridge tests Igor Mammedov
2023-02-24 15:37 ` [PATCH 08/33] x86: pcihp: fix missing bridge AML when intermediate root-port has 'hotplug=off' set Igor Mammedov
2023-02-24 15:37 ` Igor Mammedov [this message]
2023-02-24 15:37 ` [PATCH 10/33] pcihp: piix4: do not redirect hotplug controller to piix4 when ACPI hotplug is disabled Igor Mammedov
2023-02-24 15:37 ` [PATCH 11/33] pci: fix 'hotplugglable' property behavior Igor Mammedov
2023-02-24 15:37 ` [PATCH 12/33] tests: acpi: whitelist DSDT blobs before isolating PCI _DSM func 0 prolog Igor Mammedov
2023-02-24 15:37 ` [PATCH 13/33] pcihp: move PCI _DSM function 0 prolog into separate function Igor Mammedov
2023-02-24 15:37 ` [PATCH 14/33] tests: acpi: update expected blobs Igor Mammedov
2023-03-02  0:27   ` Michael S. Tsirkin
2023-03-02 12:02     ` Igor Mammedov
2023-03-02 12:55       ` Fabiano Rosas
2023-03-02 14:57         ` Igor Mammedov
2023-03-02 15:43           ` Fabiano Rosas
2023-03-02 15:59             ` Igor Mammedov
2023-03-02  0:37   ` Michael S. Tsirkin
2023-02-24 15:37 ` [PATCH 15/33] tests: acpi: whitelist DSDT before adding EDSM method Igor Mammedov
2023-02-24 15:37 ` [PATCH 16/33] acpi: pci: add EDSM method to DSDT Igor Mammedov
2023-02-24 15:37 ` [PATCH 17/33] tests: acpi: update expected blobs Igor Mammedov
2023-02-24 15:37 ` [PATCH 18/33] tests: acpi: whitelist DSDT before adding device with acpi-index to testcases Igor Mammedov
2023-02-24 15:37 ` [PATCH 19/33] tests: acpi: add device with acpi-index on non-hotpluggble bus Igor Mammedov
2023-02-24 15:37 ` [PATCH 20/33] acpi: pci: support acpi-index for non-hotpluggable devices Igor Mammedov
2023-02-24 15:38 ` [PATCH 21/33] tests: acpi: update expected blobs Igor Mammedov
2023-02-24 15:38 ` [PATCH 22/33] tests: acpi: whitelist DSDT before exposing non zero functions Igor Mammedov
2023-02-24 15:38 ` [PATCH 23/33] acpi: pci: describe all functions on populated slots Igor Mammedov
2023-02-24 15:38 ` [PATCH 24/33] tests: acpi: update expected blobs Igor Mammedov
2023-02-24 15:38 ` [PATCH 25/33] tests: acpi: whitelist DSDT before adding non-0 function device with acpi-index to testcases Igor Mammedov
2023-02-24 15:38 ` [PATCH 26/33] tests: acpi: add non zero function device with acpi-index on non-hotpluggble bus Igor Mammedov
2023-02-24 15:38 ` [PATCH 27/33] tests: acpi: update expected blobs Igor Mammedov
2023-02-24 15:38 ` [PATCH 28/33] pci: move acpi-index uniqueness check to generic PCI device code Igor Mammedov
2023-02-24 15:38 ` [PATCH 29/33] acpi: pci: drop BSEL usage when deciding that device isn't hotpluggable Igor Mammedov
2023-02-24 15:38 ` [PATCH 30/33] acpi: pci: move BSEL into build_append_pcihp_slots() Igor Mammedov
2023-02-24 15:38 ` [PATCH 31/33] acpi: pci: move out ACPI PCI hotplug generator from generic slot generator build_append_pci_bus_devices() Igor Mammedov
2023-02-24 15:38 ` [PATCH 32/33] pcihp: move fields enabling hotplug into AcpiPciHpState Igor Mammedov
2023-02-24 15:38 ` [PATCH 33/33] pcihp: add ACPI PCI hotplug specific is_hotpluggable_bus() callback Igor Mammedov
2023-03-02 10:59 ` [PATCH 00/33] pci(pc/q35): acpi-index support on non-hotpluggable slots Michael S. Tsirkin
2023-03-02 12:05   ` Jonathan Cameron via
2023-03-02 12:07   ` Igor Mammedov
2023-03-02 23:21     ` Michael S. Tsirkin
2023-03-06 10:49       ` Igor Mammedov

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=20230224153812.4176226-10-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=ani@anisinha.ca \
    --cc=berrange@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).