From patchwork Tue May 27 07:40:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 892733 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1559849wrz; Tue, 27 May 2025 00:46:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVehWNv4r1GwiRWsjR+G5SXftoFPnDkGcttcBOmRJc0345XB2S7fQ+KsR1a2qRosrZlR5ZxA==@linaro.org X-Google-Smtp-Source: AGHT+IH2zjQ39UO8zq9NsOQvwppzPkkQYpW0C50XEsUTVIiS3FoImEFLBIV8CmKrv6DBDN7JYgqg X-Received: by 2002:ac8:6f16:0:b0:494:78d5:baea with SMTP id d75a77b69052e-49f48a824e4mr154525691cf.51.1748331988889; Tue, 27 May 2025 00:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748331988; cv=none; d=google.com; s=arc-20240605; b=SUNRWjbYECd2WZqIarlSoq7IlDE4WBbE3pMwP2iyCygc6GGhPj1oAg9OKH5ylhpWT5 WFHQcrpZYfg0EeqAmgkupo4eeYD/6Om6WU59GnDph0M0YrSJFHzqLGkXvyoUpF2dn8jZ E4Nqi5hjFbnrXRP59Xx3mN2dz6f8C+DADhBLC8kSkgoUXj3vVLcVNF7FjIvNYBNTQ40r y85/vsKp3ZN6ZwaO948eMhs4YlfzF6dWrQkmKlxnK5a6+aq2D7oyM4A4g1P0+GASx1N8 JInlRj8yvD2zq2soUnNG060romIKLoLW0l4S4PSpACMQl2a48dft9yeZXlmqH5Hjxah6 KOxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tF1iJUIKihbH7KCU/7khuSpxtgKzDnBPv3wHWLQfdvQ=; fh=3+/pQVIKD31FE8qJaDVh0A7e2m9TMoY7e0VvIw0mRHw=; b=ksfixJwHcKkawQFnYglLr6JyYnwlptOSNXSqmzJzO/LC/50fFcsyI0JxB7QL+zVGwM Ak7iqipUv24nAc36hqKakWWxbcgJju/LQAdanh0Il8uC7Lk/Osale+peFppm3l1Qyb62 OcuJz9a25Yq13HxPrzMtKaPfiWNzE+SfobiaWABBxMZnnNcV76bE9RXdqLmGsit8koWa U2jFnyrxfr6WD5RLaBjBYhvKbmNX9wWw/qBpOqaGcL77S6MyTO6d99eUNgYr9Wc+QrW9 t6sCgkVl/4OZ7ydIMX/EgsBpXyXnkrsZtg28pYml5XucQh1G3rLemN7jtmV+Ow7hxh0h nyEQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="OyYc4/Ro"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-498e806f6edsi197740801cf.304.2025.05.27.00.46.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 May 2025 00:46:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="OyYc4/Ro"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJp0X-0003f5-Rg; Tue, 27 May 2025 03:45:58 -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 1uJoyQ-0001We-Bu for qemu-devel@nongnu.org; Tue, 27 May 2025 03:43:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJoyD-0000D1-Uq for qemu-devel@nongnu.org; Tue, 27 May 2025 03:43:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748331798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tF1iJUIKihbH7KCU/7khuSpxtgKzDnBPv3wHWLQfdvQ=; b=OyYc4/Ro8ykcRJ9oSY/H34UenlV9/5iNSY/eyIgL5pgXAC+baWb0b5ziaEicAeKlXpL4Cu bHczIOU/rOLlNC01BoDK/W4JmitdCBYW/xQSoqjIPgr+N3FRmAN0IiCBjPvPVPsD8Kqmvf S5ZcA/mRhrIgdu3PqAEPM5jenL6I7mk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551--StOR5mQN4GsqnR0JKqBEw-1; Tue, 27 May 2025 03:43:15 -0400 X-MC-Unique: -StOR5mQN4GsqnR0JKqBEw-1 X-Mimecast-MFC-AGG-ID: -StOR5mQN4GsqnR0JKqBEw_1748331793 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BCD931800258; Tue, 27 May 2025 07:43:13 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.201]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E43019560AA; Tue, 27 May 2025 07:43:08 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v2 08/25] tests/qtest/bios-tables-test: Prepare for changes in the DSDT table Date: Tue, 27 May 2025 09:40:10 +0200 Message-ID: <20250527074224.1197793-9-eric.auger@redhat.com> In-Reply-To: <20250527074224.1197793-1-eric.auger@redhat.com> References: <20250527074224.1197793-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.903, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero This commit adds DSDT blobs to the whilelist in the prospect to allow changes in the GPEX _OSC method. Signed-off-by: Gustavo Romero Signed-off-by: Eric Auger Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..abe00ad4ee 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,6 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT", +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", +"tests/data/acpi/aarch64/virt/DSDT.memhp", +"tests/data/acpi/aarch64/virt/DSDT.pxb", +"tests/data/acpi/aarch64/virt/DSDT.topology", From patchwork Tue May 27 07:40:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 892734 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1561599wrz; Tue, 27 May 2025 00:53:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1EWkPuVDs/iyW9+fAZuqxPROVeF78Vi5JSE1rROWWl9f9jBDX4O1ZndKdYhGEXOqIDwYA+w==@linaro.org X-Google-Smtp-Source: AGHT+IGEfe7YMxTQWTI9Ha48MRbaG81pU2jWx7H5UownC08JKjBsGcEJQSlOn0J3fnsLIqP6qIgw X-Received: by 2002:a05:620a:24ca:b0:7ce:b4d4:395a with SMTP id af79cd13be357-7ceecb7f38fmr1831973885a.18.1748332380525; Tue, 27 May 2025 00:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748332380; cv=none; d=google.com; s=arc-20240605; b=BSIHcRGgJWszjRZZS5WDYxQTDXuCNzERm0eRCnignBlDv2hoNwvs6wgVPKS1OQ4Y3W rYjNdJc6C+B5gmrFAQSnVcAsEgQ29ckypMojaTGSljDx7feVl2kXMfxGoNGp/H+qNWQV aBoaqJmSh096AGdLtBHkvPtp5RWLUtJ3E23PL/3P0aropTr0QXsfzEWtAF4lIJagwZS4 5U34ZAdxtKAflMh2tHj9VDlExXY4J2i9vlKnloAWwpHZJE6E/cHlCpC6MjT4cCZcP1wy CaEdzGUqotss6FmTmPnFq8/Ea7FtjdItLzCKI6J2Jq8nn8jZb20fl+skNoSLi/kOe4+o kegw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=g1J/1ny99bXm6jJSDCsDKzW2QOfAqrpYhal9qFozJ1U=; fh=3+/pQVIKD31FE8qJaDVh0A7e2m9TMoY7e0VvIw0mRHw=; b=iUVXHCtmkqFc1Ngu0GC4B1/Zj5ibxhY+yt7gTJXeI1ets1OUUYllxvbEeJQa4hPrLq VT4xK0RkSZ1OvFYYH4RRSp1nG7xPZc/dZqTddspKVrhyj9YNdWUHwmhpRTmNRzAypZkA zHppiZmkpMQ1+YDUT4pqsLivsPqDBfO8a54Tbf7gzdhp2jdsVIc0RL081/ohD8BWMT/u jChi/Isutl1jnbdkGRrz7WoZL49kWp5qeTuDsqrmUx/9ZUUe5LcypBz5Aq0BzCGgXgXW IdktGU/bffuFaCSQ8GX99j5NsJ+UbXN5iFoXbBMytlb6oaQWijAS84U9otqdwr/NGOkQ H49g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hVRh3vdc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae40c17csi254718341cf.63.2025.05.27.00.53.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 May 2025 00:53:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hVRh3vdc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJp0a-00042f-VI; Tue, 27 May 2025 03:46:01 -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 1uJoyQ-0001Wd-Bt for qemu-devel@nongnu.org; Tue, 27 May 2025 03:43:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJoyD-0000GP-Q3 for qemu-devel@nongnu.org; Tue, 27 May 2025 03:43:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748331809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g1J/1ny99bXm6jJSDCsDKzW2QOfAqrpYhal9qFozJ1U=; b=hVRh3vdcKkkSf4ZWucO2zUkxd5teLelR8qvOLc7akYxitUWX4167N/Z/PhqTq3sEa83zhs 9/L9WcA3wS9qzyG5Hbe3sdOb1ajFfMDsxZK7fp6VEsHxKmj9isLhwGiLtxGIGRKZf/hQ3d 9QvaMpbsWBoszKvOcUt/SNIIHbZkzWo= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-79-wPh0mYWBOKKZjiVNS7o-4g-1; Tue, 27 May 2025 03:43:25 -0400 X-MC-Unique: wPh0mYWBOKKZjiVNS7o-4g-1 X-Mimecast-MFC-AGG-ID: wPh0mYWBOKKZjiVNS7o-4g_1748331804 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C78A1955DAD; Tue, 27 May 2025 07:43:24 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.201]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BAEEC19560AA; Tue, 27 May 2025 07:43:19 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v2 10/25] tests/qtest/bios-tables-test: Update DSDT blobs after GPEX _OSC change Date: Tue, 27 May 2025 09:40:12 +0200 Message-ID: <20250527074224.1197793-11-eric.auger@redhat.com> In-Reply-To: <20250527074224.1197793-1-eric.auger@redhat.com> References: <20250527074224.1197793-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.903, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero Update the reference DSDT blobs after GPEX _OSC change. DSDT diff can be found below. * * Disassembling to symbolic ASL+ operators * - * Disassembly of dsdt.dat, Mon Apr 7 05:33:06 2025 + * Disassembly of dsdt.dat, Mon Apr 7 05:37:20 2025 * * Original Table Header: * Signature "DSDT" - * Length 0x00001A4F (6735) + * Length 0x00001A35 (6709) * Revision 0x02 - * Checksum 0xBF + * Checksum 0xDD * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) @@ -1849,27 +1849,26 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method Signed-off-by: Eric Auger Signed-off-by: Gustavo Romero --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5170 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5256 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6531 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7627 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5372 bytes 6 files changed, 5 deletions(-) diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..21278dd23850f3714f82da4da37d8f6f0def7c41 100644 GIT binary patch delta 113 zcmX@3u}Oo=CD{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zBNmvG|*h?oFKtRMj-vXE!9v9Kf~ E0NvLgQ~&?~ delta 139 zcmdm_aYlp7CD5}{ezuZy0RIZUBV3) zc(702Eu`gV6dW25P~hwmZtNTqaVThN*)H3xI?R SK#D=)OR^X8ZI%?4WCQ?(sV7tb diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..a29aa5d2ea83f00c543b58fe33ec7ce826e050be 100644 GIT binary patch delta 113 zcmZ3a*`dkh66_MvA;Q4G^lc)SG*h$NM)f&dOm34mALX*<5cFY>_YZbv>B?qsb_q9J z;Kw>yP*}^vIH5X$OFm(Nz@*8UjI|&cE)KA~@TAGkF5$)r5HSIeSV00vWFgPyPGLz# E06pL!c>n+a delta 139 zcmeCsT%^h666_MPNQ8lb>BdAZX{KKHjp}o_m>i~VKFVdyA?U^#?;q^U(v{8N>=JIc zz=M6Vps<#oQE+HLK!LMMxUq9ckWV#;;F1TC3j`)j&Sb0wspaAT>kykX8Kw>*EC3QN S04WBEFUelWw>e)}k`Vy{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zBNmvG|*h?oFKtRMj-vXE!9v2Yd} E01f0IF8}}l delta 139 zcmZoRo@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq z@L-?3TS&{#C^$4ApupKB+}JrJ$fp`aaLI$n1p<>MXEN4;)N*lvb%;%x3{wXY761ts SfE0tomt-&G+bk)Z#RdSwDJU-h diff --git a/tests/data/acpi/aarch64/virt/DSDT.pxb b/tests/data/acpi/aarch64/virt/DSDT.pxb index c0fdc6e9c1396cc2259dc4bc665ba023adcf4c9b..cdefdbb92f6b509b39413a3150d0d5d575c22df3 100644 GIT binary patch delta 205 zcmexwecGDKCD=JIc zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpL7UBZnMAYuX_v4RAU$U>gU&tz;j Ze-hGTWOAFlSxLm2gNkNvekLQy2mmfWJ;DG0 delta 256 zcmX?Y{ok6)CDB?qsb_q9J z;K4rGR!GawC^$4ApupKB+}JrJ$fp`aaLI$n1p<>MXEN4;)N*lvb%;%x3{wXY761ts lfE0tomt-&G+dNw+n~}+3>ShiRYYw{DIC-{^?d10|cL0k$O`-q* diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology index 029d03eecc4efddc001e5377e85ac8e831294362..8cb1d9ef7a6e5a0429e96bf4b6529bc814a936b0 100644 GIT binary patch delta 113 zcmbQH^+%J-CDP(c`v*I-bY(L*yM!Aq z@ME3aDy(HC7-ZBVAAAF##)dJ7YA5gc+zBNmvG|*h?oFKtRMj-vXE!5}{ezuZy0RIZUBV3) zc(6}y71r`I3JwhjC~$TOH+BvQ@~H+9T=F1tfxx86nT)j{wOkxv9b%Iv!_+~91wg_D SAjKf@CD{x4Ha`}YWCQ>=S0`Km diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index abe00ad4ee..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,6 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT", -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", -"tests/data/acpi/aarch64/virt/DSDT.memhp", -"tests/data/acpi/aarch64/virt/DSDT.pxb", -"tests/data/acpi/aarch64/virt/DSDT.topology", From patchwork Tue May 27 07:40:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 892735 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1561654wrz; Tue, 27 May 2025 00:53:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUPh/dsqzJd3dBy4TU8daqOmkhE2oUOzqYqf/uBlc+V9qPJWOMRtU1mNqnZO1pqgH5N0JHHA==@linaro.org X-Google-Smtp-Source: AGHT+IGDl284agpc5h99y++YbKf0tVUHn6Y5r0Z40ggT9sCmmrLagPCgoINrcSCG0g4MUvHHZYoN X-Received: by 2002:a05:620a:2987:b0:7ca:f65c:2032 with SMTP id af79cd13be357-7ceecb6fb2fmr1810590885a.5.1748332389846; Tue, 27 May 2025 00:53:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748332389; cv=none; d=google.com; s=arc-20240605; b=ATAFIVfWSIRj1ZXcPuJ4muRviNjIepbrzW4yuRW9XjOwlXA86OosO83gvefEZ1kk6X xC6G3i7O+MucEwXqFxLJ8ry8sXGYc1/yIS76aOCFXhLtVNVPXGEd+6WkecyVnI0o+Iwi 2pd3bFeV5WBiSYVeWaWrsv1K8DnN3j3EQLd1LloIsACXyzbR/fgHNRSSwqNxeV+4ffor 05TEGEgqyEamXzJwxmQ+/xxvMTbNnmtcAg6hBMt4J8vO2btzii5HSDB7mWFCnyISABSH sz7K1bOENuwzmC/uEwD/nDzY0IObClAvvaCWtSuyy2eVTfZ8fXapzyEtmVvkzHqcgY5n y15A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NjrLUtJ/wTeOeGDQFHs3hbhXToVFKVogEjfIEHIOlwI=; fh=3+/pQVIKD31FE8qJaDVh0A7e2m9TMoY7e0VvIw0mRHw=; b=WkcfYG3u0Tc1L4d76VctbJql0M+VjwbRtRmd0iuGRTgvXk7u8fefv2LNkx0jWP9elz hSbsKtHxAbHjnmjgbM5r652vUdapEi490UQpyn3+6OlpGKYhGo7NOfMNQrGfqLtZ+LFe gHsX0E4XSiRF30fkcD4mafZZPkea+gox3GR691Tf+3w/BossxNsmpKVuREs/CWYu0cdl fbIijxZK/bD9JtNIUv+5oZH5m/DD0XjoTuUmSappnyDZLJmtNhYADt6ZQqyLIGksMo/o 7Qu7jjMEp3Xu2vdhiO7cRgPcjeyH2TrERShWHJzgs0b/aaLz/wRrO+GIY8+2vU3QcK2e ZCPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VNxZ7HBY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd4688cb10si2536478285a.288.2025.05.27.00.53.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 May 2025 00:53:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VNxZ7HBY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJp11-0005dq-Hr; Tue, 27 May 2025 03:46:27 -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 1uJozK-0002r5-Qm for qemu-devel@nongnu.org; Tue, 27 May 2025 03:44:48 -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 1uJozI-0000Sf-Ra for qemu-devel@nongnu.org; Tue, 27 May 2025 03:44:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748331880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NjrLUtJ/wTeOeGDQFHs3hbhXToVFKVogEjfIEHIOlwI=; b=VNxZ7HBYnApWwvMpGpdCWCxgMet5S4K36peX3MnWR+Mo8FmZAE+5QvqLXMJNOkjIExQsbc m15c8hfze1WezID3zRF7QkWGKq0FMnGIgJQIql23PgiPhoNTWXwqwkhkaych4VomWE77BO xZ97Rm0QjvzJEJlmjDaFnEhsmblhv4c= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-166-sZS2cBcbO5mCSNgA5ZM2Ug-1; Tue, 27 May 2025 03:44:36 -0400 X-MC-Unique: sZS2cBcbO5mCSNgA5ZM2Ug-1 X-Mimecast-MFC-AGG-ID: sZS2cBcbO5mCSNgA5ZM2Ug_1748331874 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9618D1800115; Tue, 27 May 2025 07:44:34 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.201]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3C91019560AA; Tue, 27 May 2025 07:44:29 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v2 24/25] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Date: Tue, 27 May 2025 09:40:26 +0200 Message-ID: <20250527074224.1197793-25-eric.auger@redhat.com> In-Reply-To: <20250527074224.1197793-1-eric.auger@redhat.com> References: <20250527074224.1197793-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.903, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero ACPI PCI hotplug is now turned on by default so we need to change the existing tests to keep it off. However, even setting the ACPI PCI hotplug off in the existing tests, there will be changes in the ACPI tables because the _OSC method was modified, hence in the next patch of this series the blobs are updated accordingly. Signed-off-by: Gustavo Romero Signed-off-by: Eric Auger --- [Eric] also added acpi-pcihp=off to test_acpi_aarch64_virt_tcg_numamem --- tests/qtest/bios-tables-test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0a333ec435..6379dba714 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1626,7 +1626,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) }; data.variant = ".memhp"; - test_acpi_one(" -machine nvdimm=on" + test_acpi_one(" -machine nvdimm=on,acpi-pcihp=off" " -cpu cortex-a57" " -m 256M,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=128M" @@ -1747,7 +1747,8 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) }; data.variant = ".numamem"; - test_acpi_one(" -cpu cortex-a57" + test_acpi_one(" -machine acpi-pcihp=off" + " -cpu cortex-a57" " -object memory-backend-ram,id=ram0,size=128M" " -numa node,memdev=ram0", &data); @@ -1775,7 +1776,8 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) * to solve the conflicts. */ data.variant = ".pxb"; - test_acpi_one(" -device pcie-root-port,chassis=1,id=pci.1" + test_acpi_one(" -machine acpi-pcihp=off" + " -device pcie-root-port,chassis=1,id=pci.1" " -device virtio-scsi-pci,id=scsi0,bus=pci.1" " -drive file=" "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2," @@ -1846,7 +1848,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) data.variant = ".acpihmatvirt"; - test_acpi_one(" -machine hmat=on" + test_acpi_one(" -machine hmat=on,acpi-pcihp=off" " -cpu cortex-a57" " -smp 4,sockets=2" " -m 384M" @@ -2123,6 +2125,7 @@ static void test_acpi_aarch64_virt_tcg(void) data.smbios_cpu_max_speed = 2900; data.smbios_cpu_curr_speed = 2700; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-smbios type=4,max-speed=2900,current-speed=2700", &data); free_test_data(&data); } @@ -2142,6 +2145,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) }; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-smp sockets=1,clusters=2,cores=2,threads=2", &data); free_test_data(&data); } @@ -2227,6 +2231,7 @@ static void test_acpi_aarch64_virt_viot(void) }; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-device virtio-iommu-pci", &data); free_test_data(&data); }