From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 832AFC32771 for ; Mon, 26 Sep 2022 13:44:02 +0000 (UTC) Received: from localhost ([::1]:50528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoOv-0000Q9-H4 for qemu-devel@archiver.kernel.org; Mon, 26 Sep 2022 09:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oco3z-0001q0-0D for qemu-devel@nongnu.org; Mon, 26 Sep 2022 09:22:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oco3w-00037Z-86 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 09:22:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664198539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rN7oHVGcRNCFvSh7JZNhMK2LBVjf11su2RcHsnmhWfk=; b=hbhptYv/8G6HNS/UaGqnylkeUCvGbsFduRqiLygs42L+feAOzr66LnjnETNT32DYs2Xc61 6VkmY5fqkKC1aZCgR1pi/dtMehtII578KOacW3p54qcjiQ05G0oZE24sVQ7a96XxmQ/8nN yvJZ3UH464gqfMn/CAdukWn3U+Rfdec= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-208-vAqSe0HyOxqSokFrJy4vNQ-1; Mon, 26 Sep 2022 09:22:18 -0400 X-MC-Unique: vAqSe0HyOxqSokFrJy4vNQ-1 Received: by mail-ej1-f70.google.com with SMTP id xh12-20020a170906da8c00b007413144e87fso2114747ejb.14 for ; Mon, 26 Sep 2022 06:22:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date; bh=rN7oHVGcRNCFvSh7JZNhMK2LBVjf11su2RcHsnmhWfk=; b=WOyqHnOXHY3htzzBymZZyTB5y3MJdMZASkqiP5Wcdxg7x3uSQnxMTI3bKwqV8xyGYd 89NcWQgY2s/0+YmEUNWxE3TgkB3JT9p8T76WCb+6OU6jKLi5v6mMToNC6TDQM64Xh+QQ hzS6WAfcR2qkJtXOa9t6dpV/6RJhj6wnV1HCCcSe/V3pUUz+wB0RkK1YdzUNejUbgq2R 5xQksT9Z2jat6wCeLkh/mztyF/qUydJLK8W9205Pkk5YEYVmNh00m3qK6HGkntIR8jd5 ewW/5JiSHKm7IIcHaf1NnrZW1T1fHIrevm28VHxUMpM7XKWQf73AYfgj0R4S1f05W/3b PuiQ== X-Gm-Message-State: ACrzQf2vMd/pWb0dStH4N0TnoO1OJ3/HIfE9wBDZ/WFqy357p3e6Rn0v EAO/+U1aKq+R+4nS+mvo53USkP4aDB9egoo//Feab79DF5LE2YIKNp5ME0Wz6gLaIDC0Izml1fv 229v1sOEyjwFlBnc= X-Received: by 2002:a05:6402:1287:b0:456:ea04:efe5 with SMTP id w7-20020a056402128700b00456ea04efe5mr13477559edv.41.1664198536112; Mon, 26 Sep 2022 06:22:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4DtWAVGg3wW2pbzCcz7qS6S0H4fFrjfoWZfwE3A3A0vN3daseNSzIDP2YLvMkx6enoKWiD9g== X-Received: by 2002:a05:6402:1287:b0:456:ea04:efe5 with SMTP id w7-20020a056402128700b00456ea04efe5mr13477538edv.41.1664198535888; Mon, 26 Sep 2022 06:22:15 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id f14-20020a17090631ce00b0073d7ab84375sm8282702ejf.92.2022.09.26.06.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 06:22:15 -0700 (PDT) Date: Mon, 26 Sep 2022 15:22:14 +0200 From: Igor Mammedov To: Robert Hoo Cc: mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com, qemu-devel@nongnu.org, robert.hu@intel.com Subject: Re: [PATCH v4 5/5] test/acpi/bios-tables-test: SSDT: update golden master binaries Message-ID: <20220926152214.05255edf@redhat.com> In-Reply-To: <783af0cd89700c2c3ae9c6b2b1e49dab0a2d3f70.camel@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> <20220922122155.1326543-6-robert.hu@linux.intel.com> <783af0cd89700c2c3ae9c6b2b1e49dab0a2d3f70.camel@linux.intel.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 22 Sep 2022 20:29:12 +0800 Robert Hoo wrote: > On Thu, 2022-09-22 at 20:21 +0800, Robert Hoo wrote: > > And empty bios-tables-test-allowed-diff.h. > > > > Diff of ASL form, from qtest testlog.txt: > > > > --- /tmp/asl-RFWZS1.dsl 2022-09-22 18:25:06.191519589 +0800 > > +++ /tmp/asl-B1ZZS1.dsl 2022-09-22 18:25:06.187519182 +0800 > > @@ -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 > > + } > Hi Igor, > > Here is a little different from original proposal > https://lore.kernel.org/qemu-devel/80b09055416c790922c7c3db60d2ba865792d1b0.camel@linux.intel.com/ > > Local1 = Package (0x2) {STTS, toBuffer(LDAT)} > > Because in my test, Linux guest complains: > > [ 3.884656] ACPI Error: AE_SUPPORT, Expressions within package > elements are not supported (20220331/dspkginit-172) > [ 3.887104] ACPI Error: Aborting method \_SB.NVDR.NV00._LSR due to > previous error (AE_SUPPORT) (20220331/psparse-531) > > > So I have to move toBuffer() out of Package{} and name LSA to hold the > buffer. If you have better idea, pls. let me know. Would something like following work? LocalX = Buffer (Zero){} LocalY = Package (0x01) { LocalX } > > > + 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) > > > > Signed-off-by: Robert Hoo > > --- > > tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes > > tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes > > tests/qtest/bios-tables-test-allowed-diff.h | 2 -- > > 3 files changed, 2 deletions(-) > > > > diff --git a/tests/data/acpi/pc/SSDT.dimmpxm > > b/tests/data/acpi/pc/SSDT.dimmpxm > > index > > ac55387d57e48adb99eb738a102308688a262fb8..70f133412f5e0aa128ab210245a > > 8de7304eeb843 100644 > > GIT binary patch > > literal 1815 > > zcmdUwyKmD_6vnUPv~g}y6emHgc**|(X$OSF0FILox3Lr1ZmHx-examI3c8|YVC!RO > > z2@)c;%774ZDvwC)2sTzGCN_pj>?}wOz&%bMqC!xRK#<|wbI(0K`Q7hx6kRVFqX~qV > > z7sa|%)dh8?Br6KtBZP{x4GGpv_2!(V7cFzGeuJKCoK=-eBcjxh3x)9sl%G1ON@8t< > > zC}l-#nk#BUt~04IjN>%dL > zd`g(B+2~ZOl~ti$5{;G5iQtsKhzOsxHlK*k;x!u1QobwmcfE+b^ > > zczo}A|8-XCzLj4+n|SHk{n4mic$$>>kzKym > z76FVb02yfmT5$S-f4_s{{ziu(n;nE)vhI4s17gyIJ1qk(jyu7HZ3lA%xtvj)uE0pb > > z$53nM?6&KW^-Z{ri#Fj5p`{kAt=n$cB6l3jBFD@@19IxL9zw`xtdg$8LlAg=q1{28 > > zrW+#4D+#S48%eHS(G5iAVIj~13LO=IVY0&vbVM52T^rF6(*yzx3({MDR0%04*|42u > > z2kyc74pk$D%$$vdh>qe^LJ0ZG7X5M#F6I*C?GzXSG@cDl2fPncQ;69=?`MKx80Oyc > > z9B;|BU2{zuQ)dbV&Js%+lfN=#)pVIV;6G{kbZ#&Nx-i*)4_an>N&6Rd6+ > > zI@DnAgic;g(t#T0WVK=NDa_GVIQn# > zX3nG1z=PDg8a0li5EfPCA#5NgSsa5-$boD!LCLPANZb86oIwZg!$H0TWG)1949wv} > > z%n%5UzDSI@Rs|ErBNK2eFCN1M9Qzd;CjYDrIQIKKO#MY44mk%#@ZbKTacs|tiGdUB > > c@tk1)B`4Vb#EApW?>oVA@DG+o@4h6y0>WY85C8xG > > > > delta 135 > > zcmbQvcaN1TIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I > > zVKOVD5|2#v > dMmNa;WevfyTuhS-Sw(n20!9!4=E=X=WB}s5Bn$um > > > > diff --git a/tests/data/acpi/q35/SSDT.dimmpxm > > b/tests/data/acpi/q35/SSDT.dimmpxm > > index > > 98e6f0e3f3bb02dd419e36bdd1db9b94c728c406..9ea4e0d0ceaa8a5cbd706afb6d4 > > 9de853fafe654 100644 > > GIT binary patch > > literal 1815 > > zcmdUw%WD%+6vppl(q?j#N+yZ4_+tJ8(=J4Cp_55srp-*k%rq9JFfU2kq{_wCg}Xi$ > > ztr5g@s0$I9lvx(s3+~*ya^=3@R@?|K)O)5cETUCVG>dc3J@?GX?|$Ee=z7T*O(4YV > > z6zft|7u04+RusBN2o+}<60Di(?O97NTIOo~7CqNEt16d9M5!Sc3gZ(fKXqD_#M%f^ > > z%8J-Bm(_+`XHsJr$7!yK3TmZL##~83omGvBESM|j;DD``YGpwyH+7*htx7^g)UGdo > > zN|-Cz=v1qfRiR!IjpfgY;Ecb32%p25@LlF&|Jg2o|4sIa|8e$(J-8fP@E6j695sA+ > > z`rzi^byn)Vm0vxdc > z07mA4jC24kIQz(d*u`;wy~~h|E > zsJ(rD%XP@w23*HQ8*qluVjI@>T{mo#dk$uiW9Fa%IdxhOA>=bwNmt?_2s}66=^{?k > > z4H4y)gjSJ_Bv-HK1|oB?5a > z_uzbosu4qG&c;GSM{z14g#1;DemMsha|!ac3k(4o&xWT1-iN6v#2lOtGQltmbMJVL > > zx9HlgxhjpR%|d~*#FED3uMJr>UFHt?j~m6{IAZp&4ZUaMxL(smx^jv*W034ARyPbC > > zYOr@gCod=IKn-)U+A#PO=IARNeR@zpphT46IJL~$7jHhwsZh{k|A1x4X1tz91v7Lr > > z=TT|kLF!$N8plxxi>mS%HjtAnjzK5nKsK46WH(Zz > z2n5GpB*t8=f(hf12{@J)Pv8QM{fZ5ff7S*Z`+Xm#{-O^@oO?#_-~OU;Y~P8AJtx?c > > bIl=x*PO$%p6NjANcY@{MA1saDe@T1=QL*6= > > > > delta 135 > > zcmbQvcaN1TIM^lR9uortquWF-X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I > > zVKOVD5|2#v > dMmNa;WevfyTuhS-Sw(n20!9!4=E=X=WB}VOBm4jW > > > > 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", >