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 zcmdmN`_O^QCD%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($H3GWoMiekdbsD`FY%YGB9^tsJAz3=1`o!~g$B5(sei3yD@o z5&)?X@D<(sU51}gJ-W$@CBP#fh$G&^(}g#{FTlXjz>I+-J`}`r_Ehl5FDb|=O`rTw lR+jAu&k-I*iODQ-nOuG>F(3;C+*l@;$=R}tuz_r00017ch|>T7 delta 57 zcmaFpu-TT&CD*D+yKS90tV5j&1XHSFZh5+Z_5Jv7JJX{>njRGK! zbAYpFs6v3Vr;9>#L$Iq?JR|oR9xj&XMs5(t*~!4wOCh?!${|dbDzCd(x78iSg5GxY{ zFGFHMLPsJ4!;-|!tjrwpLH;c9?g6eG@gANoypGNRo(2X6W(*>h@va7j4AIIl`pmE} z1bO5CeU#j2zKTUMv9~0YQ@kWkt9HoIMph@=FSGO4BFv lDa*1Q;W@&?C^6YkIg`teB?e@JfE&x?#mctqB5WXI82~K;h9Up} 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 zcmX?V`#Y4&CDylgPr07oIMSq8v>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|FhyVYNBoN^27ZRQ?RQKLv)i( zumMOoIMj~;EXg1u6z}R~zz7O^kdpY|P(Kmzc$Z*bo+Y5L%gD^ihKWZvIkE&BSj2OH z6fuIe^Dr5SImq`f)MA3}M1%2!1o5?%-mEnZb-?M!grz(Rd9pf`$bb z3(OD}BtwWa1LhD`m>H}LBK4$%suN4FG0Y)sFhkf#c8D>|A?zIS^^kaHC)p4am_s;V z4&fl(42$@Ba2ny_gc-s~vLU80hj78n;3C0{dcWu#YzcFSFw78P zs3F9g;Rthx2-J*v1`*N?fjLAJY6ycU$!0h~9a7IF1~WvAbVFbc5r>%}PO2I8!Ol>Z za7n-nks#HOU}u;^Bw=Pq5@|-g4=C|~%K#UcL!@AaND*lWk{K|ENW;vK#&1S_urF%O z>BJK33Ui1I%n%v;hF~)T<`7w!8M0W-sK;4_JFx`2!5kt7Gei!nA$ZMzIYb_2hCH$v z^@OTl5kFa%FuxF{1>Dscj0|m{R!Qapp6U!PCJ@IW9>QT^XahACARG=52PPxH&=zcD z09B>{;=p7a7}|o3>tRw2ARb7Hw>pEH0c4X2ND9mYS!Dv31KDK?mjhX53YP=fW(Jo7 zS!V{91KDQ|mjl^nZV_Lfxq!bq1Kc`dXbZLgNkjNd3?M#8Glb6q;#(r*Ilz2`ya0&r zh>%wR^AYk6Aifhqz5&d)sE>y^0PJUHgaQVTubmMFFo68+f+P>}xeJm!$nUO5@*v;4 xBFTgN?}j7~3IR7zu!_io+PMq`44{TQD6&C41x6^tg^O8404yJ;2Z~}469B$OOt%04 delta 73 zcmewzdeoN7CDttC4dw%|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 zcmZp6+~~sP66_LUsKmg)=(&;WH&eZUpP*iRuv2`1v!_9HLx6K|2qX6q9xjgPMgb7V zIl$R7R3X6G(?ub=A=uR`o{{?u4;M>xBR7cS>}25Tr4ZfV5!9@^SWN5K#?qcJ*S4RtE9@|1Zb@sVJzdXUt>(84|4y5?{g~qV4GE5`m$N zF_QsgSOJJgfT~RpabXK^3HIe%;KMpOLr|DY;DY(dr@^LGz7xe?`AQyk_ALOJm6MyW zKzVW&!ve|4nOsZ@geTQbPGFdv!1MqA|Njh26a|?X8LZa1? z1VAbTd_^}Om*Zztk8bi}3GfIA;)wU~bm0x~3ovjrFk|3|4+Zg@Jrz9iOA2yI(0007{mhnxTa delta 57 zcmdn!((K6P66_MvtiZs)7_^b=H`8VnmetaXB9kx53o{Ei3T{?Z;Afm%qnOU=#u5`B N>=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=d1N|40G>&VC`$>PP}06(Yj%t_CIyZ86}m_X~3g;%X4^72TYx%+IJE-Q>j*;1Li6 zu`R$az`)VKjDaIQ)YFAGz}Zv5Bfq2|r!;+XxQZ;>5uPJFj1rTpR5H2zSYkkq5O8Ce O{6@u=U4#u}GXnrwTaYyX 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=d1N|40G>&VC`$>PP}06#~AZo1J9&8P%hkyjTJ}0)ikW2lxdTI2xESaKwjty6^@# xdn$P3mlWibrcc(9lVv-?bA*RcVzR$nCYK*e49G$OH0000S>iUj}w delta 71 zcmZ4E_|KNhCD%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=d1N|40G>&VC`$>PP}06#~AZo86T78P%hkyjTJ}0)ikW2lxdTI2xESaKwjty6^@# xdn$P3mlWibrcX9dmSsD_bA*RcVsfx@CYK*e49G$OH0003hoic0_h 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@ z5af;j|B(a&oc%(g)sX~1Dg=B*HwP&4Gpa{7d9eg|1O!1$4)6;wa5OMu;D`_Pbm0wf w_Ehl5FDb|=O`mL~B+GV$=Lip@#N=3|Oiq8+7?6bm?vu|e`Lm0#fh=JF0Q)D3kpKVy delta 71 zcmX@@InRyDCD%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!xc%b9LV2KlqZy9c;(#Cv$U@H#pNcp4ZOm@$Z0#=9CAGDIuK=rhB@ z5af;j|B(a&oc%(g)sX~1Dg=B*H)qQ5GkQfgd9eg|1O!1$4)6;wa5OMu;D`_Pbm0wf z_Ehl5FDb|=O;;#NEzU13N=_|i;D`?napdCWh<6SO7UbpPa%VikbA*RcVse>mCYK*e V49Fn@ZY+~u$l9`tuz_r6008HSk(B@d 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=d1N|40G>&VC`$>PP}06#~AZoBzu2Gpa{7d9eg|1O!1$4)6;wa5OMu;D`_Pbm0wf x_Ehl5FDb|=O`rT+R+jAu&k-I*iOF1YnOuG>F(3;C+*l^p$l0=suz_r0006L>i-Z6G 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|FhyVYNBoN^27ZRBGyNooWdUTT)OMpi}5J$X+rwea@Ux0z5ff)lwd?<+L?5W_9Us8}$nm+lh otSs9Ro+CVr5|ahwGCBPM5&!@I delta 62 zcmdnzI?;*CCD