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 zcmZXQu}Z^G6o$`D(^}G~sg2ZvN~A~!LF1s}P_VhFG}Xk5X+gM!q?1+@GpL{-woa~k zUm!wXK>7%F5gZ)coI1Gp0uBz5iwc6vf$!%(|IazS;$TfOU9;BI0MOgL^eJ2_PI}&R z4Ub?;r)`4W8cOwLDM>pD2TZV4*9f*ujkeu#)kCQ#SrTa{#Q__7xvJ5&;n>?K_42*O z0UJ);)`(^9XcQTncmvc~g3DEb<~c=Cu*V(2*(GWL51|FFcR`&iS?10^8)^X$3;6JV zyuNBCi0RrR;bxrer8AQ9yz=^klfbD>19US^$p6x@JV=YMtGq)Ga2jnSJoGS<{JyK z->-ci^hY4rsnNn8fjbm?y!SCViVF0qDv}D>PI?u~93~FYOZqY-y*ejsX_cen;NWDJ g4W_0NeYr2A2_{arBu8xULS5NHRbf{nzd9ak}GLv#Y{$Y!Gc80SXoK9 zFHp=2h(|CRiG_s+u(9z97L^+$5}T8Jf4=*locp$Rxh`71Rlb}AK)3heXX;Gx@-u;N z1_V0>Z4&I4k<^jJ9BnBaFu_hmBiOMt+Vt&WfTU+x6lhE0fK9_LYP4y3ZV5@R-_JN; z)2p}|ajb2PB69<;gE~pDT})A(Q<6k`+=!0PPz`tqo#J^L)aez++Wx1Z8t}4+kMPG0 zRVzy@-|dMvGHfs3FDfsKPw)QxiF-Bp;SN7yH{xB5{V>*99pYhD6H{^j^(hO1g>sT4 z3AD%ZY1C@x(+F+`;{jF|yQ02K3c8^hg%?$TcJ(2X&W)BfgZ!>QBH8#T|H<81F?ndR`Prft1+Rh$<26XoZ8rsByH* gdi0TONAAdIh|TFW(Gzy~24z)XclvUdn&q|d1uX)GA^-pY delta 71 zcmeD4e&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 zcmb7{PjBK@6vdy7NgQJm6PzK;goG*@MQWuf(}X{fI%=>@6lid*yf7NcqnfM==~QLW zs%oR^kt|TRt-k=3SadZ~H6NkrqEZ)Kbl24^y6L9NF0x>B4Hv8w2;M}Tcbl+_wUcr4bK!a_Q;`{W9j9L-L`ak%0;eaNwhB&5W1z8YiUa_8)>^u zOBIKU{4Ps^eHj6vYnf6dZMQYEdcsBi99#xM*UVZqZIz8@X`9oI^$&^q(9%m4-rfe) z@3$JTqxCi8ngk&B4y^Zx`cAQIJp11^u1NsafwcaOtvBNmsGKk~o* zO|#!rzfb&AP5z=+TflnpS-rdMo|A6UZAyGM{=>I!ow#+m-|zQH@2yyfyX?h69QiTP zU31T+#nx(=CsA_Ns(*JzNbl@bIP_PN|449OZ^WOd`%WqInAqFT-wol^1`YWZEZsb{ zcYF)5L#eL4`fp=}+p(`If^}q_h|W>jh+3wVDQ0p+bZVgVa{B1=FIq3Y{KS2oN-bQ= z*D|;63Y+IkFP}p_<>00J)#eAx{E0r!IHFTDPGmxOB5JgBOzf-oX$F>Q%_N>l)K#Zc z$#5`x*aD84a12_Ndoa63^ZZj>x37u<%@hWgbI9f1W=2#MYexy8t1kY!{nPi3%)KVMCtc?`0Gkd>*BX^a8}QIMhBX0X}M5lx^43=%^~ z>^9_1#y$pFMaJro!RCCRX#(BHAaR7m0|zN$5Ov64L=6tXAZr+8EigkH24T`Ygxm`b z!5|4_B!V&+)o~>22w4vbp*jXhA|p8`gLz*b?-^iVkoyR^KPSY;z#tEh@nANC-F|aw z0xe;X4TNmWhD>5$kQ6df6B%skD_j%kAqLq*$mT@IOa=zoLdKS#!SKv54WgPUX`LB0IQgL?Ub!)Y`8(7ECBq4$!{hwe*0 qANoJ^`7nV)7^}Jk=UmbvaFBttC4dw%|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 zcmZXQu}Z^G6o$`D(^}G~sg0A3S2v09i6GR9r2)zUPT+t@=e>T(v5f+LO{CESM zq$u&6foL=8Sm$T~O-qCDS+XpA=%DazfR^8k3D#&H}& zXF8ie?M^m<;BF)u=KD%tIFyv29~xnB-2mt`9+HXsacN8D-O1dVzUr6EMPT`zg~adI zz7P5%Q0!J&;g293nlt?HG&zV0?6M-$GTl!5Wt;R=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 zcmZ4Kb={ZCCD%8Bli`EHW0_z$uHDb zA;8lmLLr*b$;a87K}0pc+0~0FS{cOq|Gyvuq@tj*o-vaFWJt6+NPG!{h_<7rO9X~8 z#!Lo~VFe%}0jf4Z#Dy)uCD@m5fe-8C3_)QofeYp*p9Y&&`A!snR!(lh z0_DkB3=1SDXL2zu5S~;!Ie}qv0?+^d|Nk>AQ50lmY+NG9%*e1%e1YiXEH3r}Ayy^^ zUWUYigpNc8h9!xcS($AW(wy1i-2+@X;ypZFcpaSsJPiyC%os#0<6R958KRYA^qFB{ z2=N}0K!CGfNVGbV07!+1aJ;L52}4^9IPCqxT!Oe71bjs|=PL6vsz*0@u>^Po1VL;I z@Cz_-G%#b}h!6F2;SF&1RPe|zDaa{JpB%0t%XWn42oIyg~09jj*H2?qr delta 75 zcmccayV8rxCDG&EEVc?F8u9J{t{m|mo-VwO&H|H|BZ)KS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zbAYpFs6v3Vr;9>#L$Iq?JR|oR9xj&XMs5(t*~!4wOCh?!${|dbDzCd(x78iSg5GxY{ zFGFHMLPsJ4!;-|!0nE20gZx?I-2+@X;ypZFcpaSsJPiyC%os#0<6R958KRYA^qFB{ z2=N}0K!CGfNVGbV07!*^ujpncS$;w8(j_@4eVU(EcFPF*X#}WgwP{564@%8Bli`EHW0_z$uHDb zA;8lmLLr*b$;a87K}0pc+0~0FS{cOq|Gyvuq@tj*o-vaFWJt6+NPG!{h_<7rO9X~8 z#!Lo~VFe%}0jf4Z#Dy)uCD@m5fe-8C3_)QofeYp*p9Y&&`A!snR!(lh z0_DkB3=1SDXL2zu5S~;!Ie}qv0?+^d|Nk>AQ50lmY+NG9%*e1%e1YiXEH3r}Ayy^^ zUWUYigpNc8h9!xcS(&xugZx?I-2+@X;ypZFcpaSsJPiyC%os#0<6R958KRYA^qFB{ z2=N}0K!CGfNVGbV07!*^ujpnsC4NTr=q4|g0FQtmh{*wd0S1l+W(*whp`I?h0nVNZ u9{D8&Ii=~74U}csj_@4eVU(C0tenZ^#}WgwP{564@=;}5b`ds^Eerr-B#KJ_ delta 71 zcmdns-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 zcmbQ|cG{E6CDylgPr07oIMSq8v>kzLm0V_@NjWNHwu6_ z&H>Jzp$Y-co-PW}4Z*Hn@r>MOc(_=i8@WLoXD0(!FNNp^CqLgHM(!&RZ6J=blV7N> zLV%}BghDi&teo70 z1vof2=1^KhYy9c;(#Cv$U@H#pNcp4ZOm@$Z0#=9CAGDIuK=rhB@ z5aK-~fdFT}kZ5%z0gws-U(wA0iu{b~(M?_~0UiNC5R(J^0t_4t%osT0Lp@!11Drh- tJn~Bla!S)DTPex19pO2`!zeL1RwS delta 71 zcmX@@InRyDCD2=(S!5WhrZScQU@7k&@V`@DZXJiK^>{lxEH+yp=$Kj8!A z%#5wOBJl(x)a3(4k}lH62G;n{lt37vJ%EqlVbtGnIP%uX6R>YH5`+qGN~)@SS32_3Gn9c0;fqoqfqkb%{f+-@C<7Um z%aZ=}rnW!L{3Nd?>AH+_In|NMpWqtSV)iZvE!qD}pJ zi!kcC?h4osMBpw1Z*DHt{{3)r-X(#NxXTwW3DRLkbLZKOt0?5JLzT5zXOhff=C<4w z&_s{=bw;SuK75w%pX@kC+sB6|M_b#+poyg0!n!6%C$Z`nuc5IqHqiCr`9g+cbyF^4 QK30og3#&8sw44rq0OyI3l>h($ delta 71 zcmca?zto1yCDD+yKS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zbAYpFs6v3Vr;9>#L$Iq?JR|oR9xj&XMs5(t*~!4wOCh?!${|dbDzCd(x78iSg5GxY{ zFGFHMLPsJ4!;-|!tjrH3gZx?I-2+@X;ypZFcpaSsJPiyC%os#0<6R958KRYA^qFB{ z2=N}0K!CGfNVGbV07!*^ujuB#GW?9{(M?_~0UiNC5R(J^0t_4t%osT0Lp@!11Drh- uJn~Bla!S)DKbMtdJHm5>hf!iOms}>7A4?3#LIF3H$u)Ae>>_L+TNnVanu~-0 delta 71 zcmaFvu+x^yCDylgPr07oIMSq8v>kzLm0V_@NjWNHwu6_ z&H>Jzp$Y-co-PW}4Z*Hn@r>MOc(_=i8@WLoXD0(!FNNp^CqLgHM(!&RZ6J=blV7N> zLV%}BghDi&teo70 z1vohb7Wb$X3{7^>NR>U&i)xeM;S~*6a85U{~4DJ&8QyT mc7*2$52M6n0l7?0f6W+>g#zxAo8;`+MA$%