From patchwork Tue Aug 13 05:22:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sia Jee Heng X-Patchwork-Id: 13761325 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 5B30FC52D7B for ; Tue, 13 Aug 2024 05:24:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdk0z-0007Cd-8x; Tue, 13 Aug 2024 01:24:13 -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 1sdk0L-0006ju-Mw; Tue, 13 Aug 2024 01:23:34 -0400 Received: from mail-sh0chn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::701] helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdk0J-0001ZA-2V; Tue, 13 Aug 2024 01:23:33 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bNyQlc6vWnaDyvfbmtzVvR2T02UfjRGcBdtWSHek0nqlgjhdGuX9tNxzuum/9Vb4NF1Y9D2HiLYUhlAqT1Sk2+hu1llGCtEamlu2bqyFASlO3cmmFvX4wUNM2tlRXKmKWWkFflimdum2gOwxqZJBXnqmSNHBlCnpLk5RyWiGsKyIO6W3yCday2y0WY7DvpWN11J+PT4kdJrQbWD3fYhsMAEZnGdsFqH5HF/PO6oyd7zFIcGF61YHV3c5LCrlatwSTn+NJVGr7co1TdJNdAj6anX1bPylnYyBoAgL9dVYGwcCkPf4AzTKVpueSRgSJnfD0slcjQ/XEkWkr5xWcLmebg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kjpdt9HjVDmOgTSVEA7jOdueh23prjUfwBYu2bsM5vM=; b=NM71UqpuPu61meejDhaRujaL0BNMcFl81R5y2JDXj+rwkn3G2sKEqi1ffyFdFE75gEdysrU0wm8mAmxSLpqpN84Y5j4M5CijVN7AFAAQ6mgLIvOQx51ZP9n/fqY5uBuApjCR+Lx/MCHzu8S9VJhLf6eRCyXiUp7ukZ7Av/Y9nvnkE3iuMYMoVWPNd21iDbLKsVn9gfIt6+/YJvOytEq/J7V35zyEXj2qMczkzj9JG8/zZP+aG/PO/wXQ5pasW9z4qehJEwAOKzosnPabTVCcBF6hKvJ1c5uB/iEQsGI3ce0OUmJ4ZKdhhLnW9bHu6SVgXQwBhe+fRw4+ENfjPRw26g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) by NT0PR01MB0976.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.27; Tue, 13 Aug 2024 05:22:50 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc%6]) with mapi id 15.20.7828.031; Tue, 13 Aug 2024 05:22:50 +0000 From: Sia Jee Heng To: qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, peter.maydell@linaro.org, jeeheng.sia@starfivetech.com, shannon.zhaosl@gmail.com, sunilvl@ventanamicro.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com Subject: [PATCH v3 1/3] qtest: allow SPCR acpi table changes Date: Mon, 12 Aug 2024 22:22:21 -0700 Message-Id: <20240813052223.1033420-2-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> References: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0022.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::23) To NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: NT0PR01MB1278:EE_|NT0PR01MB0976:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ee2d85a-b40c-4710-56ea-08dcbb57f99c X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: e8Bu2iX4AOPDq0uR56lJL74Dw27UR4lNMGpN7f/dDX8s4bCBbr2SZiw1ZUllzSDF/Q5xmrQ1kiQ0HLsJhoQVtnDo22oxIpBuDsXQ0kSazlQydn/f7iCmr1UTosUJhCSHpcQXWXdxtd1ryJ39HUPk/3Kw7IcY88Syse/1v8gEYSbxq8442ahpeh+R8dbfXYLMENfllExBkGySdgalPuW4F5+hLJK3OqL8piIwfVEFeTwL21PEM1v/FnyeCe7F9N2Pm8NmDpWpF/zuC5DIhF3zyIPn7/tolY+FHp1ewpp/LCtZ0SzmIhnALXvVZys3XHEHbStp5tOGnHq5nEJr4qkzIaP1R3+jeI9PP/jLJhxIjRRLyiFkkrPvEtYgOwc0jqVV1O0b7B541PgU3qYkjE6O2R0wFBvN460og75sYqqOOcb+T/ffc0y5UE1AjbHxmSO9eZ+QwcYR6k8mDQg7ExtPG99iFp/rNR1NIvcgr2IE3Vx0hPPzMzoAHdqWGVat81FiE2OH+UkKbCuHKWfKdNKf56ZuDs09UrkWMKazk3NO5hVt5Xpjz4xgFE6lihNg4oSV9w4HMkUybK3eG7NaaBsDSXsbRqcBrqksQbB0L6pincg/4Ecn3o42RooxbxnaCneR X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(52116014)(7416014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LZzTRztM49R+lhoLjJwPWAjmK6VaGjbsQ0HQsprcM5p8zNOQj+ffEySrvFRW/ay4W5KOl+Q/MMIyy1taSCOeUY2FFe/9qgIAlOuALYlCmNhFY+z1xKdekJDvFP5IQ0B1yqTh7iZ91Ngs7ZvY6HlfGZEupGOI1HQzVByGY4Ev/pNh0Tji8vVPlTQnNR4UJbH02a1JjOETfCIJhq52U7EUAVTCi5PZOTTmP42gZj/+Al0b4r0I2Qur1/xuyJ306v0WCyEyT3lB7HUIC+RLrCs5Ypfn0QC9caHGNiK6wwhIcTp5AVRhcw8HdYVFnzurx6Kp9uVECCSykos40lxsh9A5xmkUgR7WcMnEHXmWPR9BMKrs0aC97QQVuwdUo4J5tPT5mRSI4iaQcI3RZ/NKd3XAQ27OMCUQX9PCUH+X4s5EYzKdUSsi9XWEzLScIHNLi7kjljgNRbOs5KmKHo0btG4kVp2cC1bEcTScAdvImLrLH6Z6uxBqa5H4eXWOawrcTOpoOHYYlWs/EqimR98iKMn8l+HVCwZZLKZt3IBxvjYssgDA1e92pJEYtOcJJ0QlboM6TejXs3uRimw2xmTS7BgBlWMtemdAEInrnxEeQ2HkLyIEGmkqCx/9WiGVE3ffv4EViAcUEL0ZSh00bZFQmGW30PTf4pkCkTdNeYSUwTBb7WtfuT/EAlzqLusyK9ZoJcm84ddcqm5Kdhgx9KhUMU7/WRXxcfx8IBqg4+0pzk12+P2XUEBurcV74U7PQMSys3zD5cUOVtIv8ee/S7PE62pIFeXmz6RFqYacbY7809XmotIFWesGFNE0BVS6bl9a4o2vfyzK8q9l7JEYjyqF0nwvRwGFJVuIXZVHU9lZohQuW6oxD8jXcgrpT/cJit7R0xH7dFU8Nd4ZCKYamzM0aefyeerHVFDqtGtygGxECgMi8yCMmEkseV1WfA62uS0kupEBxNO6pqFgLYEqNZklJf79Q5M+KX55Dspixq+EmwtTdTnlI4H/2JR+4sau3wI1LREQ54Q0bVeAsXUCL2/kR+Y0nWWSM0rgTb29Im0E9JYRrwsJ9nw8fhMOBC7DW90velSMYDFJMwnQv+lTcVZneEpXdLdWx/gxpCOlhuNiKwRa421qAdNcF4qFH/GsldBinfCe3dWXt+1egmGG9Oyb5pv4/fDGSw6x77bcS0TdjG12dpG9uj42T8gdZKTs+0JW1bWq+1esLjhUFMEk2ebQMQ9kXCIaWgUo4NOGnZ2ckNyEExx3eYUEfWASeLhBWleIz0izk7Bm5YnMs00CzyYx+y1KciuVhicvMvlGcDIKuPZOmnfmHkwM3w6Elqd2jJe1QnEOYSaQm7tv4TrEEjDX0TXs5iBJAImIyCDJv0yGwZFcmjYlZRG5wigHCY5td3mPK4LmG22f5DdS4CC08BLNQEq/bcH1J3X8F+GU95Hh1KneToAD7s1Rxv3fc8m2MLON6ZQp0qUFfCVPBDdMz6uTlNbEAXIuFK0KCfMBGumGIkK2Wikbr4b5YxQH8A81Sx3tvpZusPnGeZo61JYtG4SHmkt3E+knH+WkzDo+gM7GwZTjOxma7TzJsMpQMjTA9LbQyGlopMp5s9RlfJ6+7GtQWE7SZQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ee2d85a-b40c-4710-56ea-08dcbb57f99c X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2024 05:22:50.6241 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0m8TWUg0d3SFt/td3uWUh4hSymFuwts4GBWBq16Oe8aj8Y15GnEFXviTf2wR/k8Otqh/ByfCPmCrM8E1DVaXVWnHM3MSS1sLqg3cldnPjJ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0976 Received-SPF: pass client-ip=2406:e500:4420:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Sia Jee Heng --- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..b2dfcd60dd 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/SPCR", +"tests/data/acpi/aarch64/virt/SPCR", From patchwork Tue Aug 13 05:22:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sia Jee Heng X-Patchwork-Id: 13761326 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 CD19BC52D7C for ; Tue, 13 Aug 2024 05:25:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdk1U-0008Ds-VR; Tue, 13 Aug 2024 01:24:47 -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 1sdk0Q-0006q1-QK; Tue, 13 Aug 2024 01:23:44 -0400 Received: from mail-sh0chn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::701] helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdk0M-0001ZA-VL; Tue, 13 Aug 2024 01:23:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B5wkxou57FI5DvZ/bk+n5ifTC2QFySabVTt/LYknkrqOe1UBS0db/4WGGYpVzEyJNJl2atSD5BELyN5rAEvrJtzcVKTknglj1NyvL19kRB56117Tb1Ett8bClD+4r8ouOHNX5zT1kE8ORkrwEv1tzgN61bo9rcVGlEGXiDMYkmIpDyhXAf18XNndAEc3PsBZnVRGGYcJ5EQbdaMmyJoApw15k0BFOcDou945jYsZofx5DTRs3jWUhIG+0T1/GhyREqJ2289t4xigNVIsF25tVLAfY2Vpmoobb0LLuRR2eOGdldA/1MBfJXS9kO0gJtzhFwMBkQLFw6LNcSV85JgTHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HJmqaOfHU2UZFFr1RMmErXlPOwQc+KWCaLdFoV1GKx4=; b=msMccxmeRWCpu3c3Cogayr0DmHZIAMODyTF1swQfLvjHk0kynSKsF7dU9UjHd4yVhf3/YLtBbCo4yyu7x1o2l2MDKwu3wIR8hxKWsjwQz/oflbdeE0a6eqC3yzc7+Q2syTS6apjDmm5vsOl1YctMMkdkaIw98jNRjK2UlE4yRneNjxC7rBPrJa0Fhewfh5GhDy1y2Q1A0UmQCmrTNgbhabFRrBCTqFovbVeaAYgzTe9qyKh6OOUrXF+aolPuYqyl7F9GO5HyPoIPIJftxCdNS0qq16n59dczC9l7UHZi3QlUmVRycG52oWquotqKBHVCFw5sNJ4HzLJiinUhIYulgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) by NT0PR01MB0976.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.27; Tue, 13 Aug 2024 05:22:54 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc%6]) with mapi id 15.20.7828.031; Tue, 13 Aug 2024 05:22:54 +0000 From: Sia Jee Heng To: qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, peter.maydell@linaro.org, jeeheng.sia@starfivetech.com, shannon.zhaosl@gmail.com, sunilvl@ventanamicro.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com Subject: [PATCH v3 2/3] hw/acpi: Upgrade ACPI SPCR table to support SPCR table version 4 format Date: Mon, 12 Aug 2024 22:22:22 -0700 Message-Id: <20240813052223.1033420-3-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> References: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0022.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::23) To NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: NT0PR01MB1278:EE_|NT0PR01MB0976:EE_ X-MS-Office365-Filtering-Correlation-Id: e7854b25-1734-49c1-0e15-08dcbb57fc2f X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: 5NW6YyoEDBtQ+3TcWO9zYBXsdqBVoWVjBzpVKp4lk/RwjrBoITdCJMyyWi7o7LsOvWD4HW11M34TPsLqoInu/aWSIHCz9X7HNe23oTpMK1s0KZIpYz9ldPulXSiIFE0T2xpFSn2LKrp8FSjI0BDHphn5NFx1znLgDmSBb8enxK481XmT0BAUXRxWgYhkO6AM7YFom7SDdv4t9P9EPWsnf4As86bZhN6cCJBaIXx+zZzKK1Aav2XVrQpVGG9vxzLPC/MWQJy53tA0V4YMPtfit6IdWPEWi/1RoNayUUzky3jWEbxhTY9LaNtCmBXqb0dHtmXzKnnkieR63suSmcW44FuUzjanVbuInsll8w/n9sN5+nKiflCKb46Ng3NvCC+ptDWnCtrPCC9im20WlSmJmiJfsnVsd2WhytX6KZbaYx2BsXQSFhe5hP84tJ6bnFsKps0DeUYtW/0byJtDUm90cbtnjqYigCwHjiKgmGeQUco2Yfa700dwylSnTUFwRyoBOU12Osyyh88VHdjqBcOiqVGtsqapjM/9YXvbVCL2RMfjq1T2FA8ZDvxfKN9KJlEzafUIlxmTgGTK84abHAnJba24i1/kbNwUnLaenYN4z+zvDMnWTBiqsOmWPx+HEwGu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(52116014)(7416014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zvXjM1vZwsYX52a/uSgt8jWebRRz23zpY5IXIKs6f884kxW8EI4Xtn4q5eJzqOSTF/ru/5No0YPzt/i0HW5pfAbhfl1Ii8CXXIVw6DXDb1qvFdma8lHqbeIxigLj1TGxibCmShbBa9Fzyh9iAjEwK8+9ALQghiZun0zHpqVp29jqtbsmmTDYd2HPwWuyKFX+IQ51hmFnSC9WqwpjufpS2+8T7hpCx0PpJCAhUkh44/mAPmYnmu3TibxMzZK8B9CugqhTVsRjtmD2YyxOcZNkXJMd1VI3vtoAKNtqv7jGaZlYjBdXJSq1yYW5TXdHWypZ6ovVQNZ2S9rqK8oPlDxJDjX4zxwCtdDOQJv0bBPkXsRVXQB2x5wPEb2dnSRStyMYNpKs4ZJZGpVAGj4i/7GSt41Mun1YJp4hchOW46POBvwS7cAQhUt840/PFiu+lJc5GWNeV/JyDupaLGsVq0/Ovlsa7S3nnKQxizu81ljgm9WCypJdT/cqttEht0iNwKTmBHsIdKBv2bcyuqN5FhciW8PLMv3can1Qm147esFy+ItvPsngqrbNdOMnhJn6SrQCPmNgRxMVCwbS7ezTaTpQe1KU9Mbvvu4tsH/OiLWpGh/ujt/VGMef8fbq8ukHGz8IVLlGrmilaT4lqFK6NBZifTe2YDhcgQFUWZXBtAj++ieEiLZovOTFF73+cfvaP0WR8VNkrcGHn6zcTLSbN1E+H/zBA9IhdIR4VfCDENpL8ksvCnO4ajas9f7rL0Wst7WfU8pD0Hb19Y388TQdWaSYzVDWyMIUYCNs368i98fPDMubt4O2uZfLzsRp6YArFPFnkmX1p+VbPNAyktvHOtbA5K7QPFzJ/+/gOjU9d+25895P9fozPO17SV7QOFix3yKW1sM+bDsx4OegH2IaNs35mU2GEs9kD/FXnzsNe86xuVEB88cbg8RMMsYsQ33hBK2Cwa8W5BWyPXoRUB3NJjhPtkJuriIjqOBWlyVLbbhXoGdeVy7E89VbYSfILqtm5UbX/tEkd3l6R59xVer1J130A3Bj0culVj4t/TIheWo7dnmyh3G/rxpPSDeE9uJtnkDyva8Hm5XiZY/FjasYhHOAhXVZE564H981YO/02imoWZ+7Jx+yf4BwXZlBSCtZjJexh5K6jeQnK2Uyk05qcEOyU1Zvoweq3ZmLvr3G8tUuz7PudOIjMm2EXbQMAELjUF3S5Th/7jZ2ah1+vP3mf8+qOtVHFZn7W+22IqkeIYf4m+nANReJigpeJErdvCPBQHATD8JxEhyvDwwWvtNUpSIUMy7oxidmYlrUr8VUgB7RUbQUY2O2oP05VNQh3g3XFVIRr1U26WkWPMhuXjoUAiorW+eU2lYtMaOsnzIFjanE/KKq7PuAGEZu0Z4NFCotXBdMLvriOwu88tQfgnV18qrszvccY+Xclhx5hi5EEUqBI6IW0/HRciNueh9csngWGyqONILHrxPy0JM9wT9AVI0yLjNNBpfYWMQSC6+BY2gsMl0eu24cI4qCR4DCkv0L7UsaaRQywAXGatQcB624rcW8WyUVgqUz08OZYdfZh7sO8GIjRxBSYSvk1WWQQC2sgEqINkqMMOyIeB9GuU4hJPpG6w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7854b25-1734-49c1-0e15-08dcbb57fc2f X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2024 05:22:54.8926 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kiS14ypSL1dJPB6ddbYNT5mwGnH+vfj5WPZxGuXMlTLYcmzCm6CkF6cLVjBnbqQJ2Jc8C2B0D1FkT1p8/oJ4xyy3mLcIFuK6r13DKBN/wsQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0976 Received-SPF: pass client-ip=2406:e500:4420:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Update the SPCR table to accommodate the SPCR Table version 4 [1]. The SPCR table has been modified to adhere to the version 4 format [2]. [1]: https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table [2]: https://github.com/acpica/acpica/pull/931 Signed-off-by: Sia Jee Heng Acked-by: Alistair Francis --- hw/acpi/aml-build.c | 14 +++++++++++--- hw/arm/virt-acpi-build.c | 10 ++++++++-- hw/riscv/virt-acpi-build.c | 12 +++++++++--- include/hw/acpi/acpi-defs.h | 7 +++++-- include/hw/acpi/aml-build.h | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6d4517cfbe..7c43573eef 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1996,7 +1996,7 @@ static void build_processor_hierarchy_node(GArray *tbl, uint32_t flags, void build_spcr(GArray *table_data, BIOSLinker *linker, const AcpiSpcrData *f, const uint8_t rev, - const char *oem_id, const char *oem_table_id) + const char *oem_id, const char *oem_table_id, const char *name) { AcpiTable table = { .sig = "SPCR", .rev = rev, .oem_id = oem_id, .oem_table_id = oem_table_id }; @@ -2042,8 +2042,16 @@ void build_spcr(GArray *table_data, BIOSLinker *linker, build_append_int_noprefix(table_data, f->pci_flags, 4); /* PCI Segment */ build_append_int_noprefix(table_data, f->pci_segment, 1); - /* Reserved */ - build_append_int_noprefix(table_data, 0, 4); + /* UartClkFreq */ + build_append_int_noprefix(table_data, f->uart_clk_freq, 4); + /* PreciseBaudrate */ + build_append_int_noprefix(table_data, f->precise_baudrate, 4); + /* NameSpaceStringLength */ + build_append_int_noprefix(table_data, f->namespace_string_length, 2); + /* NameSpaceStringOffset */ + build_append_int_noprefix(table_data, f->namespace_string_offset, 2); + /* NamespaceString[] */ + g_array_append_vals(table_data, name, f->namespace_string_length); acpi_table_end(linker, &table); } diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index e10cad86dd..ae075dc9fd 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -435,11 +435,12 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) /* * Serial Port Console Redirection Table (SPCR) - * Rev: 1.07 + * Rev: 1.10 */ static void spcr_setup(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { + const char name[] = "."; AcpiSpcrData serial = { .interface_type = 3, /* ARM PL011 UART */ .base_addr.id = AML_AS_SYSTEM_MEMORY, @@ -463,9 +464,14 @@ spcr_setup(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) .pci_function = 0, .pci_flags = 0, .pci_segment = 0, + .uart_clk_freq = 0, + .precise_baudrate = 0, + .namespace_string_length = sizeof(name), + .namespace_string_offset = 88, }; - build_spcr(table_data, linker, &serial, 2, vms->oem_id, vms->oem_table_id); + build_spcr(table_data, linker, &serial, 4, vms->oem_id, vms->oem_table_id, + name); } /* diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 36d6a3a412..68ef15acac 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -200,14 +200,15 @@ acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap, /* * Serial Port Console Redirection Table (SPCR) - * Rev: 1.07 + * Rev: 1.10 */ static void spcr_setup(GArray *table_data, BIOSLinker *linker, RISCVVirtState *s) { + const char name[] = "."; AcpiSpcrData serial = { - .interface_type = 0, /* 16550 compatible */ + .interface_type = 0x12, /* 16550 compatible */ .base_addr.id = AML_AS_SYSTEM_MEMORY, .base_addr.width = 32, .base_addr.offset = 0, @@ -229,9 +230,14 @@ spcr_setup(GArray *table_data, BIOSLinker *linker, RISCVVirtState *s) .pci_function = 0, .pci_flags = 0, .pci_segment = 0, + .uart_clk_freq = 0, + .precise_baudrate = 0, + .namespace_string_length = sizeof(name), + .namespace_string_offset = 88, }; - build_spcr(table_data, linker, &serial, 2, s->oem_id, s->oem_table_id); + build_spcr(table_data, linker, &serial, 4, s->oem_id, s->oem_table_id, + name); } /* RHCT Node[N] starts at offset 56 */ diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 0e6e82b339..2e6e341998 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -112,7 +112,6 @@ typedef struct AcpiSpcrData { uint8_t flow_control; uint8_t terminal_type; uint8_t language; - uint8_t reserved1; uint16_t pci_device_id; /* Must be 0xffff if not PCI device */ uint16_t pci_vendor_id; /* Must be 0xffff if not PCI device */ uint8_t pci_bus; @@ -120,7 +119,11 @@ typedef struct AcpiSpcrData { uint8_t pci_function; uint32_t pci_flags; uint8_t pci_segment; - uint32_t reserved2; + uint32_t uart_clk_freq; + uint32_t precise_baudrate; + uint32_t namespace_string_length; + uint32_t namespace_string_offset; + char namespace_string[]; } AcpiSpcrData; #define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index a3784155cb..68c0f2dbee 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -500,5 +500,5 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, void build_spcr(GArray *table_data, BIOSLinker *linker, const AcpiSpcrData *f, const uint8_t rev, - const char *oem_id, const char *oem_table_id); + const char *oem_id, const char *oem_table_id, const char *name); #endif From patchwork Tue Aug 13 05:22:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sia Jee Heng X-Patchwork-Id: 13761327 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 7A8FCC52D7B for ; Tue, 13 Aug 2024 05:25:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdk1Z-00007z-3x; Tue, 13 Aug 2024 01:24:51 -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 1sdk0W-0006rO-G8; Tue, 13 Aug 2024 01:23:46 -0400 Received: from mail-sh0chn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::701] helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdk0S-0001ZA-IG; Tue, 13 Aug 2024 01:23:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ARMq/aiwQndqDSsQdJtJ1gJOWL5gwVQeTxAM4SCmFumbOI2Dcoty0fp075iDtVD79cnbozwKxxi+97vW4OalX4pT/LB9njT9oHjcB8NRjHst+yW1EIgbat+wmA2PDF/gdffSNGHlJ21QCrwz3sDl/wN7TI4fDMG2x59AEdx/bUSm9vOdaH3F/J6/A5D3DVLEDp0yPByA19u5fK6vPqXVoDZa/zT9uwAoPDdVmknhMjN5h8xW1DlUtDOOJ+wMu1O6s9J7eDQNTrZXybGE29yd+z9wOpZLyb5FhsLz+AXdG1gs1LVmKTRl3lP1C1pP50Se1KBUvoa5f/OYQAGvI3T2uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KFgSVy5zcbcF98v+zS+GXuT97jIWLhSpyDwq5LibbPg=; b=agzyiV+GnbM2mxNhBMwe5V3q5qm5dXvnex3MNHATnpQ9ZFmOgyIdXZQ1YLcU9V1qJ3TPD8FEQKtXWBU8ymbSN8BBmz6PCnPaR6N7BE0h0Rrw2hwo/9evTUx9CVuGLmHHKtO9+yMJpd8a1ATnzZnXaL4Nk78sax5v6lvq6wN7Pzxd7DnMp0c3dPJArgf1fTZvAM4/RSq23BznTezNFCu9XBQDIrjcZKbvSR/K2xICHTWBCefOZDWkubpQ7YqtVyuRS+7FRYLRkL9M7POC5uN+vjN4aoH3Z+GU6ki9Zh+yzuqHkLWCQc9V0pdqkxygPurCjxBFlnzhiQm8JBu4ePUXZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) by NT0PR01MB0976.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.27; Tue, 13 Aug 2024 05:22:58 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::f2b4:577:ed05:9abc%6]) with mapi id 15.20.7828.031; Tue, 13 Aug 2024 05:22:58 +0000 From: Sia Jee Heng To: qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, peter.maydell@linaro.org, jeeheng.sia@starfivetech.com, shannon.zhaosl@gmail.com, sunilvl@ventanamicro.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com Subject: [PATCH v3 3/3] tests/qtest/bios-tables-test: Update virt SPCR golden references Date: Mon, 12 Aug 2024 22:22:23 -0700 Message-Id: <20240813052223.1033420-4-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> References: <20240813052223.1033420-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0022.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::23) To NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:12::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: NT0PR01MB1278:EE_|NT0PR01MB0976:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f820f98-8684-447a-314d-08dcbb57fe75 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: 5AnKWT1S57NEzt0m7AU6cx9WjWTsjokIqIuuROiz5/PZq6Ep+Jy7Mylu79EOblN9OwBtoSqmKQz5sWPL6Ybs1vX2hHs9uQJFmRMFZr1pNSCXzuDeoZk/fNC6ufYo98ZNX+OMuxlj0Xx6N0tW7p1W7R/U7SRBr4K+8HEO/RyjAsGko89UOFPw696Bi0iy/mOJ+Luo4FaCvvn6XtpvxEWBY99Q6xd78bdtqkRrdlVAe0h+dct87gcVnbydso0zKMyrrokaWAFPuIAbCwyJWIqU81ZdufXNm7+PREUCNmqirP3Xsf5Px5x59WDl/NbwMmT6Y14p3iID0mQWX3vPfoEIMKsJnvGEqVC8veWNzofJ5zyZP7f46O+7/DHAME0aTKLMTT7s7AoTAFKGvFqx/NsFTLSY3v2lbrn5WYnvDoMSW1uMVa0SVQvYTlatyEqbEDQuZtO3CbRVPhPbupxSEcBqJi0poEDBOdRJrWiUw7mY3Q0rA18hNZXlpa1P//1y/nKhvilEVtek6lcpiHjGU1j5D7kydLL4o3lbaJCpoXvgTx2D7Y8bf4eZso0W4covenkh6nFFeBZQ+zIC5sRfORAsfArAprfpYiur5f0kq4tnYs0Kuvq3V/Iz4AroP8w7NEeD X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(366016)(41320700013)(1800799024)(52116014)(7416014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c0DLdRfyYqQIWJ7oNrFtvA2sQXvF6iQbTwa7g4YqYbR7L/KUC3NPWQq71KZoVYiSp3sFQnNy6aZ50zjEfEph8v8/4yPxJpkrUKOwWmAAMk5Y1sNhQwjtmh2Pdi2PHk+Fo+NlyNepNodspHhxuHZfj3KEyWXO7gp8Myhy7ZUyiMvrcurRuQsRHZh6deXlOZpxxNlyxvPsk2X2zxYFvHZgQWeSeJE/pxzoQjAlcQtxu77VjIo06IWFd6cqzPYmH3QfNtzp9x0UJD7x0XX/Jj3/BgqmdJj+HS8FhcJGcowD9etDhPtItJqqaP+++DAi4dlEaDM73GlWf8c9ckMecUq0tNOihpjMvWDcOblqubikRSdIWJ6xIrEusb2XP+UJTuW98M0ZBHyHdNEacn22nBC++Vf/rdkUU3pUZ4oYuOh/Dgg5TiV7qplYVVgsxRuTcj1JulIBIbsvhBker5iJhP/GotYh8R9Jm3dEAbrnd6KlUGBileNCbzHSc3IHHkmFlfs61dRLWQ9iCKNik9aYskOlnt+/JpikJ1Tk9D3Wasg988p0P1u9tZFMxaXbBSxztTzBapuN6k+xM9hTdhLALWyS5HM6L1RWwJTKaH6mKI0TB2/cNsMojq42dlggyZRS2sC0qSBaMvRWIJVY6eEDsch4j6IhpsKV+ZavfTsRsoQteWhxXGVQJOF3/+yUDjO4ku9UUFVYxPngZGRrfNIN2pMvlPIEXVaHwT45Gk1bZ539XgKXjG7pIicqyl5LrRK4qkYYKVGJpgiEfbVRAly/MmTxh5xrbc2tf8Lh2FH54dAtj9IaUJWkKfwA3fgF/GFI06c9MbGpRlIQqRBXxrR7Gwian9bTOcF4r1OsonJbtZXYVqo9qVLVxm0DmFvDcxPdJXzsDBovWPPXBvj7vRSD9iGPpA4ZRrky9g5alAJ8Of3VrQyE5zxs9qJQ0rqfzt5ZQFnbejN5mrGTuuZCJQTPgWQNZKayLseGavMwEBFbHLW6j+bsFvxK5IDAcc/47krkF8c5gsj1bP67R3sqSUzIfqPogBX9Z8eKPMF6JsdxyUujLwyQdgzlGvaO1vGbfOJNxUQj/whsO3Uw4JOw2W4u8kInAi3Q6fdQ7eWjRQ9S8+eo5wNeZ4LNxIzdfLuHJqg+gWQ5t0WT4TqAezl009q7AiXNjVSRQARXDlXNtLhoWXvP8aiUj8bZNj4ZnJUNQM4YYKQmDMpeAyPX5iql3W2gMd6cluxVRHkWwstVHvygdfmZIYebDt3d0uL3dav+d/IaDgumpHk4suSd9MBfENPdA5faux2PEmpIkT6tXVozs6DDazQpQFT7VFmA/nign1LHR5YIuF6zabG2+uNHkoTKhzqkHDYjaAc+uif1bBnKWHKlJTwnz4+T/WTaIr3pu/e1WL2xhbNiMy+OzLFf7ESdLmOjvJzvQwx3l6nSzc7NYisf7g1NjRq8f4KjRpc7Svmp8hp9OkNKCfH4jtfPTbkTqna5DetxoF1SBnVdxLXv4oB+yRotXh5Z5jNcP71psQAtTBoen7Am4ytYFwIHyEMu00qKW12GSGF/iMJxR8Jwnju1TJTvBC/xl7zKCyfYh35u8GyHyBM23jMPgrOQyeQhVqf4VA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f820f98-8684-447a-314d-08dcbb57fe75 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2024 05:22:58.7068 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ikP9NOeVeRkvec2g0VCi0wcAZ+vefrKtH935UX/tzWBCnIb0NuXksFBXvnp8bIXejuVxaLskolyxujbpgwz7BvpP3XlEFpA0xUVIZ3xjytk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0976 Received-SPF: pass client-ip=2406:e500:4420:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Update the virt SPCR golden reference files to accommodate the SPCR Table version 4 [1], utilizing the iasl binary compiled from the latest ACPICA repository. The SPCR table has been modified to adhere to the version 4 format [2]. [1]: https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table [2]: https://github.com/acpica/acpica/pull/931 Diffs from iasl: /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20200925 (64-bit version) * Copyright (c) 2000 - 2020 Intel Corporation * - * Disassembly of tests/data/acpi/aarch64/virt/SPCR, Sun Aug 11 23:39:37 2024 + * Disassembly of /tmp/aml-8M7BS2, Sun Aug 11 23:39:37 2024 * * ACPI Data Table [SPCR] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] -[004h 0004 4] Table Length : 00000050 -[008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : B1 +[004h 0004 4] Table Length : 0000005A +[008h 0008 1] Revision : 04 +[009h 0009 1] Checksum : 1D [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 1] Interface Type : 03 [025h 0037 3] Reserved : 000000 [028h 0040 12] Serial Port Register : [Generic Address Structure] [028h 0040 1] Space ID : 00 [SystemMemory] [029h 0041 1] Bit Width : 20 [02Ah 0042 1] Bit Offset : 00 [02Bh 0043 1] Encoded Access Width : 03 [DWord Access:32] [02Ch 0044 8] Address : 0000000009000000 [036h 0054 4] Interrupt : 00000021 [03Ah 0058 1] Baud Rate : 03 [03Bh 0059 1] Parity : 00 [03Ch 0060 1] Stop Bits : 01 [03Dh 0061 1] Flow Control : 02 [03Eh 0062 1] Terminal Type : 00 [04Ch 0076 1] Language : 00 [040h 0064 2] PCI Device ID : FFFF [042h 0066 2] PCI Vendor ID : FFFF [044h 0068 1] PCI Bus : 00 [045h 0069 1] PCI Device : 00 [046h 0070 1] PCI Function : 00 [047h 0071 4] PCI Flags : 00000000 [04Bh 0075 1] PCI Segment : 00 -[04Ch 0076 4] Reserved : 00000000 +[04Ch 0076 004h] Uart Clock Freq : 00000000 +[050h 0080 004h] Precise Baud rate : 00000000 +[054h 0084 002h] NameSpaceStringLength : 0002 +[056h 0086 002h] NameSpaceStringOffset : 0058 +[058h 0088 002h] NamespaceString : "." -Raw Table Data: Length 80 (0x50) +Raw Table Data: Length 90 (0x5A) - 0000: 53 50 43 52 50 00 00 00 02 B1 42 4F 43 48 53 20 // SPCRP.....BOCHS + 0000: 53 50 43 52 5A 00 00 00 04 1D 42 4F 43 48 53 20 // SPCRZ.....BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC 0020: 01 00 00 00 03 00 00 00 00 20 00 03 00 00 00 09 // ......... ...... 0030: 00 00 00 00 08 00 21 00 00 00 03 00 01 02 00 00 // ......!......... 0040: FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 // ................ + 0050: 00 00 00 00 02 00 58 00 2E 00 // ......X... /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20200925 (64-bit version) * Copyright (c) 2000 - 2020 Intel Corporation * - * Disassembly of tests/data/acpi/riscv64/virt/SPCR, Sun Aug 11 23:41:00 2024 + * Disassembly of /tmp/aml-S8WCS2, Sun Aug 11 23:41:00 2024 * * ACPI Data Table [SPCR] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] -[004h 0004 4] Table Length : 00000050 -[008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : B9 +[004h 0004 4] Table Length : 0000005A +[008h 0008 1] Revision : 04 +[009h 0009 1] Checksum : 13 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 -[024h 0036 1] Interface Type : 00 +[024h 0036 1] Interface Type : 12 [025h 0037 3] Reserved : 000000 [028h 0040 12] Serial Port Register : [Generic Address Structure] [028h 0040 1] Space ID : 00 [SystemMemory] [029h 0041 1] Bit Width : 20 [02Ah 0042 1] Bit Offset : 00 [02Bh 0043 1] Encoded Access Width : 01 [Byte Access:8] [02Ch 0044 8] Address : 0000000010000000 [034h 0052 1] Interrupt Type : 10 [035h 0053 1] PCAT-compatible IRQ : 00 [036h 0054 4] Interrupt : 0000000A [03Ah 0058 1] Baud Rate : 07 [03Bh 0059 1] Parity : 00 [03Ch 0060 1] Stop Bits : 01 [03Dh 0061 1] Flow Control : 00 [03Eh 0062 1] Terminal Type : 03 [04Ch 0076 1] Language : 00 [040h 0064 2] PCI Device ID : FFFF [042h 0066 2] PCI Vendor ID : FFFF [044h 0068 1] PCI Bus : 00 [045h 0069 1] PCI Device : 00 [046h 0070 1] PCI Function : 00 [047h 0071 4] PCI Flags : 00000000 [04Bh 0075 1] PCI Segment : 00 -[04Ch 0076 4] Reserved : 00000000 +[04Ch 0076 004h] Uart Clock Freq : 00000000 +[050h 0080 004h] Precise Baud rate : 00000000 +[054h 0084 002h] NameSpaceStringLength : 0002 +[056h 0086 002h] NameSpaceStringOffset : 0058 +[058h 0088 002h] NamespaceString : "." -Raw Table Data: Length 80 (0x50) +Raw Table Data: Length 90 (0x5A) - 0000: 53 50 43 52 50 00 00 00 02 B9 42 4F 43 48 53 20 // SPCRP.....BOCHS + 0000: 53 50 43 52 5A 00 00 00 04 13 42 4F 43 48 53 20 // SPCRZ.....BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC - 0020: 01 00 00 00 00 00 00 00 00 20 00 01 00 00 00 10 // ......... ...... + 0020: 01 00 00 00 12 00 00 00 00 20 00 01 00 00 00 10 // ......... ...... 0030: 00 00 00 00 10 00 0A 00 00 00 07 00 01 00 03 00 // ................ 0040: FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 // ................ + 0050: 00 00 00 00 02 00 58 00 2E 00 // ......X... Signed-off-by: Sia Jee Heng --- tests/data/acpi/aarch64/virt/SPCR | Bin 80 -> 90 bytes tests/data/acpi/riscv64/virt/SPCR | Bin 80 -> 90 bytes tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 3 files changed, 2 deletions(-) diff --git a/tests/data/acpi/aarch64/virt/SPCR b/tests/data/acpi/aarch64/virt/SPCR index cf0f2b75226515097c08d2e2016a83a4f08812ba..acafd161ba2e2fdfbf081d4977ea05621152c9c9 100644 GIT binary patch delta 27 hcmWHD;tCFM4vJ!6U|^A*$mPZbWH2x>L@?+v002b>1KR)q delta 16 XcmazF;0g|K4hmpkU|`xfk;@GLAfp4( diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR index 4da9daf65f71a13ac2b488d4e9728f194b569a43..09617f8793a6f7b1f08172f735b58aa748671540 100644 GIT binary patch delta 32 mcmWHD;tCFM4vJ!6U|+&Vu)bSV*mhNumqU^ delta 21 ccmazF;0g|K4hmpkU|`xgkxPn^VWO%w05v59j{pDw diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index b2dfcd60dd..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/riscv64/virt/SPCR", -"tests/data/acpi/aarch64/virt/SPCR",