From 30f71c4afb1605c8d2d753422a5856977a12cbf7 Mon Sep 17 00:00:00 2001 From: Yicong Yang Date: Thu, 29 Dec 2022 14:55:13 +0800 Subject: [PATCH] tests: acpi: aarch64: Add *.topology tables Add *.topology tables for the aarch64's topology test and empty bios-tables-test-allowed-diff.h The disassembled differences between actual and expected PPTT (the table which we actually care about): +/* + * Intel ACPI Component Architecture + * AML/ASL+ Disassembler version 20180105 (64-bit version) + * Copyright (c) 2000 - 2018 Intel Corporation + * + * Disassembly of /tmp/aml-WUN4U1, Tue Nov 1 09:51:52 2022 + * + * ACPI Data Table [PPTT] + * + * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue + */ + +[000h 0000 4] Signature : "PPTT" [Processor Properties Topology Table] +[004h 0004 4] Table Length : 00000150 +[008h 0008 1] Revision : 02 +[009h 0009 1] Checksum : 7C +[00Ah 0010 6] Oem ID : "BOCHS " +[010h 0016 8] Oem Table ID : "BXPC " +[018h 0024 4] Oem Revision : 00000001 +[01Ch 0028 4] Asl Compiler ID : "BXPC" +[020h 0032 4] Asl Compiler Revision : 00000001 + + +[024h 0036 1] Subtable Type : 00 [Processor Hierarchy Node] +[025h 0037 1] Length : 14 +[026h 0038 2] Reserved : 0000 +[028h 0040 4] Flags (decoded below) : 00000001 + Physical package : 1 + ACPI Processor ID valid : 0 +[02Ch 0044 4] Parent : 00000000 +[030h 0048 4] ACPI Processor ID : 00000000 +[034h 0052 4] Private Resource Number : 00000000 + +[038h 0056 1] Subtable Type : 00 [Processor Hierarchy Node] +[039h 0057 1] Length : 14 +[03Ah 0058 2] Reserved : 0000 +[03Ch 0060 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[040h 0064 4] Parent : 00000024 +[044h 0068 4] ACPI Processor ID : 00000000 +[048h 0072 4] Private Resource Number : 00000000 + +[04Ch 0076 1] Subtable Type : 00 [Processor Hierarchy Node] +[04Dh 0077 1] Length : 14 +[04Eh 0078 2] Reserved : 0000 +[050h 0080 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[054h 0084 4] Parent : 00000038 +[058h 0088 4] ACPI Processor ID : 00000000 +[05Ch 0092 4] Private Resource Number : 00000000 + +[060h 0096 1] Subtable Type : 00 [Processor Hierarchy Node] +[061h 0097 1] Length : 14 +[062h 0098 2] Reserved : 0000 +[064h 0100 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[068h 0104 4] Parent : 0000004C +[06Ch 0108 4] ACPI Processor ID : 00000000 +[070h 0112 4] Private Resource Number : 00000000 + +[074h 0116 1] Subtable Type : 00 [Processor Hierarchy Node] +[075h 0117 1] Length : 14 +[076h 0118 2] Reserved : 0000 +[078h 0120 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[07Ch 0124 4] Parent : 0000004C +[080h 0128 4] ACPI Processor ID : 00000001 +[084h 0132 4] Private Resource Number : 00000000 + +[088h 0136 1] Subtable Type : 00 [Processor Hierarchy Node] +[089h 0137 1] Length : 14 +[08Ah 0138 2] Reserved : 0000 +[08Ch 0140 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[090h 0144 4] Parent : 00000038 +[094h 0148 4] ACPI Processor ID : 00000001 +[098h 0152 4] Private Resource Number : 00000000 + +[09Ch 0156 1] Subtable Type : 00 [Processor Hierarchy Node] +[09Dh 0157 1] Length : 14 +[09Eh 0158 2] Reserved : 0000 +[0A0h 0160 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[0A4h 0164 4] Parent : 00000088 +[0A8h 0168 4] ACPI Processor ID : 00000002 +[0ACh 0172 4] Private Resource Number : 00000000 + +[0B0h 0176 1] Subtable Type : 00 [Processor Hierarchy Node] +[0B1h 0177 1] Length : 14 +[0B2h 0178 2] Reserved : 0000 +[0B4h 0180 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[0B8h 0184 4] Parent : 00000088 +[0BCh 0188 4] ACPI Processor ID : 00000003 +[0C0h 0192 4] Private Resource Number : 00000000 + +[0C4h 0196 1] Subtable Type : 00 [Processor Hierarchy Node] +[0C5h 0197 1] Length : 14 +[0C6h 0198 2] Reserved : 0000 +[0C8h 0200 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[0CCh 0204 4] Parent : 00000024 +[0D0h 0208 4] ACPI Processor ID : 00000001 +[0D4h 0212 4] Private Resource Number : 00000000 + +[0D8h 0216 1] Subtable Type : 00 [Processor Hierarchy Node] +[0D9h 0217 1] Length : 14 +[0DAh 0218 2] Reserved : 0000 +[0DCh 0220 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[0E0h 0224 4] Parent : 000000C4 +[0E4h 0228 4] ACPI Processor ID : 00000000 +[0E8h 0232 4] Private Resource Number : 00000000 + +[0ECh 0236 1] Subtable Type : 00 [Processor Hierarchy Node] +[0EDh 0237 1] Length : 14 +[0EEh 0238 2] Reserved : 0000 +[0F0h 0240 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[0F4h 0244 4] Parent : 000000D8 +[0F8h 0248 4] ACPI Processor ID : 00000004 +[0FCh 0252 4] Private Resource Number : 00000000 + +[100h 0256 1] Subtable Type : 00 [Processor Hierarchy Node] +[101h 0257 1] Length : 14 +[102h 0258 2] Reserved : 0000 +[104h 0260 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[108h 0264 4] Parent : 000000D8 +[10Ch 0268 4] ACPI Processor ID : 00000005 +[110h 0272 4] Private Resource Number : 00000000 + +[114h 0276 1] Subtable Type : 00 [Processor Hierarchy Node] +[115h 0277 1] Length : 14 +[116h 0278 2] Reserved : 0000 +[118h 0280 4] Flags (decoded below) : 00000000 + Physical package : 0 + ACPI Processor ID valid : 0 +[11Ch 0284 4] Parent : 000000C4 +[120h 0288 4] ACPI Processor ID : 00000001 +[124h 0292 4] Private Resource Number : 00000000 + +[128h 0296 1] Subtable Type : 00 [Processor Hierarchy Node] +[129h 0297 1] Length : 14 +[12Ah 0298 2] Reserved : 0000 +[12Ch 0300 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[130h 0304 4] Parent : 00000114 +[134h 0308 4] ACPI Processor ID : 00000006 +[138h 0312 4] Private Resource Number : 00000000 + +[13Ch 0316 1] Subtable Type : 00 [Processor Hierarchy Node] +[13Dh 0317 1] Length : 14 +[13Eh 0318 2] Reserved : 0000 +[140h 0320 4] Flags (decoded below) : 0000000E + Physical package : 0 + ACPI Processor ID valid : 1 +[144h 0324 4] Parent : 00000114 +[148h 0328 4] ACPI Processor ID : 00000007 +[14Ch 0332 4] Private Resource Number : 00000000 + +Raw Table Data: Length 336 (0x150) + + 0000: 50 50 54 54 50 01 00 00 02 7C 42 4F 43 48 53 20 // PPTTP....|BOCHS + 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC + 0020: 01 00 00 00 00 14 00 00 01 00 00 00 00 00 00 00 // ................ + 0030: 00 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ + 0040: 24 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // $............... + 0050: 00 00 00 00 38 00 00 00 00 00 00 00 00 00 00 00 // ....8........... + 0060: 00 14 00 00 0E 00 00 00 4C 00 00 00 00 00 00 00 // ........L....... + 0070: 00 00 00 00 00 14 00 00 0E 00 00 00 4C 00 00 00 // ............L... + 0080: 01 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ + 0090: 38 00 00 00 01 00 00 00 00 00 00 00 00 14 00 00 // 8............... + 00A0: 0E 00 00 00 88 00 00 00 02 00 00 00 00 00 00 00 // ................ + 00B0: 00 14 00 00 0E 00 00 00 88 00 00 00 03 00 00 00 // ................ + 00C0: 00 00 00 00 00 14 00 00 00 00 00 00 24 00 00 00 // ............$... + 00D0: 01 00 00 00 00 00 00 00 00 14 00 00 00 00 00 00 // ................ + 00E0: C4 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 // ................ + 00F0: 0E 00 00 00 D8 00 00 00 04 00 00 00 00 00 00 00 // ................ + 0100: 00 14 00 00 0E 00 00 00 D8 00 00 00 05 00 00 00 // ................ + 0110: 00 00 00 00 00 14 00 00 00 00 00 00 C4 00 00 00 // ................ + 0120: 01 00 00 00 00 00 00 00 00 14 00 00 0E 00 00 00 // ................ + 0130: 14 01 00 00 06 00 00 00 00 00 00 00 00 14 00 00 // ................ + 0140: 0E 00 00 00 14 01 00 00 07 00 00 00 00 00 00 00 // ................ Acked-by: Michael S. Tsirkin Reviewed-by: Yanan Wang Signed-off-by: Yicong Yang Message-Id: <20221229065513.55652-7-yangyicong@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/virt/APIC.topology | Bin 0 -> 732 bytes tests/data/acpi/virt/DSDT.topology | Bin 0 -> 5398 bytes tests/data/acpi/virt/PPTT.topology | Bin 0 -> 336 bytes tests/qtest/bios-tables-test-allowed-diff.h | 3 --- 4 files changed, 3 deletions(-) diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/APIC.topology index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a6ac525e7faeaec025fa6b3fc01dc67110e1296 100644 GIT binary patch literal 732 zcmZ<^@N~Yz#K6F^$I0K>BUr&HBEVTeK|z6$fq?hRy*NUMfq{V$s-6W(Gec<K$u+fKzc!DfiTECRt5$J5GL0=kY12kAPh2( uje&sygvm7zq!(ls2!qUHXJB9eVRFp_=>?eu!o2Ww$plVUATu2p0vG^^#|;4h literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/DSDT.topology index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..501314c91be01d927fd125e0c72e919fdd85592e 100644 GIT binary patch literal 5398 zcmZ<>b_o#^Wnf^M?Bwt45v<@85#X$#prF9Wz`y`vgJ^+9f5w>jV5j)#CMjnF0|SnD z4^J0fN9O=f0|Ntd29EepPZtJ=oFO(j#^@$#X9EKxY;s&o5J_XKlFSfE6ReUf5J^+4 zlB^I(Gpv$q5J_{alI+nsUMFs|jN`~kr3%77*H;BQ3uD+oL1_nk99Pz;+j$GUv@y^bUj1VIPx%ePPFmXyi zbvm+y1;GN>$1lj=z`(#1VJ%!I!g4MKCaC2G$VNcp0M!VPwHQV)F(8aEgc{)las@Q1 zP>tYXLiPa687xR<7$KVhjZri+n6a6`hGd2@vKi2bM>B&3n;9HPW|$zG0ZkuhX0T#2 zgA2(FQ)Dxs$q3C1Hf(0_Aemu?Yz8#7p_##s%?v&yGt80Auz(~iG&4A`nIV8=h6S=2 zmRQZ;#Ab#Nk{OmrW*9;<2bw#$u$du(WQG;88Ca7kY9@iDF)<`FtdY&Yo=$nNxkCcU z3>#!Ku%}aAY-UIynPH1;2KIEyhs_KbBs1)g&A^^c`LUTHhh&C5vKiRZsQ@-J6p+kt zKsEz=Iu*obh7yt)j>u+UPp3lI%uqox!wK08?CDe(n;B|IW;i36VT3)MieNKC1IY{* zWHYd*Q&DVYXd#*5ifjh_ph+>p({o=(NFnW2YdhC8wu*wd*5HZu&6%_Ja;frL3G4^yShs_KdBs2Vw&A^^c<*}Jzhh&C7)C|An0nVOKcLewa7&sbO zFmS{>d%EyKc*dYsjH^2XN4%4hAG}!-91Gfb!0IHS=tkVe21L=e*Wnuv9G=S=4 zV&DSlgxSIj)(LX~GXqE`Oer%&ry*1)GejrM78bBhm|mWRrR)%$ zFvqh)bi!=m0PBRgfCH=(rj!Gs6Xtjhh)$R-oM4?W7jS}g!jy7Cbiy3Z3DF6&g$t|` z<^nFTPMA_Ih)$T}xga`Wws3=W!d$=&)(KO}4bcg6JU2uq%oZN7PM8aLz&c?{c_2Dr zj^}~sgxSIi)(LX~FIXo`DKA7P%<;SsoiJPYz&c?r-~;P~DdmIcggKrMq7!BdKUgQs z1^i&0Fs1wuoiNAqLv+Gy5diCixj+D{6Q)!Eq7&wL0fN<|<#VU8Dp=!DrK3f2j8fhbrfOsObDC(QAp5S=hv#K1aXE)WCjgeet+=!7|5 z45AZei#S*(%mw0LoiL^15S=i`i$iq6Y>@!#gtnMQYnZ|nB%1&I$^d*gLT4OAPv?DQz{M733I$O zL?_G^8L&>63uM4LVM=8nI$@5Nf#`(UA`8|DbAc>aCrqgx3zlgXn}gUJjxYW{W&nC(H%%V4X0f@(`Uc$IC->8ZksSd9r{iO-T0*R4F?fxWOyp zfS_POJ}z$XP=qqLN{5Uypo)pG#RmrkGeV7mwir;1V&sTNHcADHQ4le>QC=WdK^wRz zMuEl)kj+xXVirUU)huX37u76gRClRiF$*FFHA_Sw-r32KVF@1t1A_ple**~)4|cAS z4qgT(9tIHj462}9!*VDSPxmcWC!i~DJxj39%!i@_+9FRF6hB3&fY7oIC z4x0HYzO;Th`b!t3tp0%}Xb z(>XJvCO8p9H@F75x-;-FFmP~ku|zj=gSgJF!LB|EBC_$WVIiCaAWp&pfyvbgT%h(| YTR?b_6IVlYlO%`%u?&*hoT2#%0Q9UsJpcdz literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/PPTT.topology b/tests/data/acpi/virt/PPTT.topology index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3fbcae5ff08aaf16fedf4da45e941661d79c1174 100644 GIT binary patch literal 336 zcmWFt2nh*bWME*baq@Te2v%^42yj+VP*7lGU|;~TK{SI10|S_5KmsBVwhDxTkWeuT z2oFMvFfi~jFfjN)cn}gv3~nxxUSu(l-VO!^1}2D329R4|V$4WlASTEy$a+CyM?eG& rL+!o6z`($QMT`|m48#QKMK%v)uLvUp0~<&ZgrVkv#MnW61_lNI0DKMs literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 90f53f9c1d..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,4 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/APIC.topology", -"tests/data/acpi/virt/DSDT.topology", -"tests/data/acpi/virt/PPTT.topology",