From a023c4b2e754b6289fe066f61d2b77ecee871224 Mon Sep 17 00:00:00 2001 From: Robert Hoo Date: Thu, 22 Sep 2022 20:21:55 +0800 Subject: [PATCH] test/acpi/bios-tables-test: SSDT: update golden master binaries And empty bios-tables-test-allowed-diff.h. Diff of ASL form, from qtest testlog.txt: @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180629 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/pc/SSDT.dimmpxm, Thu Sep 22 18:25:06 2022 + * Disassembly of /tmp/aml-YYZZS1, Thu Sep 22 18:25:06 2022 * * Original Table Header: * Signature "SSDT" - * Length 0x000002DE (734) + * Length 0x00000717 (1815) * Revision 0x01 - * Checksum 0x56 + * Checksum 0xBC * OEM ID "BOCHS " * OEM Table ID "NVDIMM" * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001) { Scope (\_SB) { Device (NVDR) { Name (_HID, "ACPI0012" /* NVDIMM Root Device */) // _HID: Hardware ID Method (NCAL, 5, Serialized) { Local6 = MEMA /* \MEMA */ @@ -49,52 +49,52 @@ ODAT, 32736 } If ((Arg4 == Zero)) { Local0 = ToUUID ("2f10e7a4-9e91-11e4-89d3-123b93f75cba") } ElseIf ((Arg4 == 0x00010000)) { Local0 = ToUUID ("648b9cf2-cda1-4312-8ad9-49c4af32bd62") } Else { Local0 = ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66") } - If (((Local6 == Zero) | (Arg0 != Local0))) + If (((Local6 == Zero) || (Arg0 != Local0))) { If ((Arg2 == Zero)) { Return (Buffer (One) { 0x00 // . }) } Return (Buffer (One) { 0x01 // . }) } HDLE = Arg4 REVS = Arg1 FUNC = Arg2 - If (((ObjectType (Arg3) == 0x04) & (SizeOf (Arg3) == One))) + If (((ObjectType (Arg3) == 0x04) && (SizeOf (Arg3) == One))) { Local2 = Arg3 [Zero] Local3 = DerefOf (Local2) FARG = Local3 } NTFI = Local6 Local1 = (RLEN - 0x04) If ((Local1 < 0x08)) { Local2 = Zero Name (TBUF, Buffer (One) { 0x00 // . }) Local7 = Buffer (Zero){} @@ -161,45 +161,234 @@ Else { If ((Local1 == Zero)) { Return (Local2) } Local3 += Local1 Concatenate (Local2, Local0, Local2) } } } Device (NV00) { Name (_ADR, One) // _ADR: Address + Method (_LSI, 0, Serialized) // _LSI: Label Storage Information + { + Local0 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x04, Zero, One) + CreateDWordField (Local0, Zero, STTS) + CreateDWordField (Local0, 0x04, SLSA) + CreateDWordField (Local0, 0x08, MAXT) + Local1 = Package (0x03) + { + STTS, + SLSA, + MAXT + } + Return (Local1) + } + + Method (_LSR, 2, Serialized) // _LSR: Label Storage Read + { + Name (INPT, Buffer (0x08) + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ + }) + CreateDWordField (INPT, Zero, OFST) + CreateDWordField (INPT, 0x04, LEN) + OFST = Arg0 + LEN = Arg1 + Local0 = Package (0x01) + { + INPT + } + Local3 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x05, Local0, One) + CreateDWordField (Local3, Zero, STTS) + CreateField (Local3, 0x20, (LEN << 0x03), LDAT) + Name (LSA, Buffer (Zero){}) + ToBuffer (LDAT, LSA) /* \_SB_.NVDR.NV00._LSR.LSA_ */ + Local1 = Package (0x02) + { + STTS, + LSA + } + Return (Local1) + } + + Method (_LSW, 3, Serialized) // _LSW: Label Storage Write + { + Local2 = Arg2 + Name (INPT, Buffer (0x08) + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........ + }) + CreateDWordField (INPT, Zero, OFST) + CreateDWordField (INPT, 0x04, TLEN) + OFST = Arg0 + TLEN = Arg1 + Concatenate (INPT, Local2, INPT) /* \_SB_.NVDR.NV00._LSW.INPT */ + Local0 = Package (0x01) + { + INPT + } + Local3 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x06, Local0, One) + CreateDWordField (Local3, Zero, STTS) + Return (STTS) /* \_SB_.NVDR.NV00._LSW.STTS */ + } + (iterates in each NV) Message-Id: <20220922122155.1326543-6-robert.hu@linux.intel.com> Signed-off-by: Robert Hoo Acked-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 1817 bytes tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 4 files changed, 2 deletions(-) diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimmpxm index ac55387d57e48adb99eb738a102308688a262fb8..70f133412f5e0aa128ab210245a8de7304eeb843 100644 GIT binary patch literal 1815 zc-qyK&ubG=5XWb;X|s7rC7VQA{6+o)(;h_dpqpQ2+iX&Hx3#c^{Uu48RC(BX@YWxP z)(B#{)Psm@${q#pqBpOeJbCj_@a{$MpuX9*7K_v>D7uGv^JZpeKQrGzG_9l$#{jq& zg+{Te017jcMLbj0o3o}?Fpbs54VG60vnrQ{q~fHU&yS8lcH(5cDAk6j zQdXp3?}$$saDRZJNwU{L^?*9NH0kJpppbM@`Eg>3L1q^yVx-?zJHhc`h^@ zT|h88k7TrsX#VL3-u(`Vdg~pIZgc<~y5_jlMPk~-nU;{2L~Z}VmQ4f-j-VH&D%g^W z5om3n-EwTYwt?d~uz@*%#TK5e+fLA;cWlCgZDg;{VmXtF7@q$$w=7d$uL?tq|b zx&&DzrdDJo#!ahxE8+ciyn4O0Jop-r~E-|=G<~^chRvN zW3@O^pU&q6Q!1%k_R4@+(`4Zr|6!px5(RD-Ti3c4iE1@XVyB=;GdfM5;4zLdyxW1D zmE)|TN(8w+sf!6Bz~0lv0N^Gcv{$Emp|4)?Q Qk5+;g@EWY85C8xG delta 135 zc-ouJcaN1TIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#vndYherflB7+l{IK=lt&c-% z1TkIeK}0rXj|K07H?N*Nc`tYsFMk?I+gFfRbD+Gf9Y8LkuaX!iRZ=PU9r~_KpJ||wEWSY*Mv=P&hq148v>E%Lc`Go z1f%mvM%#$ypMB&#?2xFp-r?v*2f(3gj!Ru6rcIn_328~x_AhPOM4;dZdTy$OEvXoR z*7o@=$EIr=IF17wm;+dB;n}+D1TA{cCOp_i8VkU#vv`0elQaujH5%Z8=jPiT5L8W< zAybX1B}I=5^^&Foox_7-&5stqaj8KLE5aRFT?<%?DT)T0`9qst7zr3CUAOEd8|M%_ z8!%#|Eh2?<45t*J$y_zr#|0eBq2O+3If^u{g>UlR49%_f!o8@wXQ{?T1AuDDOBYdou*Fl7{?gi?ZD0` zan?{Jf>LYfVuA>;|8y|`xQWmsQ6`zWzr6X-XN$s&bqvdZ#kpNKWHHh%TMfR*wo_rk z2@JwyQ$NNF`ZPr%ScyK8O~e@4jRb8wKZny<;{!PK7cuOhISJNb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#v@l!vVcZ%un> zjUc8=J&4Gr>{0M8c=PJXllOvmK?D!tn{8{cNUegRIn0|kGduare3wMiiu&mo0M{!t zGDUL~UQ_1HiCLvopS(l~i7_F6R zQp;GWHX4Pt`o@*2(edSBcKjSR`6*D9iyiZ*mJlhfPzfE89KFz+ghL`;d-a-nrf9I4pWO7qNWehpx@9lhIEUcb zfDt2Okz7c}aLNIi>{XL}xqyQ?6x{7RN0G+0@M&N4uxkRi{roWHk76_Dj%&M1j^!Au z@_2nFpBGH2sB+nBBW6`ogm3(Zh2lsQxLs^r>sutMRW*s7LQT4*)AR`*;~2xc9oShV z&KjyjQ0h%xOb`L~K79-TZX)zZlu2gpEpI;b*`hFG9lB(kT(LdDnD}6)_~<4Nt%(LAjQ$f{cXCPAPEKQ(G&v)I zVKO_T5|2#vWc