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 zcmWFzb_o$@XJBC51w8U%;)9*yqnrG5{lZ*= zIO07#U3eXx13V2342>8>yhZ(-9esEUd|iDV)1n*v0zCa0xh1%`SfU&Jf*gGr(zqD} zq8qtE;>>;_Zk`I!jWQq!W)Bx1SA`(guwVtZP(Nn{H^(6NhF|Q_jY44AARkvh1%DUE zkcNNk3#2CJFcb(1a|tYYE}%bg-V?#j%R<(ZzsKxKSZJ|8ZgLI}$jM*@pXPL@EIcdZ z+;!9Q$ao+kW|o|lw6Pua&bW#$WJ98*K)BW zE-;&#$i-2>ki-$<6zT>tvOtiDA$^hT)TG3M<_?f|k{CKbatsW`=^#42G-*kCL1iKr zGecsuFh~JIqQ6t9+Y%5VA`tHq?8~wQ6u=poS=kI6LBS!83?jblL2jNQoE-jc!66I< z86c_vqy`j1=mEgUD8$AHQUMO5gsudJ;1I{q0uTW*Yyr=t$zYKsf=mnr?Foq`i6DP) zOip9~i9`!0a4CRY=M?JZwgg0o*vGqhhH!v9mQ=uyyvTsD0OXqF1d#3pf|Eg}ax*Z( zg*eS*We3$l_3J1)e>)eq)45W5)UvLp~uK!h{d z5YAizashfmVvKI`07Zf!I1;#+L>!5T1uiC1qQQ%{(ZIz-emr>7F&+@^ghYfOYL4b& lg2sdqBqo@NiwWkz6cfxtBqreQ#2ypO9H1JEhvC70b^yX*;Sc}- delta 135 zcmbQvcaN1TIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#v1w8U%;)9*yqnrG5{lZ*= zIO07#U3eXx13V2342>8>yhZ(-9esEUd|iDV)1n*v0zCa0xh1%`SfU&Jf*gGr(zqD} zq8qtE;>>;_Zk`I!jWQq!W)Bx1SA`(guwVtZP(Nn{H^(6NhF|Q_jY44AARkvh1%DUE zkcNNk3#2CJFcb(1a|tYYE}%bg-V?#j%R<(ZzsKxKSZJ|8ZgLI}$jM*@pXPL@EIcdZ z+;!9Q$ao+kW|o|lw6Pua&bW#$WJ98*K)BW zE-;&#$i-2>ki-$<6zT>tvOtiDA$^hT)TG3M<_?f|k{CKbatsW`=^#42G-*kCL1iKr zGecsuFh~JIqQ6t9+Y%5VA`tHq?8~wQ6u=poS=kI6LBS!83?jblL2jNQoE-jc!66I< z86c_vqy`j1=mEgUD8$AHQUMO5gsudJ;1I{q0uTW*Yyr=t$zYKsf=mnr?Foq`i6DP) zOip9~i9`!0a4CRY=M?JZwgg0o*vGqhhH!v9mQ=uyyvTsD0OXqF1d#3pf|Eg}ax*Z( zg*eS*We3$l_3J1)e>)eq)45W5)UvLp~uK!h{d z5YAizashfmVvKI`07Zf!I1;#+L>!5T1uiC1qQQ%{(ZIz-emr>7F&+@^ghYfOYL4b& lg2sdqBqo@NiwWkz6cfxtBqreQ#2ypO9H1JEhvCD2b^uYa;Sc}- delta 135 zcmbQvcaN1TIM^lR9uortquWF-X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#v&f3^b|oydSRgk!hX>?nu!2u>x>FXO z6>{#n>3L+m(cYwlh2mgwgEgGag1k=zCr;#GP~e%Bmasr#;^Z`jNs}`Y7I03^Vpt-` z%m^kJ3vxgXE64=7tRM^Iv<1==Cii7?u}p5yW-RE)W?)DvXiiElNCvsMAPwZF5|C@T zSP~bQO-B)yzQA_X5GmAXB*+ z7-8}Y1s1S@3`;6XPE0ONN=S-sa+dH5Gce$YcXSD26mejU_X+mofV&?(q8PbY7#JbW z4hil`;9?2(33lvC;NtLgj0hLdDnD}6)_~<4Nt%(LAjQ$f{cXCPAPEKQ(G&v)I zVKO_T5|2#vWc}{-5P9awf7xUJ7+WZc diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index eb8bae1407..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,3 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/SSDT.dimmpxm", -"tests/data/acpi/q35/SSDT.dimmpxm",