From patchwork Mon Oct 28 01:57: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: 13852786 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 26FE7D13592 for ; Mon, 28 Oct 2024 01:59:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5F1O-0002kw-48; Sun, 27 Oct 2024 21:58:18 -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 1t5F1M-0002jB-Dr; Sun, 27 Oct 2024 21:58:16 -0400 Received: from mail-bjschn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4440:2::701] helo=CHN02-BJS-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 1t5F1K-0007Ma-Qo; Sun, 27 Oct 2024 21:58:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DjZUvgdiksopPZUHEMx3W5WgxRhczgp95xmCFkHbOgWW6I+b3ebbgfWvS+U+fXShiCXPDSYBPHs5hm72OHdHK16VmB1QpuADLvMbMKpKIuUBdMOaAc7h7cz/0vtJVGIeIXRwghTWqr/mpHNHV+fkN9kyJtbVdlJ2NZd/mmWqujTNEvl526cll72bLyKrOyzcgzTju9NhRaNB78NHMKiwd1vbiZFq2vzfbsDyIR2zDYLxK6InJ0omCs/cwR3Mzm7jWiozyo0dmnaAv89H1phWwwZPiIklBbd+HuDP993kEf+iAR285gtpuB8rrxaXsviWXRn5RbRFzMvoGUFRgYS2Ug== 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=Nc19MmBYw6Vx2TYDeNGr+OaoONIwYD2PizJpxZnmVMQ=; b=C1GPpvtlflJLN7pspzlk1NeUamm7AmmkshpKZ1ZcHeRpC+XFuRdUmz0/XdKiAmzqC22OBUeIeRAGnTIFTN8SgUmJ10YJ7qbqZHl9jlHbvtdGOJfUj8Md37lOVYIL1Z6vnJnINioWWjlzeaTaYjqbHLbfLJD/wXCln01rl3aEiew+4ew0M35FENEZbDtkA2Ejz6phLyHaZughvm1lTuYA7RV3FcQUQ3foVKQYkMwHzf0SPLo4VGyOQd1exRsCWiriSzxUGOeXupAUPNCa6unTGRgCLVbA3HjS5790n9xV6Es35s6wlw2qQhZygqGy8qNGzkM7RNT1Hh7ZeZzWKW606g== 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 NT0PR01MB1263.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:11::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.34; Mon, 28 Oct 2024 01:58: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%6]) with mapi id 15.20.8069.031; Mon, 28 Oct 2024 01:58: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, gaosong@loongson.cn, jiaxun.yang@flygoat.com, maobibo@loongson.cn Subject: [PATCH v6 1/3] qtest: allow SPCR acpi table changes Date: Sun, 27 Oct 2024 18:57:42 -0700 Message-ID: <20241028015744.624943-2-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> References: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0024.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::8) 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_|NT0PR01MB1263:EE_ X-MS-Office365-Filtering-Correlation-Id: 4dc88187-db58-4503-ec1b-08dcf6f3f927 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: o4iG6wQMkiAYjNjprd3cjepT3gz74JP58qvlfnphscWFcTUmhOW7F03Z3dQ161kR3LJVi8mdoe+RHBDV0hKKnz982kHIshgaCK06LOE7mSU/PL/mpq3lIw0SPCdEir3mKk3q/h/9QqASYNRbL+rz49WO9TNgWQ2KtOgUufBcEMlJ0bmv3BKKTrJP5yaQAZika+3vNpDpqqsstSJCZgJ3Mktbl4pzWQaL0YE4PBwBlqQN0Uc6SOAY6/j1QooVsLRJmGCrdSqOEIFMZW1oet64gsQZPtCoDxmIlS3dG22QACkPFfAmw5BpqT4WNLAU3VQkzkOy3Hg1aBmJbH3xLFZyUTyAZiV2YDi+LlvLOAMPsLTiXM0XK+DueleEJP0qQRyRWSrjY5z+oM2CaAIOVOBCHBvHw87Cpxdcb5/kIZyqQB9ZMzRDkgh+wRVCxPNt45DqLiGxuY3LF5QAKCSpomJEMUa/7oUgIENhhb2NIt3WApwgcFuCS+4nk+r9P7R5cJ6rLE4aoKwhAZ1RmukOh8J3HfYUq7alTLcu5hiqBPAkAUrX7zzD9Uil3RNGvp1PoJD2QjvSvjmnS8Hys3QAflDzfvsk+4hiKGpj1+d+7ml1W6dZoBzXn4PzgzERCMPiNEKl 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)(7416014)(52116014)(366016)(41320700013)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uGAwT9KEubI9jxz9FiH8uEQvC7DbppGX0KPOw8lvAglk8LJD8iM3exyd/6X3nEDOWKu8D2GWdNQ2/MKH3sPvlkxQ+ZAJbKbBKpwZauz+pv7CbK+BUOo5/mBV0D37HyZJjhSTOJklj1Dyue9KsAaQgR6Vii8RoOZau1wD6jt9ONea0OMjidXruHecflzP/+kbokP26+cL7oBL8voSzbFX7nDZzbnW+YhMPXjd7Z1n7OztJL9RM3Mnw8yKHhk6M8NHjg/50o1pqG4hdwcG5I400VnMBzsikn79j03ffMfyzlf2dAwcx4OaTyEngupQeNU3ADnYkT0cfkmHFwV0IW/M0XQpFsSEpd7Goaa1+ui5LlhWZX5mEZifiYij/uO7dwlR04CDNZ+b7lBsJIJJ+hjhymg8RJKAeWje2yC5Nm09BukEr8rEr/ZCYsi8kFhuLaSEE1ExFOcGXLsfDUOnr6iLUKymQj75XzdAcKYI+tLInVc10KwD35tntqWN4LsrbWthpZwpWXfu+KYJHZRSIfgtJ7TMpK7vWbpkBzw9OnAwuB45qm6XQAYzVoMGSHLWiUZor51zfb5nYhm4itgvppMnGyZbnQS7Q9O9RMgckMIU8rugLO8SLFQktOk1Hi+isHM2BlHX0dihe5aRugeUqdoTMb7eE8WeVLrfqirHxZvZ8HVgSt4jBqB6DPnIgP0L4Sw/gBhM/WnjcM/6QH1cj3jyrZpWe8RH1H6zCfHVNGtOQJ1sRi8xDEtstBnwbw0nXpgnj/Opy/ywnDKT+Uyppt0NPRLo9NApjrSzjvACDjkzcY6opC/UmuL8GzVYtjkrCvsCXLJt4CbD24DDXy3NL9nHyEFGmMhSjIMBIK8psKZTB8LpF0BiRv/zHLL8rrDfG36w/UPF3rrLbKVgmr6ERltFTthkfipChx0N8QNpolfIEy21eBeAtO0J0LcNZeh6og9dKJ2mN4hI60MWyXsS1bL4Egesrne92HwGGmuXUYUVoIXoEdLQsnoUD/XD1MNZP/kvoBLhBjzrndbKgeSQDr8BPwb7UETPevtQmR6rbKmIcHiphxWU4EVaWaw0TwRa1MZiHlhd/AeOFA614ccUMkLBLQfLNGAGzzfQJWHT3+U5iCGFcXutf4Nl6fC25gVp9YhHjojjw2sizAJk6Q2C9buOy0SOWqPEAXyH7KOnajEUgBrg7EXUtmcGaUBAWTO2wL+4C8GBTz9ejrTD8qhQaeJJYo7WeP5tfK2OmzK5DSHoskjNXtU48VM4UssyV9dEUabbgj72WxVtfEIvxoGzrnsa3VgN7WTB/PKUur3BYIfWdIy+eSHTJGGWjycJZ6hyp6b60NOX5bLTL6QFjozpGirxyLLmjXfSm99L9HluRix8yULmR8mwLtsPiUvfSLDqosCdiWnnj+5HgaN6EcTrqnZKhgsywYsh/CeWVsmnbNTjVTjUgdGuom7jJCqconXDOh4H8Z/UTOBwbW4g2YiJrgItsi0ngx/GfdffoA38CvdxzARbpyIwiaIada6YOt05RQy/Inl4QxnkWkD2jmnxjrqgkVOi2PnmFxTbggwtwuz0jL6cOFirKuasmkDI5JA6gHpqaJWY2E3L6X9AsluNxxFT6w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dc88187-db58-4503-ec1b-08dcf6f3f927 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 01:58:09.9541 (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: Hdxy9iKmqrH25DuxkdyvLAr8rwa7AYJojabN3IqcpOJxdA9ellShpSjE5z+jaJZxagoBa4j/3+rbgwMpOIS4BCUm1rkRSIyjMcznwWYa6zw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1263 Received-SPF: pass client-ip=2406:e500:4440:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-BJS-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 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 Mon Oct 28 01:57:43 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: 13852789 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 82E59D13595 for ; Mon, 28 Oct 2024 01:59:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5F1R-0002mU-OX; Sun, 27 Oct 2024 21:58:21 -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 1t5F1P-0002lK-On; Sun, 27 Oct 2024 21:58:19 -0400 Received: from mail-bjschn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4440:2::701] helo=CHN02-BJS-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 1t5F1N-0007Ma-Ms; Sun, 27 Oct 2024 21:58:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GP53Fj6ee7dXSnXxgWXMxhyx80+Tg3IJyf8JOsf8wAHIXCHu3XU62WA7VSFmPJVgu8ir9dpnBE7sg715sunngazkjcfJWBIaaWRpmX7nPF+GYBypFlAYNMLseT5wkP23UDqLX7FPQqeX0sk5NDCX8LlOBEpLdgx1JfKepraH+pNJ7oo6GgDSSVx0nWLYvHUw13Okgu6FhoC7yg4o4hjmbwPJlYd5qCS/oqC4SzeV/w2ig7w7Mog34h2QSe8nd3TbUCRmqKW4zOJoCyyn5YvqLYcqcWNzd1OdgvQcAgZsuUMI3L+58wwvmD7Y6HV8YTv4G2wUM/nAEAK1XdrHLELvEw== 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=s/OkOrdTHPiKx33flKKjBuqLL2qokvB4SEkPs91a1y0=; b=bCq1w6pCEENe0JseH92SYN7JPJ6DKBgv8u4rSLREvYuAFgwNKPJLtrRHJGxfpdr/DnyPdEe5Hq+A8ilcnZZZSDqTXSWn1/EgPytruhRiTBs5mttw8R8tdT9z+w/xUaIMFFdZKBxaJdTXeCgbfAnBTt2z1aiKCJUawPego7gId42QmYDp+dTcVjb23JXOf/SCdx94aupi2UhIeWg9ZKUJTEIyUb1eCW3FGs59jMX8BIr6T0xTml8dtE9/N/WxToWMbQmPuDhSgMJLvb+cCRFS10Fubo0thLEg9Q/cmSkJXECCuT64kxiK6pkZzIYyRbFunglwGMQ+wZ0PKW9GoQIUTw== 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 NT0PR01MB1263.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:11::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.34; Mon, 28 Oct 2024 01:58: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%6]) with mapi id 15.20.8069.031; Mon, 28 Oct 2024 01:58: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, gaosong@loongson.cn, jiaxun.yang@flygoat.com, maobibo@loongson.cn Subject: [PATCH v6 2/3] hw/acpi: Upgrade ACPI SPCR table to support SPCR table revision 4 format Date: Sun, 27 Oct 2024 18:57:43 -0700 Message-ID: <20241028015744.624943-3-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> References: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0024.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::8) 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_|NT0PR01MB1263:EE_ X-MS-Office365-Filtering-Correlation-Id: e4562586-f568-4157-0ed0-08dcf6f3fb21 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: z49ZfgWfo4BFNkKLXQHScPhIqeXEQrPBYfqfQN/EhpIXJkXlL5lImkNPyH3FvCgKb7Q/feE6JaDeLb5olvypizHCtdEyM3qcy2KnxlMKXlVfDUdYymkxy2qb4Oo5eMxzkJN9z/za7avWLmSRMVYI0LxWvQs56UH+a+ptm1n3E2d+IyL/98TKB4QC7jcAAExVh7NlKpJlE1S6G2ZcwVEXqLY0IO2PxHrFnGEsofXYcZNtr7MS5Fq7hz3HgTb7sLHHHuUDoujctUbFbUkHgOD/jJwnyQ2D43kDdB03DaNKg/X5lHLT6rC9qUz3VJG7+kqOePLUBu3yUBUBV7nlv9oS8XVL3vM5fXx1u4zXLAFPFXMuVDrYKV00xk7kTQR3p0xUSzCawdqNkHyf9rnBWalxOHMOAlrl+jpNSZK+RLJ7LUxbpHa0J6Eh9XTZhwsxL5D5SIsndVaGfvm4TGUX1rGPIdw5lCG8QkFdOMv7aNs5LCHMtyHHcn9PbPiuyTnk+TnXPnV3FJxvo6jReDWy1dYKGEqzYQBfuRCT85DnXcEKP9Xz3y7GDFY2mNyHngFD9J6LlYySgDKzdXL49USsI5/G/GHzADqirF7j/xnNDINyJCQ6+9q0hzbVygWT6vip+de1 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)(7416014)(52116014)(366016)(41320700013)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 22xibRUAjPz7eiXM0E+gq1MDBLSFESJfmTycsxNFopxI1bdsIAChiyags5j3gLHrfO0apTQvsiY9vqIyxJDdq24tRhqDhyKYAVzA5s2gcKs+95+VsdUxdzLHmgZ2JbX7OzTM/O7ese7wwuKfhX3Mu20VOZ2PJXpB6MX6DJXLrpgzTo8HhjGixbh1GmmlPjqCRDHt/ShL6dPQ1HgEyPlx1lVt97nBvXVb4J2dDP1jHLf59koNe7eV2ssANkv1gWvRalwZswO8omcclwtx+k7HhWHrHX/IaID7+ERyUTJBf3iY25L2sC69YhpqttJhGtsjqTaxzXp7XJkCRQY2fxgkaF7/71aPfWawJrNu8el/ECXnCiTWXAt0PrtvdEPTzPxxDjXrN01hyMify2e3CWvV83JDegjaxaDbJqD7+NygqeWz783Org6/63S4BCj4Vd2AoexZkahJ8be61zjpeYEZLQBkWQ9r3p0xDh7frh47OzYKCrzd62tlbirhTa0llpdYZs4o9tC1qlylhJFeUeEBgx29E+X5sKLlZUCgJobZQlkSDoZKZt8D+mk4MEtLxmcG0PFAOfRxwrOA3DDNDBVorz8uFEVWOxQdEdMh1PnKHNDRp5FbB3EGCiFTF/OIFtP8gKo+h28uotdLWBW/tZtFRKZ9rKASDu5w2xWa5VeVNuFIeIl1HFcqO6UMcPIJzJQIDazLNUJqj9ocqkeyLyRUejEKRX/QdhdBKmoiU6RJa1u6Df7n8JyL8OTAgXg4LgTq7ieFjwD03q1iQb35rZuayYNqcfWU/0npScqDLodiXST6wrAeKE4E/sSxIZY67/+SaXsPaSH6mLeAAXes6WPraibMh5zTLJ7ZPYTpaZ4gO6FSdmsn7lWjKzO2y+ssBXKAozYuRi0DC7DcLr1Hd9cd1gkkMTXfzNiOGembkzBKLOoW39JuY98pQKQpPBLP6EV4yMhg6oOI4/hCQTFrP8s05oLw7EfpEHuGbut09ZiaXk3WiNFpYHv9dCTS0i/ypzzt/ceeNu5sVTKRJByt8VpvS5MsamuTVaxnAwQWZqBCPbTNU2gQegjcKjVEljeRA2+NqeTWpqndf7JxBFiiU+c9QsKXEVlcKg5UhHe+V3zTwPWYjxTK1Hfm9HVRaWvXLH14cNlK40tld0peAYPNU+HzAyVffO8C9+q3VCoYVwvtzxQ6htuoN4zNKsDsT1hZ/C+lwR/T2cyfB34O0hzeRx1Cen/btHWihwzbQ2rqWtzKkc8wEobRvjbawCCbteMELHo5f0inlYrAVmPeKnVsB0zJPndL6p8jomFYNhZ9hsKrfJnt10zfU5QcN8ctfMXnThP7nkP3EHDAjfot8297Fq+q3X2ayz2H+flLVBzK1gJtx47PEApd9/qRXM6A5EmRWduleZcWCOcwvuiJn3oCnq1ea684hDO1QxfGPvo3Nee7k2dMQyfr2hEt2sP+m6trI3udfd+ThzWMmQfqy6vEWdSQIpYQiaJZX4Dh1D6jKsjIPV4yUbelxqHLWdH55pIC/xNvDqFAVKoEDcLFuF7ggi9/HTV/a1xm80ez5cb6Xx0eesUG/Jn5dr4qdxHE5VMAe36ZLFnfsqEL+fI3IYqovrn8Ow== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4562586-f568-4157-0ed0-08dcf6f3fb21 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 01:58:13.2165 (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: pwc1v0x8H6JYgoOq9DBPVDFlC882aO1scI8qKE6IXMTZ6b6E0HJlJV0WTmBJxEahTeHYNgRiHasj1eAI1pgMeQ9QpwApvoHENtfxw5Puj3w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1263 Received-SPF: pass client-ip=2406:e500:4440:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-BJS-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 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 Reviewed-by: Sunil V L Reviewed-by: Michael S. Tsirkin Acked-by: Alistair Francis Reviewed-by: Bibo Mao --- hw/acpi/aml-build.c | 20 ++++++++++++++++---- hw/arm/virt-acpi-build.c | 8 ++++++-- hw/loongarch/acpi-build.c | 6 +++++- hw/riscv/virt-acpi-build.c | 12 +++++++++--- include/hw/acpi/acpi-defs.h | 7 +++++-- include/hw/acpi/aml-build.h | 2 +- 6 files changed, 42 insertions(+), 13 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 34e0ddbde8..69c4bdfa22 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1995,7 +1995,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 }; @@ -2041,9 +2041,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..0b6f5f8d8d 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -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/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index 50709bda0f..4e04f7b6c1 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -276,8 +276,12 @@ spcr_setup(GArray *table_data, BIOSLinker *linker, MachineState *machine) }; lvms = LOONGARCH_VIRT_MACHINE(machine); + /* + * Passing NULL as the SPCR Table for Revision 2 doesn't support + * NameSpaceString. + */ build_spcr(table_data, linker, &serial, 2, lvms->oem_id, - lvms->oem_table_id); + lvms->oem_table_id, NULL); } typedef 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 Mon Oct 28 01:57:44 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: 13852787 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 66052D13590 for ; Mon, 28 Oct 2024 01:59:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5F1U-0002nR-NH; Sun, 27 Oct 2024 21:58:24 -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 1t5F1S-0002mZ-Oc; Sun, 27 Oct 2024 21:58:22 -0400 Received: from mail-bjschn02on20701.outbound.protection.partner.outlook.cn ([2406:e500:4440:2::701] helo=CHN02-BJS-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 1t5F1R-0007Ma-0A; Sun, 27 Oct 2024 21:58:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hSIQZrCcLNBZ189V5diMRrMYFJA9qQH54yiI8KZpEWxfTcsjMqrTnM89A4lOGqHrE1pD6nUDfPEukx9Xlg7p/pYAAP7/xFRFVeEg+8mEjvGCaJuQDPsfIcrwIgzS/RAm5BtRBdiNXhsslmx3D5g4nf5xSYDaDTkbh2bbb9vtAavVkGCr4pFNXtHWNYICy9PB7puNVAY7wy8sZsqEu4i5Dg4nDGyzMeKJVDep17wefWfHzmq1Guy64ZXL5vCdUKuqXXEBG6l4fz2dnHjB3j6fatCx2Mm+yvWPwyRitPBFFW41EyCnCzTWeIF3BuXvShnwtM9owc8hHMa/81gCGHp/ag== 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=8roQIsT2ul1mR3LqGWmi0gRgf9/8WBWf4vqVV0E7TtQ=; b=JhrD5RjVu6w9Rnlf6xIfp5Z618wpX4wcQbbbIfmg0Qeg2/LsY/apCcIJ40Z/QV+AWRK29mBMvBc3okMusgAif+FuWUwRbZ597/FW1G4rQzCcVIbAa+q6jL+0q7xqsu/SYCyYW3xcK/CJIYEKlqBpSAQaEvjTW62Oz4UyCG/vkY6jTrMUiIxdNlEieyO6Z3L1dndSLOcnnxurNQwYsJLrAHO7wv4Q8zEmfkqEo9q2upo/bDwnklmzY3roTVktmZSrJ4wGc0hg51OOl1AsbLclenznUHnikcsPrJfiUb6BoNKcImDOOUWsZ2OXrwaj/85wC2/vmK9ReMDp7WsCQK6gZQ== 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 NT0PR01MB1263.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:11::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.34; Mon, 28 Oct 2024 01:58:16 +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%6]) with mapi id 15.20.8069.031; Mon, 28 Oct 2024 01:58:16 +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, gaosong@loongson.cn, jiaxun.yang@flygoat.com, maobibo@loongson.cn Subject: [PATCH v6 3/3] tests/qtest/bios-tables-test: Update virt SPCR golden reference for RISC-V Date: Sun, 27 Oct 2024 18:57:44 -0700 Message-ID: <20241028015744.624943-4-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> References: <20241028015744.624943-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0024.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::8) 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_|NT0PR01MB1263:EE_ X-MS-Office365-Filtering-Correlation-Id: 41db5af3-6c78-4a8e-9286-08dcf6f3fd08 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: u5gov6MlCqltnCpdixu6Y4K87IvNCskYX+MRCTdkUnnCrTq7XA5k1RVxus+2muvvNRBk5YKSWy/liI9RMhwRymIxgsmXlCSYNN57c2LymjQmK6kzAgdHAGlOJXhKGRWjB+ZgLDIXe7bJ3ZDbwW+IKD61Vpqe12IjE7lFMLJB83hXDEssY+YTFmAZ4843Vk77UFmgIQbQE4q3VF6E1hT0+wdWhs1hpvVH58MvgTPVVpmjzsA1+Hr6mZTdqKcO8E+W2rnzoEZU/P59GD/DR4IvI7AzTf/hn/4qKgqYSGgtpPnfVUY6HQTrm0gFI7g7Dk3inzwBXiEd7y+oEJfdUSNLcIRGWpP9s4nEbhK2Z7+eeteqOoDqST4IHuEjxLzvn9eB9suSAx0UUiRD/Bb9gjC+2Sa1P6PTXMTEaqoy2CF2+7EwAAZRfye3JebKRvk+eGb3yzpJCjJy1zFhcpclKkuG+JVx3h5mYRIxbiXcwD6xJ7WjxVvec8K5fQ483aqADxGFyrnKUPfySuYVFXfPCzj4PoDGcAF4XuU/qr4JWas2QUZs0jmrh8gnIAtizrRV1NI/SXO5oQz7h51yx6LM5XIQy2X0zSuHT91oxsjmI/W+8E0SF0YxIFtvMqnDxqmkSFpj 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)(7416014)(52116014)(366016)(41320700013)(1800799024)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wtrmnXmSfTiTpPyPu1qS5miTVQs2KuOFc0/e/mWNzdzhBos/UxVI95llmgs2W6SRc68jOhuLYDR1BkEiGQhbHzDdIYkiBHgxUg+zwKW5xeqcoBI3BgwdywSbSdeiwsWYpkoDG6qLDlPbnbkXrcRo9nqpwZfeckZZ7Odls6ZgzUfJQj5Hhlj8sp3Fx9WQuCL1zLf5FVyG1bnELdQdMznrN1m8+MAB2XR/kLThj+06txl2VMIKpBhmscUbGsdUxB4wNkHKra/HZQNGAQKeSQOrP1yFnYi584+c0w977gKd97E6mGKfejVu/HEi/FBS/JMdYAMTkAn8dkpAPVcmOL14SU9tb3u0f1MrTqcGVKFLdEHEFeFWf7odrCAbZU7+Q4RfRWmNdjYHdxThyqhwrueMku4gYzJ880UIpGwvJiwMC2BNffAq+ZTWgqc0ayF78UnRHNIMTGOmIIuZyNyuu0nx9HrYbk11mUzLBip6NJ439xWBRQ5OEcNLBq1Yp81VN+uFuyTCYxovRY80IluiVfQy0YPGgPF0oLci24XI6DItRfhT4Y2EtSeiwc0ksTYx8R0M7JPMg3hmstugx2rNX4LVbDfKuLd8soapIYqaECQvN3679zNlCJ4ROu5H66qPt+sZBZmHTWtlQPJs3s5FXXbi9J+DiJHZb0m7l4ds0QEJQhkVJLyaU5K6o2HEg9qko8RRRAajSKLiHxuNeUxJ8MoFZypqzM+CnyW1gHodcNoe82C7q+BLqGIiAxq19Np2+fghXUkOiGuxohDOASOGPL2DdhlaOwGL0Nf9RvvQ1oaoZMWh9nBOragXQak/Iki3C99rj9KkT4PVw0aNa/WDBc60AMNj8z21ZndlicHFK+Fao7qcfA7aQahVXFFc6ttNQkUW1gs7WaNPO24PTFlS92Ks3XiHo4PGg27YTIfwjc6eL94SRtgSHxG0stXFBp34csjJvHo3o0MxKx3FJ3i9rJ8IEJ3ptbR5I4VzplzEhfgxe9P+xB2OYmhf5yYPoqWzZMxW4oEwWQyaw5PUmY0EWRnuVtkoVMPXhE+ysrPj6Fi2J+el/VEaR+hbi8l1mfuztHMic8rhwE7tQNWbeawFyNXokZFfLV3xgfeZ2gEq1N4N2QUrla1LXkcqZoTTQWPM3Uq+5+MClsF0Oyis72g6hobCdF0uDzvnFJ4AEDF9NRRUrBdZPqsMQhOXhBANZcaw4Nit6LsudzdR45Oh93OQ9o/BlNcJEJWcmwxujbLagKsegIiJIXBELEOPDWRKkGgUFToUYBBzV84V+0JVGVZeC1+CUm42LwZB5/9vvkQDBGNj0t2ZOu3Vlzc+BeNMVGsRzpQRFW3ye3te1iXdMGqOxpAAsNZVvwnt2mKB3H3DeDgkEQnrjN1tBwz4ISza3iu6FC8/w/mAPcECKc7pYnYJrhfBOmG+IhzeGdMbuRWfK+gOOnyJtzxVRarP7l3c7B0kJTXaJmL+AJYRGv8MKnvOof1VAO5PbRtSwN7GCBK/sg11gSaSVOGMmeQx2wrfZFBnwmaFtc0s4gH1ZbS8XBTlyDPKcL9hJ0evzqJVfJuo4BuZNwkbalSkzcmMJ12xq1Z74cF50kNcVgu7JpK+/SLoC8aidg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41db5af3-6c78-4a8e-9286-08dcf6f3fd08 X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1278.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 01:58:16.4118 (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: 0DEgZcLYh6o7r6J9v7ni9s05pYOVZXrh0wyZocKaPHP4aKFUVYaMPympNWyO2XzrzpLsajR+nv8pw+nnSv1cVF76vlAvrvnFEKTsJTl4NeQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1263 Received-SPF: pass client-ip=2406:e500:4440:2::701; envelope-from=jeeheng.sia@starfivetech.com; helo=CHN02-BJS-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 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, Wed Aug 28 18:28:19 2024 + * Disassembly of /tmp/aml-MN0NS2, Wed Aug 28 18:28:19 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 +[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 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 Reviewed-by: Sunil V L --- 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",