From 6e2e2e8a422040358effc9eb8c840875cdb351bc Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Wed, 23 Sep 2020 05:46:49 -0400 Subject: [PATCH] tests: acpi: update acpi blobs with new AML here is diff against tests/data/acpi/q35/DSDT for currently shipped ovmf binary. (once firmware blob is updated, it will negotiate CPU hotplug feature which will ad extra hunk sending SMI and Q35 tests will need to be updated), but otherwise diff shows new CPU hotplug AML that is shared between q35 and pc machines. Method (CSCN, 0, Serialized) { Acquire (\_SB.PCI0.PRES.CPLK, 0xFFFF) - Local0 = One - While ((Local0 == One)) - { - Local0 = Zero - \_SB.PCI0.PRES.CCMD = Zero - If ((\_SB.PCI0.PRES.CINS == One)) + Name (CNEW, Package (0xFF){}) + Local3 = Zero + Local4 = One + While ((Local4 == One)) + { + Local4 = Zero + Local0 = One + Local1 = Zero + While (((Local0 == One) && (Local3 < One))) { - CTFY (\_SB.PCI0.PRES.CDAT, One) - \_SB.PCI0.PRES.CINS = One - Local0 = One + Local0 = Zero + \_SB.PCI0.PRES.CSEL = Local3 + \_SB.PCI0.PRES.CCMD = Zero + If ((\_SB.PCI0.PRES.CDAT < Local3)) + { + Break + } + + If ((Local1 == 0xFF)) + { + Local4 = One + Break + } + + Local3 = \_SB.PCI0.PRES.CDAT + If ((\_SB.PCI0.PRES.CINS == One)) + { + CNEW [Local1] = Local3 + Local1++ + Local0 = One + } + ElseIf ((\_SB.PCI0.PRES.CRMV == One)) + { + CTFY (Local3, 0x03) + \_SB.PCI0.PRES.CRMV = One + Local0 = One + } + + Local3++ } - ElseIf ((\_SB.PCI0.PRES.CRMV == One)) + + Local2 = Zero + While ((Local2 < Local1)) { - CTFY (\_SB.PCI0.PRES.CDAT, 0x03) - \_SB.PCI0.PRES.CRMV = One - Local0 = One + Local3 = DerefOf (CNEW [Local2]) + CTFY (Local3, One) + Debug = Local3 + \_SB.PCI0.PRES.CSEL = Local3 + \_SB.PCI0.PRES.CINS = One + Local2++ } } Signed-off-by: Igor Mammedov Message-Id: <20200923094650.1301166-11-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/pc/DSDT | Bin 4934 -> 5060 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6258 -> 6385 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6793 -> 6919 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5397 -> 5524 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6587 -> 6714 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5006 -> 5132 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6293 -> 6419 bytes tests/data/acpi/pc/DSDT.numamem | Bin 4940 -> 5066 bytes tests/data/acpi/q35/DSDT | Bin 7678 -> 7804 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9002 -> 9129 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7695 -> 7821 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8141 -> 8268 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9331 -> 9458 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7753 -> 7879 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9037 -> 9163 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8808 -> 8934 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7684 -> 7810 bytes tests/data/acpi/q35/DSDT.tis | Bin 8283 -> 8409 bytes tests/qtest/bios-tables-test-allowed-diff.h | 19 ------------------- 19 files changed, 19 deletions(-) diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index b121bb5bc124be522e233516efb17cdc94de5a75..4ca46e5a2bdb1dfab79dd8630aeeb9a386d8b30e 100644 GIT binary patch delta 323 zcmX@6c0`@aCD?R*zTg~KaJUN&BFO!?tJp-V1deHm^e(>(=V8@ zAh`qN$V7(H!~({Ih2{%PF_Z=QhA}#axJ4#&F&8kRn-Sz2R=}80nq0t;w8)iZYEoiB kGuXf+hGb`MkS4~0c!G5)3}Gx_L>Kk+ p3oc+xSm@2Nz=LJ74X30ox&jx+5H4m+eL=oq1&j%scXM)b0RY1ZHLw5x diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat index b0dbb943f4cea83a5adde23aefa54f1678c560a1..35a74bce8cc152ecb615cb38c4b7f63c7c7d3ab3 100644 GIT binary patch delta 304 zcmexl@X?UVCDnK!N}<@<{a$o#}TbOnUO=- z>HmKYXFu0)A*TNY49NwIDT`c%CZ{kKFr*YPCKNCvF7oA>Fgby7YBCp70YgGTa*RGp ze6Uk|fU~DTK#*&&bFiz=ZZv2P>S7B(g?o5=^*Rx|k;Zq8-rVC3}Ra}IX)ID{_iTIET1JqD#9t xhA>Xvz$xlqz?iVmn`MCq%VcyVLB3&(IJ9yx7cgQ`Uci_zIi5po^Ic96egK1wI`04g diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge index 7b6c7a47875fc73b03fbe88807890f3867ddba1a..803d7a8e839ea8b7ac33c4490459ddaede584269 100644 GIT binary patch delta 323 zcmeA)Z8zg`33dr#mu6sK6xqnNg^kI}Zt?-P)l9y|lXKbsGP#LO&f$=$=WzCO4Hshi zU%-%Dz?ibgMQCygV*x`-0b@b|L*gPIo(Yo^7^fyP7BD0fB**Bp#0NXY2RM5g1O&MT zI|sY^6fmF*I{UgT5TA-J>f#uZymSHQonzZ33dtTlwx3DZD_~4mi;gr-xSK#6p!o`fKFUU8nfH7h7ZcZOT05hyLF#rGn diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index c0e8aa5b32d84f39e5d6c9a5024505f818707c12..8bab2f506409f2b025a63d8b91c7bfdaa931e626 100644 GIT binary patch delta 251 zcmbQLHAS1tCDrXoJo!Jn=;TWr zB23~_Co^&i^CmA{z&SaQ>wf`b%F+Umh)ePUmB}&sEb+lk@d3`B1_42?!Oot3!HfmT z9UzMm8A=li7!wwnFEGVW7UUbo=p5n}nLIh3Q%bQkxqu;Qkt@s8q{M<|u-+twWUw@2 eL2|TVLGtAFoT{vze!-KrRx|l|Y|dr3WMuc?a}IX)3nF6IJ8bQ6Po!wMJ^CQslH+swz+#ti_`Ry<_@ diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm index 1649953b6cccb933e4a440dc56507dc9197c4a8a..e015b4594c96a6e0f34c0668e3383b9a91dff38e 100644 GIT binary patch delta 308 zcmdmOyvu~kCDKo@lOby*-j6lFgQD$vVbw6G`WBwX^|_-)TG3MX0U-t f49Q?Uj0MTjh6Tx!{W(-wJ^g}9lQt)CMhgG{7sn7T<^smaiJZdB1&j%s?{h{A003wpI)wlL diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs index 92748d49dcd418e4a734da47e8d5c0268aedfc29..ca6630e39f60ebd5c056f57c4c03fdb9d5467577 100644 GIT binary patch delta 304 zcmeBE@6q6L33dtL5n*6pjNi!hhmFb0ZZZe^Y9?Rf$y?d~*1L&02Rr+5L@USWv&08G z#RoWh8UzHn20I7%c>n*;;q2!cF2wY|fFZenF=dg9(Bu@x0)~_V#)JZf#6>*@e<_kNOW-*#}LK>Ms!h6 ozu*GKgoWNL3p_B53i1uZWfT`P$gIgrI7KEe+d@E<%%27z-Fu3K$a#7!nux@JyJTz&JITv4A0=AUQ^#B|g|GKET=2ARx#! z*g4qMr+@)n(An2zf%sH(Q5VOM delta 193 zcmbPiG}VyHCDRCMULE) z6Br8^5(*e58*&NzEpTU<9HY+?AM6w#;OuD-5ab%{?CBTG=p5n}i7xKq7{XY+d@E<%%27z-Fu3K$a#7!nux@JyJTz&JITv4A0=AUQ^#B|g|GKET=2ARx#! z*g4qMr+@)n(An2zf%sH(Q5VOM52&7B(g)^T`L;Rx`QkOwMKh%jCf~Ifp}ruYfUOkt6ry z1jYh}gaU@ihFrpa3*1>I$LO=f2Rp?FIC~ld1i1z~d-?@4I)}JLqKmsYhA*^RyE*x}0EkvKU;qFB diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index bba8884073a27427b88ac0d733c9c87330a59366..d6c26940b1a68d4184f6f2335924099aa28b130a 100644 GIT binary patch delta 249 zcmexo{l|vOCDUq!chF6fh(%^5K~`7!OO)OwcSZKb$6hm2%Zy2L7BqwPCNU&~r5Ov7 cqYVp^C;LmQvU>UjmnKa%kP_RhFMXZ~0P{LetN;K2 delta 203 zcmexk^Us>gCD~t63UDT ziyXNpComQ;Bor{j=(EHJJH-b$dm01;xduBs`?@S}XPNv_N>su*#4QqC+Ql)1adLyS ssDA-t!a{GB1s*Ju(Uk=GhB4yM%Ees3h(&n;W5Q$uDY4CKrOz_~0BwfB{|5+1F)(_*8UJ7srs~r3*MGCvyESU`$zB0F^g`n*~y^KxHzz zK2N`3#)9MykSh}zN)rnh6Be2;Fr9o)N|G^oGMBWJVrg;#L((EwmZ?dJ1 delta 203 zcmZ4KzRHcuCD?k9;d582zb^tg8IBoy{ diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge index f08b7245f59aad491fcaa60e2bab1085c369ea1c..0f6c9c68c81cddd2126eea8a7c336b8667202223 100644 GIT binary patch delta 249 zcmeCT>9yr@33dtTm1AIF4ByB#L4wK4Zt@(7)l9y|lRYK>vb%{n2Rr+5OnxsZuEXK% z=Nc}=^uK^1xqvZck&Dpe6vhIElmfUs7~(k(3CN z_|(Y@rG$BtmoDI(oXGXRfH7rh0Z7Cpd4bC07=4!bV5j&1XHSEGAlG1LPrqQsg5(a6 zJ&6pZi3N-a3(XgpVkisp4P$f;af?iz{9j5+u{61WA!(5-%haUAf@ZMZB!* cv|&N=WPfQ@R!_g+(xk}-QevC+r5`W>0M+|Wk^lez delta 203 zcmeCR?YH4_33dtLmt$aH^xnudL4wK0Z1Nn5)lB}{lRYK>vU~732Rr+5OnxsZq0E@D z$dP+;0%HL~LIFdJK1+PCQ+$B4r$IoFYp}Dkugd~=mdPKbL?xU<+#=DXT^vIgCpSoo r`WG-JEc9ks;K4E(T}hB{7$Xj?T+9WGSd=Rx|kqZ1$A2WUO}=a}IX)_snLa?h(0Ry_Av#-kn@u_gp5U6b~jv>iQ7jRBavQVJLo3K$X>`SMJdoWM9WnTw@>A)z2SMxP}<*eO21+0!5( z$TiqG*wv?i0bS79*JXkDRCG}n$B^Wu3pghya{Vu0Oj%k0m9K}J1yZm;Wiq-xPrqQs zg5(a6D-#(?6AKs<7Md?G#ZVUH8^-7y;ue|A#azIMZbp!ASOH@~X>tKW(jr%usY!_i k&0qtQ7?OFwniva`qYVp^Cu>WovU>UjmnLntkv8W909yEBod5s; delta 194 zcmez5`PqZZCDVAk*+yDY7hQpiV+a>BroJHGumZ+}&AX+|IRPB?Hc?S{#Sk2^XJb8-bUv@V!=U`_)j>#7##p^ko z{anL^nEn?qBo{EIEOHT=oWfYZkW#>yP{5G5$cJabwf`b%F+UuyeZ5qkb(s&lVRd8 zVNbtc#)9MykRuZrN)rnh6Be2;Fr6$XEy{q9CDcG{iGCD?hBWSk2^YGTBq|FT0zVbFi}?$K>~t;yN78 zey-s{O#cfQk_#A97P$ybPGKxyNGV`UC}2oj0NN~0=>Px# delta 203 zcmX@@e%6i4CDUq!chF6fh(%^5K~`7!OO)OwcSZKb$6hm2%Zy2L7BqwPCNU&~r5Ov7 cqYVp^C;LmQvU>UjmnKa%kP_RhFKx*V0OZO~3jhEB delta 203 zcmaFn`oe|FCD)i<1PLZ5^T~50Rx`QkO!k!g%kIJF9PI4JG5Niugfe5o zB1i7Y35*2{2?Y!>`YiFmPVoWGo(2IyuEEaEzAg*gStfs!5|wZcaf?Kkc5w`0oZKKS r>R-T^u+W=jfd|WEbR|K)VT?GmaxoV$Vo_eem@wHuN^J95X-jqhp_)1g diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem index 1978b55f1255402bf9bade0b91150b5cb49789a4..2b2433cc13ec3110abbc8440a0b1ad8c487edb6c 100644 GIT binary patch delta 249 zcmZp%X|m;V33dr-l4D?COx(ydL4wJ_e)1fN)lAMNlRYK>vb%{n2Rr+5OnxsZuEXK% z=Nc}=^uK^1xqvZck&Dpe6vhIElmfUs7~(k(3CN z_|(Y@rG$BtmoDI(oXGXRfH7rh0Z7Cpd4bC07=4!bV5j&1XHSEGAlG1LPrqQsg5(a6 zJ&6pZi3N-a3(XgpVkisp4P$f;af?iz{9j5+u{61WA!(5-%haUAf@ZMZB!* cv|&N=WPfQ@R!_g+(xk}-QevC+rLQsp0I!x#UH||9 delta 203 zcmZp&ZL#5U33dr#kz-(B4Bf~zL4wK2eDWNL)l9BBlRYK>vU~732Rr+5OnxsZq0E@D z$dP+;0%HL~LIFdJK1+PCQ+$B4r$IoFYp}Dkugd~=mdPKbL?xU<+#=DXT^vIgCpSoo r`WG-JEc9ks;K4E(T}hB{7$Xj?T+9WGSd?Y5VSk2^XJlRw7FT0zVbFi}?$K>~t;yN78 zey-s{O#cfQk_#A97P$ybPGKxyNGV`UC}2oj2mk;8 delta 203 zcmccVc-w)?CD`YiFmPVoWGo(2IyuEEaEzAg*gStfs!5|wZcaf?Kkc5w`0oZKKS r>R-T^u+W=jfd|WEbR|K)VT?GmaxoV$Vo_eem@wHuN^J95X&qJor?xr< diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dba32d5613..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,20 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/DSDT", -"tests/data/acpi/q35/DSDT", -"tests/data/acpi/q35/DSDT.tis", -"tests/data/acpi/q35/DSDT.bridge", -"tests/data/acpi/q35/DSDT.mmio64", -"tests/data/acpi/q35/DSDT.ipmibt", -"tests/data/acpi/q35/DSDT.cphp", -"tests/data/acpi/q35/DSDT.memhp", -"tests/data/acpi/q35/DSDT.numamem", -"tests/data/acpi/q35/DSDT.dimmpxm", -"tests/data/acpi/q35/DSDT.acpihmat", -"tests/data/acpi/pc/DSDT.bridge", -"tests/data/acpi/pc/DSDT.ipmikcs", -"tests/data/acpi/pc/DSDT.cphp", -"tests/data/acpi/pc/DSDT.memhp", -"tests/data/acpi/pc/DSDT.numamem", -"tests/data/acpi/pc/DSDT.dimmpxm", -"tests/data/acpi/pc/DSDT.acpihmat", -"tests/data/acpi/pc/DSDT.acpihmat", -- 2.49.0