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 03DF3FA373E for ; Wed, 26 Oct 2022 14:47:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onhey-00062z-Vo; Wed, 26 Oct 2022 10:45:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onheu-0005lT-KK for qemu-devel@nongnu.org; Wed, 26 Oct 2022 10:45:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onhes-0005VL-BT for qemu-devel@nongnu.org; Wed, 26 Oct 2022 10:45:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666795528; 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: in-reply-to:in-reply-to:references:references; bh=H9GblTDpMlysoH2qaF+O8+uQUrrcWc+d6PCLppAanoI=; b=MRQRJ39lXBXIVdtL8GGRKktvD4ygscYljn1cZtFPMJoZ4tiiGivSlo/DSXFo9T57fwGBqa a4zcIe/7Bo9mrNv4xGNzQapHj6ZbhBbnYlexETjn7BYsWtPAGnRnEXpp9Dvj/cYhjqpAFh xvXMPKgIeqn/vVkaIwzxpa9Tf5l3y3U= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-108-5BtXuaM3O8ODDdvgCmUynQ-1; Wed, 26 Oct 2022 10:45:26 -0400 X-MC-Unique: 5BtXuaM3O8ODDdvgCmUynQ-1 Received: by mail-wm1-f69.google.com with SMTP id c130-20020a1c3588000000b003b56be513e1so6284529wma.0 for ; Wed, 26 Oct 2022 07:45:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=H9GblTDpMlysoH2qaF+O8+uQUrrcWc+d6PCLppAanoI=; b=3MHlg7OYpfc7QG4mJfoFgRqpk5UorsK9cZmkkMH4X4qcRS/4U66X7Q9fXpT+FKdbTH 7iKcch5Z/qkri0j+YaCjGn6vMa84agHZz45DBmVGteOE76MYrKSfDBT4+FJnYp8FqPBS zX6M4VAW5aDZy/ckwqBnM4m7jk/g+cjOmCrr24g0PQlaaBMo36TqzoeiOZO5SHBZnnj3 smzR8/NZ5ozPnKKNSnfk7hPlHFyatSB1TLMPpyVOR37z9pPqpxCSCuMS13FPRPZs3E5W ssHq/bCC8n+bTMfczarYHVRcwDsoBpt31KgLtLqRYFQ6OWJgy4Pub3QCJHQuXeEHmT0q V+/A== X-Gm-Message-State: ACrzQf3jSOhZlSpY8gy9yueX6qlD0SbnvYGwBFFl1mXouB3cXgu3q1Wa Kl64hrvsKR9mJ/wQxj7PRbf4U9S1IZx2WPk1kVGao+GCpii5Q7q7oEb08OHukcw/cAG3PT3K1dP jGT5i0618Fyg0wO8= X-Received: by 2002:a05:600c:46ce:b0:3c6:f243:8d74 with SMTP id q14-20020a05600c46ce00b003c6f2438d74mr2789475wmo.166.1666795525053; Wed, 26 Oct 2022 07:45:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ARWdYy9oMLSj3f5zPJ1bZoT8zxkl3jQ4Cg8pM9uczjL3R/dkd6TNNIMQLvwJpf651zU7pzw== X-Received: by 2002:a05:600c:46ce:b0:3c6:f243:8d74 with SMTP id q14-20020a05600c46ce00b003c6f2438d74mr2789450wmo.166.1666795524745; Wed, 26 Oct 2022 07:45:24 -0700 (PDT) Received: from redhat.com ([2.52.15.7]) by smtp.gmail.com with ESMTPSA id bg33-20020a05600c3ca100b003a6125562e1sm2116038wmb.46.2022.10.26.07.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 07:45:23 -0700 (PDT) Date: Wed, 26 Oct 2022 10:45:20 -0400 From: "Michael S. Tsirkin" To: Robert Hoo Cc: imammedo@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: <20221026104309-mutt-send-email-mst@kernel.org> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> <20220922122155.1326543-6-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220922122155.1326543-6-robert.hu@linux.intel.com> Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.515, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Sep 22, 2022 at 08:21:55PM +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 Adding --- is what broke things here and why this does not apply. You need to prefix each line e.g. with a space. > @@ -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) > > 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..70f133412f5e0aa128ab210245a8de7304eeb843 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..9ea4e0d0ceaa8a5cbd706afb6d49de853fafe654 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", > -- > 2.31.1