From 1580b897c7b2f794fff7ba140ab757be1f6efadc Mon Sep 17 00:00:00 2001 From: Julia Suvorova Date: Tue, 13 Jul 2021 02:42:05 +0200 Subject: [PATCH] bios-tables-test: Update golden binaries Add ACPI hot-plug registers to DSDT Q35 tables. Changes in the tables: + Scope (_SB.PCI0) + { + OperationRegion (PCST, SystemIO, 0x0CC4, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32 + } + + OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32 + } + + OperationRegion (BNMR, SystemIO, 0x0CD4, 0x08) + Field (BNMR, DWordAcc, NoLock, WriteAsZeros) + { + BNUM, 32, + PIDX, 32 + } + + Mutex (BLCK, 0x00) + Method (PCEJ, 2, NotSerialized) + { + Acquire (BLCK, 0xFFFF) + BNUM = Arg0 + B0EJ = (One << Arg1) + Release (BLCK) + Return (Zero) + } + + Method (AIDX, 2, NotSerialized) + { + Acquire (BLCK, 0xFFFF) + BNUM = Arg0 + PIDX = (One << Arg1) + Local0 = PIDX /* \_SB_.PCI0.PIDX */ + Release (BLCK) + Return (Local0) + } + + Method (PDSM, 6, Serialized) + { + If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Local0 = AIDX (Arg4, Arg5) + If ((Arg2 == Zero)) + { + If ((Arg1 == 0x02)) + { + If (!((Local0 == Zero) | (Local0 == 0xFFFFFFFF))) + { + Return (Buffer (One) + { + 0x81 // . + }) + } + } + + Return (Buffer (One) + { + 0x00 // . + }) + } + ElseIf ((Arg2 == 0x07)) + { + Local1 = Package (0x02) + { + Zero, + "" + } + Local1 [Zero] = Local0 + Return (Local1) + } + } + } + } + ... Scope (_GPE) { Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID + Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE, xx=0x00-0xFF + { + Acquire (\_SB.PCI0.BLCK, 0xFFFF) + \_SB.PCI0.PCNT () + Release (\_SB.PCI0.BLCK) + } ... + + Device (PHPR) + { + Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID + Name (_UID, "PCI Hotplug resources") // _UID: Unique ID + Name (_STA, 0x0B) // _STA: Status + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings + { + IO (Decode16, + 0x0CC4, // Range Minimum + 0x0CC4, // Range Maximum + 0x01, // Alignment + 0x18, // Length + ) + }) + } } ... And if there is a port in configuration: Device (S10) { Name (_ADR, 0x00020000) // _ADR: Address + Name (BSEL, Zero) + Device (S00) + { + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + } + ... + Method (DVNT, 2, NotSerialized) + { + If ((Arg0 & One)) + { + Notify (S00, Arg1) + } ... Signed-off-by: Julia Suvorova Message-Id: <20210713004205.775386-7-jusual@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/q35/DSDT | Bin 7859 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9184 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7877 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8323 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9513 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7934 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9218 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8990 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 7717 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7865 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8465 -> 8894 bytes tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- 12 files changed, 11 deletions(-) diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index cccf92f0466fa4eaf2e9e06675b3b102c7a8eb86..842533f53e6db40935c3cdecd1d182edba6c17d4 100644 GIT binary patch delta 466 zc-q@+`_O^QCDauXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?TpzYIYyru7HSZeA_)XI`-McSqp1+^72W(@hM!SA zy2**D+yKS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zGf+HK0Z6zgL^lMxdc`wxpW)$RiEiWuah#nDT)lu2PJX^YjNDfs+CUsc X<;M~O(l6k~GI_DGExQOC$XEsdEdquj delta 71 zc-rgpe&EjK66_N4K$(GoarH*7-%OiTSUBXxMdIB9Tsh)BJY9GlodY}#3=GT|1RMo7 b*D3QePQIy<&gsSy6CdmpFJL#>OVt(t-l7wM diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge index eb5d27d95b2cdeda5f7e1f6b151cfea02e6bd907..55ad4bd7ab4759d68031b2f1d0307355a7332fe7 100644 GIT binary patch delta 3198 zc-obhPfz1U7{mAtCMX%o6tb7)ny zs2bp~+H2QeAS>n26H>)TC_Pl_p@-gj+CwkB^wetB|M=UHmIaqn-8UN-tV<~ce z-MFktrfcqBen<%S@6XaDPZc}!$ai($F?KZX*fHFFE_ESGqIaS|Fv9U#F}#>X@7T2} zK9~AkmIUu41;NlYs}dHvUESkSe|B$!VCZ(OT6A{ICq<9bca2Yp`oJ-)3h&K9y1HsL zU`FdZ$~6fyy>lJ;Vgi);8O3+t*hpcW4hJR_HHt0WU`X-$J%dyyDQ&U zf6V<;&HrLlTfln$WxYKY9FlfEXi9uL`|5|FPJ+686@EzPgG_=u>4X>ZI@g{E4yEDN zc#H5hhlHi=52j{8jSjB!!R^v&brn$jFfIX3*;p6iFi_%`CEpBBRI{y_G?4g`mh7LdKXyN+_Zr zL%GhNcSBGlgOCif$U2IQBV)YBpbQWc$s#1nEK)`hwa1`DWrv{11d2>BGxVMamF^+r z9y&TBGN^0dkxU|Fl3Bz+kvuZ;@5!Js#6*!PgiJAum?&}|8Ta4Kpf^A)6q!cI zG_#0>A_Zg=Ze-ARLAFq21|c)dB3mdji;USp2E7ZS+6D8mz0bE(M-7g=fVYxnTRv(? zJcLp&2w_;jMudQk5{5-=iV(2b48sz|>KGDK>7z!9z)H&+CRl2@-@#fd{SFpe>36W& zYQKZ!R{I^Sx7P1qz3?}dHrr!Ijp*$t94JBE&3u$g{VYIUk9#r7aj!rw$9*x%alZ*! zkNe{&muP<=+OrW)h<0tnfN0<5Ko2`N2YT4MHPFNEt$`l)zctXq32ec!sttC4dw%|4LxXsZct@8Y9tH*`1^^Ot5>o&G diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp index e55d12990c98d8eed760b858ce18a036b612da1c..ccde2add9f87db0c0eaf0cc155717d5744e4ef40 100644 GIT binary patch delta 466 zc-m`r+~~sP66_LUsKmg)=(&;WH&eZUpP*iRuv2`1v!_9HLx6K|2qX6q9xjgPMgb7V z87LmA03=)#q8ox;z2X_U&+u@uL^pDSIL=N6u3kV1CqLgHM(!&RZ6J=blV7N>LV%}B zghDi|3JX7L{X5Lv2h8IU|1-=Ky-2z7khyaD-#1RLt;TfM$Fl2~Uj?rg^g&M@ANCE-Qej(B7XetDJMK>Rp<7ZTl zZt`LY@CXRvi1+Yx;SKN$FmN<5W8jDn1@W9c6+H4w3UW%*CvTLOWjn%igojaL@)h|^ YE=Z9xH~FoiEdbPr5E}ph diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm index 95901f94c0d445919cb84dd1f6d98c646ae8176e..b062e30117f955c7a2ac9629a0512324bbd28bf2 100644 GIT binary patch delta 500 zc-mX(b={ZCCDauXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?Tws2<(q#S-8V5CpL;z%RhS5oj4ld?<+L x?5W_9Us8}$nm##PMV9Rd&k-I*iOE$enOuG>F(AVP+*l^RQL$wgVFTIB003EAkTn1R delta 75 zc-p(}yV8rxCDG&EEVc?F8u9J{t{m|mo-VwO&H|H|BZ)KS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zGf+HK0Z6zgL^lMxdc`wxpW)$RiEiWuah#nDT)lu2PJX^YjNDfs+CUsXb_yrg^0uAPf4+Zg@Jrz9iOA2yI(`00120h1poj5 delta 71 zc-mXz_|KNhCDauXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?TXb_yrg^0uAPf4+Zg@Jrz9iOA2yI(`00AnPIO8@`> delta 71 zc-q_G-Q>aL66_Mfq{6_!cz+|;Z>G&EEL!s7BJu74t{m|mo-VwO&H4 b7bx>HPX4Wu&gsSy6CdmpFJL!0N7WVpu^|&B diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64 index 77d46369e48efca9a9e5024542c77cd26144beff..2e0a772a85275c9c3b4c9317d98cc7c3d27417f3 100644 GIT binary patch delta 479 zc-m!PM4+;bwtzT?kyZ?l40HXyyU!Z#Sraw@gODuCJ3ySz`9uF|ev83eCeC-)5!DD* zEn~#n4%7X_I48WWJ-u5i=f-vF!1jP2Xtl< zLD=s20`5{?k{)nTcPtzL!=UauS9Jh7^@nh9dAeK**?FwR?1HWi=MdIqSzZO=x~<7e zfMjZm!Jj`Iy!%&xky#auXIPPtIak zAUQdci)n%Iq}s^|43iUh{sRHS5=B8~#>OQ;f?=Wf0@2A?T^Po1VKy=@Cz_-1RBf{9}40*dn$P3mlWibrYjVs7U!21 zC8rhx<$^;Txwtvvor8h}dAYdU8ISNB;bD}RTqc{z<;M~OvPQs-W%3JITXqpPknIcr D=ZTS( delta 71 zc-p&czto1yCDD+yKS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zGf+HK0Z6zgL^lMxdc`wxpW)$RiEiWuah#nDT)lu2PJX^YjNDfs+CUs^Po1VKy=@Cz_-1RBf{9}40*dn$P3mlWibrcZt@E6a9- h=Lip@#AGhHOfEl`7?5!SZY+~)0006L>i-Z6G delta 71 zc-njJu+x^yCDylgPr07oIMSq8v>kzLm0V_@NjWNHwu6_ z&Oq@{1t8&~5Zw^$>J`t(eTIjNCAyIt#Bp{qaP+slXajMao%}+56#_h6 zA{3$-oqU|V8AMbAoL#+`qLo3s|NjdzKq?9<>lrf{K!!xCgT$9Gh-f>7t;daNwt#`7$zt1{09PtC5nQ~jEzfx1j9n{1)`I)xY!GXSeY1j84?Q;IuaQe zmLzUwWxg%Rb_6vztM^ho-DYp5$j5MQq zbdwiLfJZ