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 zc-n=|%}T>S5C`x{>PHRHCT+A;JO~AA5lU6Wqc(|XwF$*o5F#YKHT8qgn}UcvdDTTk zL`WeoAYMI)is;Q(@F0jHqAyUh*ppCZ55utk-_Fic>Lg~YFAM; zv_7xUNh)HD6P{r!`8w`A4V4x2HISg!K;1mP582H3MB7y(~1KSul!@xZT qzA!K(AYdK?E(Xpq@PL7D3=E41SinFH0~Z*06w{G^`PG~F!u$dvJ%$kg delta 345 zc-s4mqyI*(Jxoj<9FtEldGoSFH*!1q`35;V`GxvUR%O=P{Dhf@ zlTl>yN1jY0*MgY%V5fKi-~0e)PXi98U{@c8=qB!91A};uct@8YAV(|M5X#|UU|?dH ze2Q0=QFHQ3UJd5xCe6vZd=R=2N^gbIKcTcOKZI_C(np~*rvQZZh0+tD^i?P=DF~rs zq4Yv1{S-=T3PI>xD7_I%e}&SP!VtO^N*{#MtRfKF6H50&>5EWWR1`u-ifV42C3=Gq E0MsyIs{jB1 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 zc-n=|O-lk%6b9fkqm>M1evGLh5x6J`LW_uYIWtnGGl-KAOfch4?SmoO6h!2zZQVsg zgd@x!2)C^&!dmqgBH9EI5w*3sd9n}(Gjb+BTj#<5oDWS~n8r~Bz^=3v*SwF3lA}QFV5zmHtAg%dXcfg=$|I=R0%(n- zno8*&JtLLCqpM{F_=xW8<+bT{)mnX>IvQw=Ww)B{SuX(l>pAwn2fUM~C9r`u(~`f} z&Cn~YA-G8;A=QJ^e1nJBTvi^Sy6~I delta 345 zc-ot9`OT2aCD5fk8Y+yrWAHkfRlB2<7lFFfcJp z{w^fTs5x0oSc5sbNpo@(l%5BrA33vX|Nen`}LFq0i zeGW`_Op$FPvE2KcwV1Lc5=!;f7^MR?y@xuUs?&+_Zlh?p*7@37K3kPIo zKM1?`c*!W*4~@*~0{dOP^4m(~lg}%x>cIMQ_33)m`E0kc4ivPt?r=^w>Qvdvl<-Ap-F7+c3!X1C{KF zo7sX9H;YC&uFaLLQW_i@sW>!Ly;tFCr4@P7tU$98?sVGF8hg^L!WY#D{Qcj-HnjP; zQr3%BG|I;whA?9U2N~clsNcOvYDliVb24Y8%dS?WXDG#-N$3Gy;j&toyd;T0in4cR zmNG_JsFzSZsuDEE`OyVdfeJ9Tz&2n5|4s#v&E7eeUs>(W8lQM$mcoNmpi)#?nK$(A z`W*q!e~KSpU|&mLOCT?>SJEp9*wi)nf$Rb&=a*&Z7@+;x@}H>r0@WH}&lG zfPI#%PRFTJgmaf|0%6$Sqv1Aa@1=3huqeWE=u+8_t!T!GX;}HO)^e~}k4|v)<>kNp z!6U|K?Xifa)zI&7-9sEE$DzOK2foGGgqs?3V zh!YD2U=*rOWw#2@uBwGOS{-$X(*kJ*FPp^@II%#Z;z0FzCiJw*8_vBd55T&!eW$t( zT!LClZPqX-gwMfpVab4v*12YlwW7@`m%GCjY&;w7T4@Z5Hfuc49m(vENZk<~Hk|u+ z*SQM#B*N|nfU{jizTFK5&c<$~3R~57#eQ(^k|Z7`dd!$vypd4wlB7$DF4KxOk-LF= z-3o2<?kGK@0y15!({OA+s_SVnicRu|1qpdr&4?hN*>E`m% zeyJPfe1X9p?6JsQdgBz`+P23d_Ji+}k%qW#W(!Qu6)dI~^EVk*s03Z+8A!UGH?W+= zC{og`>~b8#jdUrlMasECPH}(+aRa8;+yaV%JdvYm-OMEt$pp#pGzYb)UYh@Dpv9YY zc&H~5iA`;B1j}nWWS?ETB=;vu2~g!597Zw+Dy@^vx8gAchmT`j9D;;pG9RS0{1LIi zK|~meugxFRExn)|fUf9;?EA4m$AOx|Hl7=?<_5leHXPynHZVrJcfuXTi*tvxyY! zKk@V+(V0?LWODUCQ;9jyu3~HwXd$}w!D|-!3x-~BmA(<7>e^bj)$uCCHO_y(I|_k_ ztGq)O>?&VJUPqXM<18Z4&?|Jmj&$wO4h8<}^GN{DPqnqv33q!u*CSd#rPKN2x8Cia zzIps!Z;tn&FziHrHP9(Gytl5sqszDiUb{MK7R*E%m%uB4G~QSFyk0QeSNXo$`)ZHL z1ae(A7tP`@5L}8ORrGBvcmXfiaqJc^tdV!R92=1tYR3DSa!ir20}i;>EO|)0`lGeJ z_W$Di`}({m;6^sTiaVJa!lDM%Ak}JhXOXSBZP%j(=I&Mo&od@+!Ac~`q7%1P3xF>s zYyl%}Y6S5({et4iK{;E=ME4g*z>DXBgC=O`Pa1$7DBh&R%{1L$iT{I@ywb&z_OYac zuw1pw-ubbomUMcWwOE;6Fw_Wlc@In=EnA5z-gMUc;p7V$7aargX6BuLuF@%nBfidnIgpLyeo@0^=S37(&NsfpOY5 z#=Ow+uE2QLKZek8Mqr%rgP|2p8#fE3Kr6gmXYi1kkj++PyN(^&Lux5JLq;PhJPH}Y zqoR=#o;Vr8a}AAY;c1XTp3&`k7>H;lAuM8=>H3Ijw(BFV*{+Ys=DI#&o9p_B?sC^h ze3!{LzFl`)A+)a~x^}>|dw!Yht3AKs+C9HYcDm<}yLQiijqFU%-*D}o-_2O>`Q4oL zK0jq`^!X`oqt8#7XZ!q=d$!L{+0Xa+DStc}o7x%rbpsBge~r>c(|>5${*A$n+a delta 619 zc-p(;++)V&66_MfBhA3TIDI469wsIaj>#vOym?uo8@ZkQe1n{w{6c*vt1|0te!|Sd z$tW`UBTuH0$CH@&V5fKihbIBfo(3FF!LB|G(M{aJ1_tpQ@s2J*K#o?hA(X?zz`(>X z`3$eDq<>kkp#@x!nE|YkF}g`*vLc@{b99r&-b zze8zj0SH|Wr4K`Cc0ma34W;{`^kpb5E(D>Yq4azx{TNEC3q$B^D7_v^e}>ZLA`rS7 oO7Dl#%%Tw59ZGjY>GM!pSPVjki)k*NA;!cwtbMqdUEwMt0C8ilC;$Ke diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index 6ac47a7d1001c711b957f8e28cab1a143d2cf65f..8d86155e275aa688f8767dd92c4b9df08b4a18ad 100644 GIT binary patch delta 1301 zc-n=|y-LGS6bJB=v}y^p%|}ZuI0z0Z1!)x#M5Ik4_|b%76od##2eGLZvMNYvCvnnV z5#3VA3y6!LBI=@>58xuGi1-dQ7dr{%+~IJz|KC0LoTnZpI7L@h zqN1x2x6nh%g2eGJ)6XCJ)Sh~r_*RpTdDWq_cB+;;Oe)|eiOsRD)Z8Z)5G&mF4|qa= zsnY_jgc~Onk?V8B9v1qcaxjaTgCihIwb4!1uz<8 zdOB@}%$%|UAyZ$|AeJ!wy}};du54GfsiT3>SPJTyjtv8_f1YEzJ&5^vMgb3KGokRE zZjxRZ4LL~OBcp@efAc{!ihvmmY+~RD1J@Y%#DKsfU={;g7-(YP76V@xkOTzGVZg?~ r2?p*k@Qs1Eh=42xwlQ#ufqM-6U?3qOK*m571834$^k05?CA~4f2xf*U delta 345 zc-lK;G*g?)CD7E-H=(qw5QI*I(o3QAODL@? z45165^j0YS6H42PK@wViWuI`#iO=Q;O%1la^wtKqw#I6Z1JTWUWN?5Dy)xYq z{6wmuheBs-^*>y2iGf!PG>8Zoz(5uQM;N%mz&i#Sn-DOBfn^LFW8fMC9~cNUBVZT< qD;PMzzzqhzFc69$U=#zZ7&ybg9R|u65TXbei^c>0@{6VD8}|bWs)Z*2 delta 345 zc-nhmz2Ah(CD5fk8Y+yrWAHkfRlB2<7lFFfcJp zb`X(e)SMhIqQM;9q&ayplztASwM8LxK9t@JrN2XIYcU9252X)7X?Af4?G2^-q4Z@a zEiM6}qoMSCDE$~pt4l)YY$&}RN`HpZ=28&48cOen(#+Bj+8s)FL+SI DRdZs8 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 zc-n=|!7Bt&90%~jv@~+Nu%2QTo^!jy^yX5F%)(~W`cgR z98e8Cn^KJhy(crJEwLUkRtgOyYb`N*)pTm6T6OX~cGiUgaN_V{n-Ly*c1UZ?XjE@? z(+w=Iv`c~e(c3pVvZ3#W-}SERlkOWl*Z$h z-%4s(@LP1jfKb?~?InAByL_Rz!W|FH%CwIr>Q)9I-(DhrJqXqEga#h)W=I>acf}Qr(pC$hNx$0wmE&bj9f(!;WF>s852Ml~*AkvC}EC#kPaDstH418iB+J=C6 w43sc%ih*YY>;;ek0~lDuKp6vP7yN1jY0zucJkV5fKix7+|{PXi98U{@c8=qB!91A};uct@8YAV(|M5X#|UU|?dH ze2Q0Ah(FlS0xrf3RHQjsl23yfM8`tug;4q_l-A^j(78~0Bb5FMr7Z;@bS;!V2&GvC zA+#ry?uF79p|q$FgpP#LbD{J@D6J|Cp);ZMS}6SyN}Gy6=t?NP7fLgVLTFb}&CPA1 Grx^hi6k^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 zc-n=|!Art$6bJCP&1#LQa~dXe2s)$$WrakyoC_+QNJ|JNZAJ%Y1-ll6*rg&O><67E z?H?#3!fU5){R0saUHT_%Kk5|7dxyt^@8|b^ua)f1397Dcb>jd`_g)BaY%xM4E-&*& zQ&NiBW=<)VwaL=Dx=m`_Y$G<4^+(p2QVO|zzwgv&>>M#RP~y;L8PhcMte84nQgtol z7KTVI5*4JkrPnV#bF8)E-&*1&r#W=j!J*|&kvg~uVhgMry*VKk5KHX)1zv<>nzTVX z?v9bVEQ~nv5DP)5I@Wm=z^is{IdPO3CwHRVSZh~IT`{GVb}6@><`sRl0LE!bPp3`Z z%&MEfn|iqjvAF5qC3^I_nqA+gjt0i*MnIqcvmyZd>jieugP5PstKb107F41IL#z@Y zm0)sW@E<-n!@vUu-Z8+35U_}W9SmGx;1L5K7!bk;$Y8+2z$FHrFwnz*C?Q}81G^Zw j!oV{IJ~0rAAYd5-dlh%RS}?go%OX delta 369 zc-q^gKT(6rCD!Vd-n=Z)joeOtzCq4TexbgTbD8xv>#*=} zGKx&LQ5)9r+=2E0jJ7rFjJ)bRd+T3Z-vC zX<0!Cod~6uLg|-KT2}}{7eeW+Q2Hm7wiSlZjZpe1l;#wH(7sT5B9y)gr6olnbS#u! MD5|;nk?0LZ05|VtC;$Ke diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp index 3c81339d397969e954c94eb03f2654c57e024a6e..b8103799b45224c08344369931b87cf3b7797d7e 100644 GIT binary patch delta 1301 zc-n=|ze~eF6bJB^)E^~O+oY*!!9j3P5u_?o6cJ4#SZzXSEC>;jB4X1jWK|Hclar_? z;+R4vH|ZoQQe1TNUl3G8{2yu#orLmkcs%a=xp(h!qB+f}hPvA92Vj!d+#Sp6Jb7YQ zgs^!SlXb12$a+y5$Y<3xG7uU&5Jwk+mNf_EoU+ntxn&x=yNm;rxU|^j5Dk4>RJ-!3 zq4j#XPEzLMTh)m(JSWvAsc30WU=yj`iYa`@{xfM_R!FpARvI zv_M_*5~Lz<-LBBdLJyQ&`=|uqml}G=>}8VVigyl{>g$#vTe10iUdg7zvay&0vo>O+ z(^lA8Pzw;YjG_*rWCeRge7arPsZ^<>fmvJbFvkCE1c3eZ9NX@J806zB_&}QpHTKs{ z(krtjcaRNXxWD~x0XW9M4F=vY5RD^X1_PTIIKjXz20k#riwKy-z!nD1FmR87PYlEp q2$;iwgMo7lJYe7p1BpHa%wwR6feQ>YG4PE6Ng9d%%NrT#mH7cArG}LN delta 344 zc-lK?Im3v{CD#vOym?uo8@ZkQe1n{w{6c*vt1|0te!?8h z$0#z{K`7J6wIC)w*ePDXH$TAH(}2S%*wu$2x`{j3z#yI@-q9rp$k7TmgmQQo7?>C) zOA5;}YEHHg)?kiq(wtlar4K-977+;T0i}DO^aUs_A_}1+p!6Il{QydS5C`zdT5B8AHmT7ncn}1&h*FDR^kkC=el(#p7Q`w^@nWk&Z-OAA2N4m$ z?hB-l7my+%9=+&6@Bu_r>cx|9pjq`Kl-a{D%>Os++zd2Ec+J$78eIU~=LJ7Xh#}Dw zS&Rk>2clx=IaM+8dS7;4Tc%Yq>X(PptaXUI&t?@??82auQ5RiX*8Ew`)Wc4um2OBK zy!beE|87p~>gTZ!z2{cdD{Ogd+jjbC8Jr$k;)&By-J>>8Tln%GxKayuzzWo2PA4t% zZIx&%fe;ic_HhxwEsDmZWh$0fzazdN*G(VVOZ#)R)t}i+EvwEa0*X1Cfx=QDP&P9ut!X$7CxeZ(f$@Ms6oR-ymlvzfj-F)0y-(hcWYT zGKx%2=E*d2Er^K^c8VA9%@1()G~jRwcJ*P1ZsHC$Fo@@fcXSB?aHJGEDG$+r8(vP9EIv<42hSKYy^k*n-&JUrhq4a(z%`5<+-Jx_hls*ro zg#{sWIFz0ZrSC&&Wg!Ti4y9K^>Gx3DSQtW=L+Ra6`ahI*7J<<1Q2Mlp=4Kwz8;k(Q C1z)}Z 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 zc-n=|K}!Nr5C`ztXO?Yht{PTINF7Q7(IC3!x>BaQh+7bBu`5~2w7hU9}D ztr-v%xs(x=6**SSNvkyGN;JaLX=fzbgjmSryIr%wVsn?P0wX4ChBnDU+Xzd&MM;(Y zR>4gxLWmD^=5C+W***C%@*+SoL#30ebdgjRWCg^u>A0o3qzodR2MaZT2s z9kGUJEy(woK{o*(luhHH3}BZp6j!jH8>VG%wXxV<(^XLq%(sh~T+$<|*#c;-xSCAr z9z89Uz@w`x3WOuNbC=g<*Hx;ub>>*0wU&C+)UWjdkRQ*J{~m;$JSBk*Y?zVgfX`3F z9y;oqivItH1F{$}F>s85YYe<$AnHfJ0tU7)aDssw47_7tY!CrC3~XcI6a#k{_`pCc mfPg#(b}-P!z&!>&F)%J5K*m5F17{d`5aNS>@{3pDiTegF>4eSz delta 345 zc-s4+cV3;#CDw1Ct_3mi!A|i4zWD*po(3FF!LB|G(M{aJ1_tpQ@s2J*K#o?hA(X?zz`(>X z`2w#jqvquIyc*2WO`4O9`5<&Tl->=c|3hhKehA$TrB6d?egOy_45g<->Dy3RUJybj zL+RyE`Zbi+7lP2mP;jZcSClqG<6#om?FB z`vWOP)TJO@ope!(q8Ep5pkd- zs&del0=UYBDYiTJ@}bVw<%{U29DmBomUnA=$FP&QhU_>tDbfyK9$^DvgLZp^9L`5H zyg<#UJ%VdIHE8hx5;3S^8D|xQoJw2q(ZfUxYqUu%w>EWE(AmWn?$8UQa*IREC^3&y zOmZv|)qBs-j`vd4tZfPElBBC;MLW&;vBaeN0Kt#cJ4ge|yjv;Udfp-YF5SZiv OQ0B9te|>wGkCA_@vxQRt delta 353 zc-lK;(5uPi66_MvE5g9QSh|sG4-=CI$K(@C-n=Z)joeOtzCq4TexbgTRhjiRKVjzK zWE7eFktdVOvnD1!*ePDXv1W1#uf3#yS+Jo+JV(5vOArqO12Y4MQ?RQKLv)kM