From patchwork Fri Aug 23 11:31:40 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: 13775013 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 68497C531DC for ; Fri, 23 Aug 2024 11:33:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shSXF-0001Ci-GY; Fri, 23 Aug 2024 07:32:53 -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 1shSX9-00017n-FR; Fri, 23 Aug 2024 07:32:49 -0400 Received: from mail-sh0chn02on20706.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::706] 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 1shSWg-00086J-EL; Fri, 23 Aug 2024 07:32:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E30YCPtYDwelKG1T9/GUhNQ5QB/kqm++XNcbE5IUcz8tHxtWlfItTOcmW0yKYISzKeuYjGRqSBtqXXEOAOyzr7OTU9xsbNdJYDtudPfw0HCp/6iP/RBplV4U9KpcZoUvKqFE0fGUDgW8FwcXP7dm/QJM7GfVwbdpu+Mudvop5DbTR3uCzsPwsTjyaCGD0mtRylwQS4NbcpzGkvMAWdx5LNT19UavZpiok6WZF89foCF2aw8gTb9gIkWLgasPmw8ChpqqsaS1kDe/u1i7mBP1s5OMwtFNkyv6aDtW74GHldbwjBwxPHP/nJYVRgImAp4VW4qX2usrJYR+2pgXYrWO2w== 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=FzxH5X+32xRrw4I4+OLF9DJdKtLOWNhJB41gb/C45Gc=; b=eFu09cSVTy8xxUnHrZyZRyS5b9zKkm+ir4pvJHzPthhcu4wjh4K9cL0juzTNpvKA3QVj8SqRyibiM9VXhMZqnwehjBN0lKX2IcfZTv3lBW2mz6LL2U64OrlA3wCFGR08GA2cyz6cj57/SKoZTEfp+TTwzm7uUpV4hLj6BpA2IHA81oZlkxTGXi/8YBe0dRIHdoZzVxRaArGQ063hxPBwVUb19O4ECJDSoRiytXH7+5vECOvK4rbzlapBtqo7G+szrdTj+8/3vpT58wITOfFXsyvrNFk9PnwUQk2kpaYFvUFju9WthOUB+wYeoYTZuaGc0pyArGOS2tsrEhbR8JvUtA== 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 NT0PR01MB0973.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.22; Fri, 23 Aug 2024 11:32:07 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce%5]) with mapi id 15.20.7897.014; Fri, 23 Aug 2024 11:32:07 +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 RESEND v4 1/3] qtest: allow SPCR acpi table changes Date: Fri, 23 Aug 2024 04:31:40 -0700 Message-Id: <20240823113142.161727-2-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> References: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0025.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::7) 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_|NT0PR01MB0973:EE_ X-MS-Office365-Filtering-Correlation-Id: 382391ad-5092-42e3-4849-08dcc3673812 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|7416014|52116014|41320700013|366016|38350700014; X-Microsoft-Antispam-Message-Info: MEOEiRPsjfMQkeQOazioizwzE+Cpva2I1kn3JU0dp06svqZI+aBuUDfpZMLoZkbB1hyfG/hrdYZirPf8hnUiJ2eAGBlnaRckIapLvELw/rafRT1MD5ZnU5ApYMlVGdPBH5WUPfXENeiBpH27fumo2JXqkuHctHIeLr4+uWPPP5Ykgg7hZpINhwu4POjPf/AL48YwX0bllXlXorRc3usYop93ASZtIbpZhFpGZCFMnGFZT8+HbN6T71ekV/82w2y+SRu1pHLx/Tx3oEbuMgn41B1g7UvNeJVTTpDnIm8Vk+qf4aYVkPfZcGZkOVLyAkidc4dFfjKER6zyATjXe7nJSLZeTPQoLTayfx8SWqRBW1/4KkMKxIMeOa66m5CAV1C5cf2DtiDOAKJihnHNfC3AeQgGViJpMWV2R5y0tW1957DT6jg3RN7UaYQB3Qa96mEheATCXkqRs36wbMkTYMVy36LkqeoI6+RDOc12KKAwBmysO4mZUgL7cxIWjXivUPgiSw3y0b6vwyFYgplBUMaUARuzezyzu0CfTzwbAJHXIrN9a4sdw7DXmWifQ0nFcqZgSqwX8sqCFvFORq2k7hit32eqHgVHZfzeGwLGVYLZaBO+SbY8ci33ye6Yi4Nx4fQ+ 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)(1800799024)(7416014)(52116014)(41320700013)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1X8U25ye40lShL43cezvXZgxns/Ahom+i7OmhoyP7K+cEPeort/g6GaGd0BcNNT7G4JrqbhmzC6dlCGf6ERXeS0PtVMBFGa9r5wNzEZYrG7h3rvh5Nn1r3Zjqlm9Z+T3M6SMIQyGUfTd7EOF0vWPl4KVpAqj5B48mG7NRJaJHfFcJ7jEofkjXjKTUO2MUJVKqPCdOphj40w2qcZKow6ZtkhURKWXhM3CWFd07xRRbGrbpuzGLxxWth8uKD4e5g2qhphbV0pDDoZkcmrrA10oqhrE9O/2s1mp2PYguf1vK1pSsKz6IxhIcDXVPMqMVozgXHwTpa43SaY/VZV9m81YokKVUD2ThtNDfiDBnIpNfEMaqTEZdhGeRcV0N1wWa82oU6Oe0APvxIEEC1XhDalH0UdVCXppeTKzUgMrC2CsTZscpLlsc0QFonO8O5mSdZaYTmfG2m0rSv2c6VzoN01UO7m9gJ9j8dWSkfhZrcNDi1xBDbsxLc90xZAtSCvZBozbhaBwx7BZ6ok25rQyWBiKeKB9qx80FpSRnewQ5XlQNiE9+1NmIM2kEYIY1qv3G6u3ySXkGKI0d5ivBbh3gFBvqtYLJIjV/NQCHFCZIe2+b2eqA26Fsia12VXjYL0mDv2TMbJNLaa/djhipflN50IWkjYwA6NnvVjrVdIua8HDDNmBHXOjjBYOrNYh2uhSnHkuAx0FsQM/RSi29SPJOKrKQBTCUGlqCtwZgLiVcjhSHfTZCjHZ24wvkCg3bi3GGaz1b0X79utp3PtY8mGdtgf5oTHJH6khW5CtORYVZ99/6fblCUazc3USixkqrRVGR45KTNl4S0UJ3tGeq7p29O0UP9lr1U2pXOjEQc4zP+daIvyBKB/XcukJc0cHkwyOthiieCNdpbqNsnGjInImIS7IGbxtDJJfpsxxYBrx0yB1Q5i2bLqd/jqiRtyxAJOTcgNnv5jqD1u1pp3s7h98R12oAXVUOQ8KAf4ACOljSQNnqmHVBjbaPb9NU0VofQDVVvqH9gi4jxWQm9RY8EfmRPjlGROHLYOt0pYItQgQ2ZilAegp4LWpiX4ieYvAB3ZynBybgoxGfwVQhEXdsExIziTi37/DOCnvF3MA3EDTA4/w2DsstAHd66L6JQsSNPFwq8F3T6xibjR6PNLBVU1wLLLvjFGD88x0clqaaaUUpV0h3S2/fyCL6q5X8xcYOFopGzcRyJVy01VnwmX0B9CRQlgmjOs4orrMdMF13iCqD6qJuyvaH0iDohBMW6eBiqPDVE7NUZaJy5szZz/NIQXQDtqIcICTI/Hr7Wd+F8eAqWPv5vboCL8B3Nr/rBK7TdYCnp/8L/KONpMRZe9GmJoC4VwihE8xjI39fu2fZlki7L9rOODTPMBKzlIb9k8aG//yccXN5hlYN5ZiAwlcAJzJTG7gA452Dj7YuVd5e6cf9WddGs7WTOnsGRP5eQo9sobCE1sPd7JI7y7abHiJo52OlIJtGv8OjLT/CJ1bess282KbKMQnH+XI/D8AU8iMZDBNupiTd+GUZBtM0pxg4l01qjYpFb5LHtGe7jjnLCSI/dQgZmZystkA1GcEvWAH+FKBhugtmzo6QV7+YwF8ZPjzC7LKpA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 382391ad-5092-42e3-4849-08dcc3673812 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 11:32:07.1710 (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: TFIhjdFAnDsbDYbaoN/ObJBEs8QZxhn/at6Pn5oDSIJJQRq9G+k9yt+1JGrPY+FRhjT6SCw/HhU7Y1n1pWBG3ZcxMdmDbU/wtZHNJ8LgSg4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0973 Received-SPF: pass client-ip=2406:e500:4420:2::706; 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_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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 Reviewed-by: Sunil V L Acked-by: Alistair Francis --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..aae973048a 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/SPCR", From patchwork Fri Aug 23 11:31:41 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: 13775014 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 5A0F7C531DC for ; Fri, 23 Aug 2024 11:34:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shSXG-0001I2-Cp; Fri, 23 Aug 2024 07:32:54 -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 1shSXD-0001BN-Mm; Fri, 23 Aug 2024 07:32:52 -0400 Received: from mail-sh0chn02on20706.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::706] 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 1shSXA-00086J-QF; Fri, 23 Aug 2024 07:32:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JgJxruUIz3JOJ3L+kL5F8yFx23SyRTcEJt3Ll00q6IuCdoaInAAhnoZ+RUGLxiXvzL8BCW7xVlnAcn4NAza+JkewlFVWyAw5piB4VqiNIb27xltu/xB7DcoFUQFx/k2f4rgb1GoU72DKSp/3ztk87OMH8TPHmGOlqTAQiwFFh2Ub0qjg7gZXxsI2S04Plk8G1xs194+rVg5Q7agkpiJWa7QgdLuL2YfKSPN3/TGy3mjaDuxYQSR9LsDhp2MvFp59FdS7W/ePO3apzYnpHlsE6eEj3vSvuHrw0rQxyxjcCqoOHJ2LGKXRHxQIrVKrGMjPQ5LIws4mpkXUm0vCnEONzA== 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=UhLS90av1iSS0tvtS4Qk4EXpxNTCqeCFCkRKwh5pL2I=; b=NUXhEuybZxVUvSpPB2j7DW6x484XwvhO5529x28gEDtxLhUE4giHhawliJ/UcN5bqjXdaEoXi2S57rCZYNR2OAEckPVJ33jRNHU2uovGW3LuxoNU32dIosSiu8Nncb2DMyp5KF9pgrP2i6r0DAdu5lwYt3wn5jwcpbvXG3FZBcdIWcbTRGk0LUui/j/jaVuQHrqojZx0xOzM5wXo5/Fy91yn6FdYhhqANTqQ8Jq2rAhnEGgN7Lrb4IcroJfF6ZhPfQocN52rtqsnZps5GhNm02+N90jl3JnYxYqI1/9JTcD2bPFBv6w86+VvZEEvS9tDt3oaBawxPQ++488dHwZbqA== 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 NT0PR01MB0973.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.22; Fri, 23 Aug 2024 11:32:10 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce%5]) with mapi id 15.20.7897.014; Fri, 23 Aug 2024 11:32:10 +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 RESEND v4 2/3] hw/acpi: Upgrade ACPI SPCR table to support SPCR table revision 4 format Date: Fri, 23 Aug 2024 04:31:41 -0700 Message-Id: <20240823113142.161727-3-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> References: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0025.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::7) 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_|NT0PR01MB0973:EE_ X-MS-Office365-Filtering-Correlation-Id: a0ae07ce-4ed9-4d7e-5f6d-08dcc36739e0 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|7416014|52116014|41320700013|366016|38350700014; X-Microsoft-Antispam-Message-Info: Y+BPU5QcugEMr4z4nFkjkG3oKaEsB98OKYpfowleQXXy11643k9VtHjqbKfOX53YkIIe6BMF82Xtrujud5hkeACLHJ1RxhiW9AA6KD2+sFQJ6GFe6UtjbvGW7d9HyKxBtWGL8XZLOFvGVlIdVzOUK1P3JaL2v51cc+/ZkU4vqhuZmpgpVMe/mzyimix68VBaleplePgvkcfORyLN2Pb2IPe4PqShL2rHA/2QXuwWKeqKLWU+SNpV56YZaSl0XVSuiom4Uyc6Xux8cAnCLVJNrLm2W/8Dyqeksdpq+QyQtlvdDPjjX1TkIQ+Vk7np+6hZWDBLKDyJDc8RQKKJtJyfKzDJuG4bK7PUGrocfIlOyr2WJbIRH9Qyq/sO5vMScHFqMjWM1jlkmPTR1vtU7dZ6ISsOEB2znK996YUshNWt8xBihV6hL82oAsqOoFcpdKx8AJPZCh/mAF3RkOIQ4rpseUI4XgQ8Ts29BA0IKY1OJcYkUyTlYD1qyYM1dEtJz+5k6W8wsxCknmxERksi/piWvKFZgrwCmZcH+qBgWbyhYtHXEvayTr4HnkTzBp3zvobN0vGJaA88LPDiBe4pkY18d3eFouCMN8RQ+q0DEppJYgo17m7rziRr7wO0eC8UKTEd 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)(1800799024)(7416014)(52116014)(41320700013)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qqp9Yc3i5ApLPeYdTA7Ygyy9pAV+T6Hn41ytDANN5oPosbnwFmqMGKhZ2GOt6bXzo3qe67lkaWoMUZKRgEWYTxYjQeq4xRl6Flj+elF9Z2QB6fewI70qizzM0BNcZ2lcsNn9ilgxjY+lVXoVGKnyBodCS9esfGMVEKy5RtEGr3lfrpmjyW3BjUiJ9wsB8iEs9KWACj7dfkNY5/Pi7lRm7OnhDh0XwNCFvcHb84TTRNkAyN9Y53lGVf6aKrnQ10xtFvwMme4bdPfmHJHHzMYwt/H1ET3GO2uWwfxr0Hkvbd5ZggVP90m0yflk3ly25SztmRik67LJbLkKx2htz3Ex4ewRu+KS69axNsqBOb9iMYEi2SoPS2PI2IfggmBTrG2xc8XrXfl0vMq+o0sI6t9soPaxWQzBOIlrBv6mgIIQQYobVGfrYqbD9+djmDaTAMtagSsX6/uRluADLkeHcCm3NUWSJtUIll+nxrrJ+7sEyrSoXsKFiBc6j+Pd2n6HQBB2HhXLue353a+ly/qRLvlePab6GXVgcCWXtR77nBOrYxqlfyy1O/hPg9peCjFcPWZPdQup+L2EROc9Nu8fJu9Ubsjw7TY01DBL1GoKHm8jtZqT30S5suIcQgpDULLekCwc8jMjp7tgKu86R3vfmX6/VV7bW2sAGq6cn77SI6S3gwI+9QRWoXhfOCnfkYIneZuLpp1t0iorEN9elO3scuAAWq+uMHWJP9sM4lN2mJ05Dfy74o82I1IJqXsuNlBJcThVjg0uT7+Tn/5VVrrUjSs3FIXiZvBk66VqdbPv1gAThLyVe7HvSV8A8z6ZKXzV8QCjtwVYkfQNckYLbJyea+pBDbZ5j2jzNXEfv9Vh3Ikju8PVsFBuUzDUQshGIRhVHBrESBDpuTbGAd09dzx0BDuU+5nBk5gVE+0X/TDabnngLXBxT0zkkIbS6zYyq6+py83ReQpvnb5Q7Wu8HieEPzWp5nNXjGhX2IimYb576gDSW0hgVzmm/PzNwD26SC1N5maJZXDfkOh9ro8BDHuaPO+IP0wtK1p2uSpY0tpkjogL3yU+duOmilp/+Btnpp0ud0TkEbX+gEr+OPfzCnP8llCeCZ1ZO1g0q9Zy6XC8mCfyLBo75knIOlegbQUT2pH0Qn6ifP7NVEZRs5D9i4IIoyBBwYqk8NPQfDWliPU+CdoKYcSWo9BvzLKdiHsyF6DO+5rqol+LrdvWgqNo9JT61FS0/70+HMKbo/kB7o02jeeJhLaRxzsbmkM0RdemIYfl7+fbR+O4J/Xyhva+8JVFU/Zd/3mtzavrIDA7vcBUaa6unhrCwbq8sTSFKz2D1CONhiOi++OCFUlVn25s3osiIyDPaZ+pSVFOEMjIzNziOibVolQkBu9x1D3LV4pEvOBEoqWMhvGvwWBUoL9AhTTMehSL3Fe5Rdy/x0wig6U3vdsTBAH0XtMKQx4FwDtYxVmRucbqZ9l4oh1nZz8IYTPjvUKTYz+h0zrBOAbeAutKULWHcellcpbJ02E2phydEk5RNeUTWgtkzvRP6GNc9xzFpYwOMnbGujIrwkIt4AjU046xDO1iBOMYIIR+5AIPb8nINAT/cQEtfv34bA67e0uMfdrGZA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0ae07ce-4ed9-4d7e-5f6d-08dcc36739e0 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 11:32:10.0480 (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: FHh4wocUH5VMoybHsWQzWZH6bsQNQIveKwzqdKhpFPaJoJwUCoEiumj+bsj3d6Wq4M/7HCDj7HL6IYeAbYM7uYOmHTqbYzRMx/Whx1DpNK0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0973 Received-SPF: pass client-ip=2406:e500:4420:2::706; 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 revision 4 [1]. The SPCR table has been modified to adhere to the revision 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 Reviewed-by: Sunil V L --- hw/acpi/aml-build.c | 20 ++++++++++++++++---- 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, 38 insertions(+), 13 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6d4517cfbe..ad0a306db1 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,9 +2042,21 @@ 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); - + if (rev < 4) { + /* Reserved */ + build_append_int_noprefix(table_data, 0, 4); + } else { + /* 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 f76fb117ad..cc27ba7daf 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -435,7 +435,7 @@ 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) @@ -464,8 +464,12 @@ spcr_setup(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) .pci_flags = 0, .pci_segment = 0, }; - - build_spcr(table_data, linker, &serial, 2, vms->oem_id, vms->oem_table_id); + /* + * Passing NULL as the SPCR Table for Revision 2 doesn't support + * NameSpaceString. + */ + build_spcr(table_data, linker, &serial, 2, vms->oem_id, vms->oem_table_id, + NULL); } /* 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 Fri Aug 23 11:31:42 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: 13775015 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 08581C531DC for ; Fri, 23 Aug 2024 11:34:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shSXM-0001h5-Ky; Fri, 23 Aug 2024 07:33:00 -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 1shSXI-0001QL-1d; Fri, 23 Aug 2024 07:32:56 -0400 Received: from mail-sh0chn02on20706.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::706] 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 1shSXF-00086J-Bo; Fri, 23 Aug 2024 07:32:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ncWG6jlvs8vC1RFMZ7DxmplG0S/2CT4ur6poCpwdQBphCIHpWGg0E1zz9TG6ozHmz4VO/UyllX2xfd5OZP2vYhQKSC8uGWItR9Mp3SE69tOdnsN5W6XVsJAFDZHASx5oW94ivrNnBzQtnTS2qDICSYlq7PEOrf+4invBTOh4EbPnQqhqZr6MN84CrlEbsw8nAomuwGLiRg/O4aYKY5hCMn5dNpMyfo/UHYsHP0BUpz198kqIMUjko48JDPThvmT+h81GQP/VCwEb4jFDL3dV+qm/eBmFv3V6L9SuwkQu7HJ+OHZqQyXhhPaEyjjYal6S0SVcShbk4csA+z1DmmvMJw== 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=JmGMyq1MZKLP2C4HOPw7aPDX7g8TOYFd6Ri1Rt9aew4=; b=RQCx40mPwjEuDN+NZ5Iy1Dlj1BKiwgDMK0YyQMkUh2esJCRIgl3a+r15qlJeZgyx/n4Vn2jfFTIyhhHCBWA3J0WVLc+pa5wlsQQisFl7PDfaES2acKMw0EYma3CDFv7SUPF25J6WvDsXr/PKWtzO9NMyUWob+P7z63+yJGLCxa0MfMigAzec7tEC5WLJ/zShhBslTdSx6OkvXyKpV3IUTde8DC8a7z49ZFiECLHlkpBplw/Hkein/cEZjdb5Zif0cE0FA/swTUPZyBVRCOWEdpMVnLUqWLX+Fqf568IsrCUahOMgEBaPVH6vWf4YR5nnbjLGJhmopKjoyxnFKrzxPQ== 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 NT0PR01MB0973.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.22; Fri, 23 Aug 2024 11:32:13 +0000 Received: from NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce]) by NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn ([fe80::affa:7fe4:57c8:11ce%5]) with mapi id 15.20.7897.014; Fri, 23 Aug 2024 11:32:13 +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 RESEND v4 3/3] tests/qtest/bios-tables-test: Update virt SPCR golden reference for RISC-V Date: Fri, 23 Aug 2024 04:31:42 -0700 Message-Id: <20240823113142.161727-4-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> References: <20240823113142.161727-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0025.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::7) 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_|NT0PR01MB0973:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e2922ba-9b9a-462b-5923-08dcc3673b96 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|7416014|52116014|41320700013|366016|38350700014; X-Microsoft-Antispam-Message-Info: iruJ35aIZcybldT4oZ8wbcQytx8yE2z83c+6OE4U2R2ydPKpU474VotJQAa6dQ9BOPon3qJdocsdBk3dks5MQZeSqAa/23qsUsw/DVmRo7X1w0B9IBf7IbmnzTBa1awCaooeXgI6uN/gX2FDyg0aYEAhVnPAqN0hYvoxj+92VicVEzFLip/yUd0Kb5XJiHWYQUHQ9Nbyaa4MVaiXgSwcbUKFb4JvZcHqRRTTLdam9Juu7qj9qKr8VQGEBJMtBszH50E/LoOm3EDTtskSZZbcynLP7wTtdySF7DXVdne2MPlWLBuiz+zdm0yigL9G5ppjwh2pF4QnNTMod7TxEhVfiLBPgrjVtZeb1ulGGsxnXrHRu7rk/qCIGdLGpgMP4Zy2R8deSadDOR/VyVMlOKdX9WaCObZIZ6kzRazc5+Kceg5l5isK5yqKkn/Oy9d6Elew+y/6ycEl9F1ry79/2+xGyjGEOJhaquiIU//a9IPpsUcUyyIjyzuPwpJRX28fqWde+n7tFshbxbnPY+56rf53+aZj/m1ImciR6Slh3U7sb/4C9HoUV3y8NcuXYQiiYzgHhFE2M6l7YX9xQ6XHpB+yZheLxBvLIhwY1y5ODia2HCoE6tUYQF1COrBtoZFY0Q17 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)(1800799024)(7416014)(52116014)(41320700013)(366016)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TM6Rew17ssGtkE0DZhZn0nOKqVTGAeHdI+oaw24eF2NDYj4iAatlTnDzm7KPH0se9dMgagicjh9Ma/57f4PIgZrVva04u1m0yyG+bRtbwWJZ3ZnsA08pQ06KAuJoC62q0AzIOQ8h7cPrsdXxnRUqtHC4rVtOJM2S2BuE1A6s66KTOp49OOFEfXOw6wznQdkVU/wFZySsb8joUYyUkORKlaE12hGRIIUL6xPoAhPW9pa9xZw5BjvTP43V2qMOfq4UGdZUTSMTBntA/zu1MCB/tYP0WKict3zW8S24s1p1rOptrc73ATLp3qGWfU6rvs5FUr4j7i0j+437SdtEDlGJush5hBUfx50qmde/58GvOYv6Dk9Jt1jvST9iIsbgqzitmL7JgUEmqRNqKsXtYT71BRJRmpdcGSrXZ6hZfHWhNIGSzB/ytEQ8kL1P4E2Rsjw9SRKfGf61cOlKsCk5tfFZFbPQENUHU0gd8nfTq4CH1nvyxSTXwRQ5ljAV3UZHgMNLWybYR6Lr4tAqbj7Ca6Bzq8G5Xh0ZDeLbXHitLsenZ+wm8gX4FBwIsM2bXBcDOD9bdBRl/uPzxxld9xnsvNT4FsEsREXzcDZVvMFIpvEJBmYSDf9mJHSkABy4lAY6Rfj6yTShyNykwkZAj9Kxeq6l7OCufZLQ/8FMAacR1XpnoFVnkSnZ7Wt6PrJQ6Pz/guvWp64G8bHmVRQD0I8ctpas9s12gbxkCqRySEBi/DZeexRBo5QcjgfOuIeHH6s5xJxRbb42Ubi0edXXKAKNytn9idY3t4uXSJJP6irpz9BQn81SGazs4XDVDx5Nlu0MLlJQf1FPEnxMduAW1kyg2fEAzVBfjF+aNllhTRKqJiKgYwEDjIgdYP7XjVrFyykaVAFx2DSZAboHT58xJrlXUMVRBduaJZAVNakW6h/FyRwd+wvg15cUOiBeAEnW+PVY0O36YyaPe/HmvbYFtL8DJ+Iol9jzzRlx5AENNow2TwZE1TO11TgfvIsdYOjYelnrOjY6UQzrslN1Wx+ala2dCzVXgLDuxhJUjY1/ZKRcz4bQM4+6Owc4n8wZltzM5IsuCtEOFOvT5uXKDyuCi+Crdwt2JiFGRrhCQ4nRuIagAIz4ZzN6SFzMK0Gi1ww4IDIZUiHLYzquBS0TaGJI99A1G0Xc2o4EFTOY3hA9QnJh+nPAAHuiGnu/pLqUJ1TmtO9PV4ndxBSmbh6sT8hjmw/j8EN1sF3KGE6WewQbWkNDQnJ5IPrAGkGtZ/6yFqmzlwTGpPgXrUE6SD3Lvk7hUOND0JQN5Tk4TSGK7iZpacEnHIUTw8kygP1csBeFbzrWWgwyprK6K4i50n0Y1x+JfE/fi+txQ4OSaAw4UHW9MRUE8JCslIkbHN7RvNg70uh4XIKrnH9jeKcH0gIirW35kuyVV5c1Ygp/dn2h3BkkWnAt3G5N8FNDn3qZMx/3tZISptvWyrZruCgxkbpc2kcUa7/J6/NDwVcJwXNipTlf7A2N4GOObraC4FGuMsE1Ld6Nsq6omI46ImI3lMMGPi8ZWrSzIBrxQPDmnyNxwKBk4SrIiRRpLvDpBRjnMAxGoKPlBvdDyu8PuEug4IjmUHHV53DfENJAUg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e2922ba-9b9a-462b-5923-08dcc3673b96 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2024 11:32:13.0193 (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: nQgs8lI7ptmBNHgcSvOgG14dlVeVzQ0PKRiG7m668QWltDAjoeA7egae86nPyTkm64cSZRNj2fzpwv+AqedJkQIOTxIruc8rjUltOyb9b3I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB0973 Received-SPF: pass client-ip=2406:e500:4420:2::706; 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 file for RISC-V to accommodate the SPCR Table revision 4 [1], utilizing the iasl binary compiled from the latest ACPICA repository. The SPCR table has been modified to adhere to the revision 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/riscv64/virt/SPCR, Fri Aug 23 02:07:47 2024 + * Disassembly of /tmp/aml-Y8JPS2, Fri Aug 23 02:07:47 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 : 00 [04Ch 0076 1] Reserved : 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 -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 00 03 // ................ 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/riscv64/virt/SPCR | Bin 80 -> 90 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) 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 aae973048a..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/riscv64/virt/SPCR",