From 835fde4a781f8abf230d567f759647c403944b57 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Mon, 15 Mar 2021 14:01:02 -0400 Subject: [PATCH] tests: acpi: update expected blobs expected changes are: * larger BNMR operation region * new PIDX field and method to fetch acpi-index * PDSM method that implements PCI device _DSM + per device _DSM that calls PDSM @@ -221,10 +221,11 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) B0EJ, 32 } - OperationRegion (BNMR, SystemIO, 0xAE10, 0x04) + OperationRegion (BNMR, SystemIO, 0xAE10, 0x08) Field (BNMR, DWordAcc, NoLock, WriteAsZeros) { - BNUM, 32 + BNUM, 32, + PIDX, 32 } Mutex (BLCK, 0x00) @@ -236,6 +237,52 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) 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 (_SB) @@ -785,7 +832,7 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) 0xAE00, // Range Minimum 0xAE00, // Range Maximum 0x01, // Alignment - 0x14, // Length + 0x18, // Length ) }) } @@ -842,11 +889,22 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) Device (S00) { Name (_ADR, Zero) // _ADR: Address + Name (_SUN, Zero) // _SUN: Slot User Number + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } } Device (S10) { Name (_ADR, 0x00020000) // _ADR: Address + Name (_SUN, 0x02) // _SUN: Slot User Number + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State { Return (Zero) [...] Signed-off-by: Igor Mammedov Message-Id: <20210315180102.3008391-7-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/pc/DSDT | Bin 5065 -> 6002 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6390 -> 7327 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6924 -> 8668 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5529 -> 6466 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6719 -> 7656 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 5026 -> 5969 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5137 -> 6074 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6424 -> 7361 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 4923 -> 5860 bytes tests/data/acpi/pc/DSDT.numamem | Bin 5071 -> 6008 bytes tests/data/acpi/pc/DSDT.roothp | Bin 5261 -> 6210 bytes tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- 12 files changed, 11 deletions(-) diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index 11ef89bd322271ee30f3971b880dadfda565d413..b9dd9b38e4ef720636ba19ccbdf262de8a6439d5 100644 GIT binary patch delta 1301 zcmX@9{z;F^CDyoETT8wH&Fe1n{w{6c*d0z6$JCMz)O z)r)95db&g~MJqe`ID7y9UyuQkE~sS8WB@5C01*k%>LAG_2_i0R0WQJ5d<%S7Cuax> za|v89KlwD+w90p)_$yz@!_K}1AhU9E6BZ~>&SF>~IXRPyX@T&h+Q|tFlM{IU|NsA= zVTm9!V59Z z#S1tr3~=@|;BX3d^F>gM^}+oLDA{@M_55(hOE$ zPe?%)Aq7(jDL6n#!D~Va#P|sK!jX`I96}1F6H;)9kb<{_6iDzB@P#uW1$l%N%p|1X z2q6XU2`P{gAm9sELJA59DVR-2!7)M#J`z$OBS^p(?t~N+5mGRhkb)C}n*3-5!R8l& G4;cX>J%$kg delta 345 zcmeyQcT%0pCDmqyI*(Jxoj<9FtEldGoSFH*!1q`35;V`GxvUR%O=P{Dhf@ zlTl>yN1jY0*MgY%V5fKi-~0e)PXi98U{@c8=qB!91A};uct@8YhUg}(U_&T}hk=2K zVe%+(V9LMXizO8)F)G%VJ diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat index c561e91be79f80dbea1cf4eb0f8658541a3aab2f..cba5a1dcb0464e56753bc0b931a4dd2e3b209787 100644 GIT binary patch delta 1301 zcmexnINy@XCDWVBW)f0xgph*wgcL}L5b%X7Aq5456wD^1;20qV z9||Sy6~I delta 345 zcmbPl`OT2aCD5fk8Y+yrWAHLv)i?upyMg!@$7A zF!{TXETiURF<}kn=qAm{QBZmwlzs%I)kGljSx|Z%l>P*z%|s#cRZw~#lx7lxh`T}Q zE+~BtN(+fY%* diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge index a234075518fa8e187349d64c313779cc25db8299..a9b4d5659457f6de30b993962bce673c9413d81d 100644 GIT binary patch delta 2375 zcmeA%yW`B|66_LkN0EVn@y153Jxok~f|E}$c?)qwHwrlU`35;V`Gxu_1bDhcOjcml zs~6FB^mK_}idJ^=arXZIzaRr7T~NuG$pBJP03s5i)j^U=5=30s0$hT9`4;%FPRDnWY#x%Fvi3O zJH-ohx-$kidm3;!1-tq%L^o*$8yLiM#5=kKF>u5Ohx##yh{wAG`|>Oaa0&L!$jr(H zsRKzwH+iuH8$#9cFfcGd)N?W6(jdYSA8hEtu!I4`@Gye0j6sa(Cf`-Th87Tuc^DX& zp@uQzG7Rio#^@%S$vV8sGPqPlH#xFQ4&qhEqriz}at*Hreg(@3DQFcTV8RAM3T_ip zz$Qw-3PVB)VhAZ{C#2v%9|1SqC1e7J7y%O+_z5V8BV5VkbnujgiP2$NP&S60W0_sLjqk gER#pGrC)TD6U*e$YzYa6(QF9`hXKl#dXo1T0j==H4*&oF delta 619 zcmccP++)V&66_MfBhA3TIDI469wsIaj>#vOym?uo8@ZkQe1n{w{6c*vt1|0te!|Sd z$tW`UBTuH0$CH@&V5fKihbIBfo(3FF!LB|G(M{aJ1_tpQ@s2J*4AD(m!G=%{4+8@e z!{jr(vXcH~!G;zP6+8?K%nV?SjL}UhlNI@tnWLLDCMWQzGeEQ8 zKOahOhSJ}mw6y?4z8*>+hSKbU5OHrP-4CTNLuqj#hyoETT8wH&Fe1n{w{6c*d0z6$JCMz)O z)r)95db&g~MJqe`ID7y9UyuQkE~sS8WB@5C01*k%>LAG_2_i0R0WQJ5d<%S7Cuax> za|v89KlwD+w90p)_$yz@!_K}1AhU9E6BZ~>&SF>~IXRPyX@T&h+Q|tFlM{IU|NsA= zVTm9!VcbG-q#0~r5YG|s=n}-h5g#1t#~>me?-K0Gvn0SJ*f%3HD;uN^ zBoW=@#S&}?Rm;P`zywjx#e_?P2uFOdp$o$j1`xx@MF7e&1_?zsIk8NB!lxmFOEXvj zKR*ElR)iF!5>haMkb>QW6g(rOKu~~yFKh@YNGGIV5+Mb92`P9%NP(~*0bke=QjkeV z!4yIY_7hU@ijV?PAp*W|AfzChkb-H16dWX^;0+-K;=%-c;Y3J5E+GXogf;om3WCi$ IgdZ{j00?G=DF6Tf delta 345 zcmX?PG*g?)CD}K%B=TT7!x1t z6ffYgFu>Wkb-nV3MLU!u$Pd67lafDOAzpdorESoTK3-@ IC-IOG01B#wCjbBd delta 345 zcmaE1z2Ah(CD5fk8Y+yrWAHLv)i?upyMg!@$7A zFxf#wmQizZyod&Kbd%=f#ZdY=l-3r7i04D;%~1L~l(rUw$k#*Z!%&)C93t)wrTd}u zWhgB!0g;b}((|G8V<@dI36al+((9r0XDDqh1(C0Y()*z_vou899ZGjY>GRT>n+0TU GFaiKob7F@8 diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge index 9dfac45eab12b680bc963d0528553a7149a378cc..5d8ba195055f2eda74223323baeb88390ea36739 100644 GIT binary patch delta 1315 zcmZ3aeo>FhCD|UJxok~f|E}$c?)qwHwrlU`35;V`Gxu_1bDhcOjcml zs~6FB^mK_}idJ^=arXZIzaRr7T~NuG$pBJP03s5i)j^U=5=30s0$hT9`4;%FPRDnWY)XSkBJX< ziWl&o7vSt^z~L0^>cbG-q#0~r5YG|s=n}-h5g#1t#~>me?-K0Gvn0SJ*f%3HD;uN^ zBoW=@#S&}?Rm;P`zywjx#e_?P2uFOdp$o$j1`xx@#R1AP1_?zs=>;2FKGI$jP5K>T0NWn5f3N8{-@Q08Bbv^>V2qL7QmXLxKgcMvRq~ISR z1)BT>d=WxOK|LV_s|YE$NCP4ze&?TfGf{=n{ TLJHOiYVxBM3!BdgUSR|PqJD^6 delta 354 zcmcbpw@97KCDyN1jY0zucJkV5fKix7+|{PXi98U{@c8=qB!91A};uct@8YhUg}(U_&T}hk=2K zVe%Dr5{3RRbhyHCX`+ar9VPxQxS-KC6wL^r5Qyb O;;y2ao7+TBGXek=6k^H% diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs index 1814f291b704d737d3578b83fbcc6e090384943a..01e53bd436698db6f6adfff584ec56cb99074a5f 100644 GIT binary patch delta 1291 zcmbQJu}h!JCDLAG_2_i0R0WQJ5d<%S7Cuax> za|v89KlwD+w90p)_$yz@!_K}1AhU9E6BZ~>&SF>~IXRPyX@T&h+Q|tFlM{IU|NsA= zVTm9!VWQ$h+72r1|$q+lB%1rG@+ z;1M9;3v)sWk_aj2C8S^nAq9^KDc}<%;0sGa3Q`Cu=qIFL7a;{t2`LZ|(&R_W{+kVi H9x?&|go%OX delta 369 zcmdm`KT(6rCD!Vd-n=Z)joeOtzCq4TexbgTbD8xv>#*=} zGKx&LBY$hSi2lTeyh03sd;rKdva zn^0O-5F(!lrI$kKmrz<)2qIqyrME)qpHSLX7$V;YrH?{sP7#Q>FO;4LrLRJ1Nl}P= PERW}B&CLx delta 344 zcmX?TIm3v{CD#vOym?uo8@ZkQe1n{w{6c*vt1|0te!?8h z$0#z{K`7J6wIC)w*ePDXH$TAH(}2S%*wu$2x`{j3z#yI@-q9t9A-YK`*bvI$VPIfl zm@FwQ%cwcoLRf=2x=C|#4U|3rrCCHE;vP`C2TEUn(juY|`3NXI2TDJH(kfyQ`3xw% z21%`c^H GFaiLD;b4RS diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet index d7d21be070c3b879e558193cbf8ded5a64c15eda..d4f0050533f970128774f825274177096a46c3b8 100644 GIT binary patch delta 1283 zcmdn3_C%MU+84*#T*s}IC~m! zI0d`L2Z#DGh=|9#1pD$V32+Ja&B)Bk2B`x{L^pY{1RFxt z@-Q$kLDX|G;nE<&5g%;m!mxw^#4vK1T+YMCs2q}msq@atCf~|xUJRqcio1cI$%m^t+B&48+ ykb>=m6g(oNfLDNkFDwWtNG7D9kC1|$gcLj>q<~+LfG?~BHTlu9|K=#chl~K}5PzEh delta 345 zcmaE&yIYORCDQDP&P9ut!X$7CxeZ(f$@Ms6oR-ymlvzfj-F)0y-(hcWYT zGKx%2=E*d2Er^K^c8VA9%@1()G~jRwcJ*P1ZsHC$Fo@@fcXSD2h;GsfHiU9`7#Nrs zCfo4JGHOna=G9=1Zql4QA4)%l(&~H=@oXr)9!h_P(&qdS`D!S=A4)R|K*ZglbT^bf z52b|#A@bo+dN!2452clbAoA%@dNq`O52cNTA@b!=dN-8*52c+&AoA@{`m~7VW**TS Fi~z?4U%mhU diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem index 195f8da900c5fc56c504adfef756af8f74f5823d..8632dfe8a8bdd991871a1e633162eb9a2e1497ea 100644 GIT binary patch delta 1291 zcmX@F{zH$;CDcbG-q#0~r5YG|s=n}-h5g#1t#~>me?-K0Gvn0SJ*f%3HD;uN^ zBoW=@#S&}?Rm;P`zywjx#e_?P2uFOdp$o$j1`xx@WimG}ACnWyWGP+^8C+VTo19oC zyAo1RKuE!CLJE!%Qt*+G0vSF6zHld`pooxyxr7v)Af(_kAq8^$1bpF1NI?l91@j3h zI7LXoS3(LD1PJ)Tn~;JsLJAfVQgDWlg71VBCw1Ct_3mi!A|i4zWD*po(3FF!LB|G(M{aJ1_tpQ@s2J*4AD(m!G=%{4+8@e z!{iIRvW%LO-}7oPM>lCsHs*uSQH;o%td1?NItOl;#(JhzCRI=}`JMl$IBS z$R|VTrh%+6e1rls=0ZA H=nX~yEiz;+ diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp index 1d0a2c2f3cc4bfac75948d2ed6a69403cd18379b..cee3b4d80b51ad30153953ace46127923ce8b271 100644 GIT binary patch delta 1279 zcmeCxJY>M-66_MP562JzXN0qLrO|oW1}5FUSB%7gRE4GJup6fQW=>b&%we1Q8du0GD82z6Cz4lQRT` zxdbklpL`l@TID-Y{FSfdVQ1e0kXbpo2@8}bXE7|0oSezUv_N=L?c@Z8$q79F|NsBb zutboVu@OWtEEHcLIyp;-i@iXIm5G6uA+aE#Bawk&N#bTdW*$yPiOJDCnOq+0V&a3H z;sqSmO+LqC&*ZmaGC!{vqs?SBUS$~(@pzYDU!El(CuL-2Wjh7C`osr^`b9T6vP|~j zRmY>iiDhybuLgbv3kfMWLrB4QLJE}l2)MzQkb(+A3KkPmaE_3IpM(^s@DuQbKOqHG zgcK|#q~HP}1-}U?P!k~Fi$FpOY6vM