From patchwork Fri Aug 23 11:02:59 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: 13775004 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 48F08C5472D for ; Fri, 23 Aug 2024 11:05:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shS5V-0001dU-Gy; Fri, 23 Aug 2024 07:04: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 1shS5S-0001Z4-Tc; Fri, 23 Aug 2024 07:04:10 -0400 Received: from mail-sh0chn02on20726.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::726] 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 1shS5P-0003L3-HJ; Fri, 23 Aug 2024 07:04:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XcurrHJKsVZg80WlVgV9ZobUUB8di3XvYdbvRvRFK7zgP5zgnJyPctKPIVZr6GU/lfqzUw4UNYupM4SC4oYD0VHOnsAOpKY5L/zooH727SMa+BOVQ62kWsJO8xlEBeBt1TI56NWW/0vNzouJy1rB+WpvQVo4GvhPPuWYfZ/U4nALCOa09F/W8XSoqDFxVZ0nAKDdk2NWWxOiciT5kbD2pdaU3o21lsJeBBWOfrSPsfBvzsZLw37JZWtivNUkmmmnZJdrPr0a2lJ1Nt63A4aRknBFnO2Piv70ZL7szXSDNyAIL7hicKUFn3JRqHhxUBssPra/4ocPSq0C/EjROophWA== 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=Tl2n0MDvuf4/Aq6hHYr6Oa8ol5QiVG8VqGGJF2I/CPjK/KilkbklxDhT/4CBTaw/FWUft/zCYTLvMeWdnPDeUH/zdc919+QIpBmSDB0dm/jNxquuY2edL1hOvmzLXBfU4ruBpGWYAk0ArfQmgacuVs0Y66QYO0p0S2ND4RFz6QC0U5Fpv3amsuIWrIcgvHLEMzij/AHvmtpmM6ChH+tgfzJAfS1KpTOcfegAd/TrtfS07ax9J9ZuVJlsNmQnoqngujpO9fy/rp70wGbhl5F5NoKDHWGDULY5yvzryDPO1oMUbO8DarXaNC4RzKOAhSe61KS3kY7fWOdOqN+qbMS46w== 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 NT0PR01MB1327.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:10::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.25; Fri, 23 Aug 2024 11:03:28 +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:03:28 +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 v4 1/3] qtest: allow SPCR acpi table changes Date: Fri, 23 Aug 2024 04:02:59 -0700 Message-Id: <20240823110301.161588-2-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> References: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: BJSPR01CA0021.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:c::33) 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_|NT0PR01MB1327:EE_ X-MS-Office365-Filtering-Correlation-Id: 060ed151-2d82-4024-b843-08dcc3633774 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: T9JvSxLfYjj21v49US3zRwk/Cd2y/Wc5npM5cl7vWqT32HsEdhAlXKs+Xyh75//rZ07SL5PaGrrWg2Y9TlFh4KugMXLiNn/lIxiaDOoBd5QPm0f3SUmgzBihPxhYdOAW79tZ5qkLJxFx9Ou2yXBj1W8UaO1Igr67iSrsttiWBYzvjMLCM3ssJE9zUgq/ef89P30bZDYnmlRF6Yc3ijoBEY4AXPWw5MyBCtqKzHtMVJPzye/bBqoV88vv/DI00qjdiT/a6r13en7QOP4jfH58rXkZhq4K8Lb8aB8VvuEMYo6SENKsFwHoZA+yMmrtyw2btqQ9d70/sWepRgGiZs3mC0FAbQLZQ5j67mTrMFwXz3fEFlTjhki2slSFDkzuAh+HwQqe/fR+uxgnktLS/Bn341mTVTvKfr80Zd9PnuZ6sg4VO+4rIG1FFvf4Fl0rtaLUrx9aNQ+HNyyUDrl/dErH6NTMaItjBPh9PpNzSBZT5TElAPp1eAzysn9cQGclFccgEfg/VJnnAfE8bWn3Ow/g3bJXF09O1xxv/CgA7U4JFN5HeWlghnIJ81uhctrWBx1z+KnCbYjpiFeq06j0eYG3sW1EWnQCig+ylRBc2qOp1qPwCfTjnjW07SIhdpfMDj7A 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)(366016)(41320700013)(7416014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: osyS14/YZUOpyW5pz31VfG29tFfuS2+ivvKqgUl4AXzXhUX/gDdAg+q6ZNrUvhE84j+uctOftFbsXQtMuFZv/8fj7jhtUdGdKxr26eCfB9hhIW5MZXFu3cqZ1YcYIrPIFunz1hOBtGyB8KnYmv4RJFlci0erpNoNWQlnulHiWudzAGcvVHKgwR/K92iPMV7MbboluQSRqHz3QqIsbFDj/9w7V6G6S7MXVfPUQiZ8BU+X7RE4XSiCA3cDJrZciDHv81HxuWPSG+ECe3+/DmaO/qYs6QRq9u9Bx3hoQlJkUaQmMvzq8q99Ei5rUJCRghAtDTM1ibY4SrADvMqOBmerrjBWI2IWY3FARnvF6KOFE2ite9FUeyQ8+oAFFwHOQy85IPVywOIg6AMRF8nEMNR9fnbLwZSAa4kN/XpN1di+RswPIXa64xq4dOp2EP+7Nlhas9gxvnQjUeLw8jdehQlB3w/QANOPRh5MitY8DuIVXWxdFei3+sKD5Je8YkanyHSlG37ZVt+uSj0tnwiqjHUD04V6ubb5BThBZrSKigM5Nc/2wJLzxnLzdEkHlIl6iwkVp5CKpXfGI14Fi8i9KaIJHfOSHHH8HrpFBHzclohgefvHPTh7tATqaT+lBTAh7g025QKscES1Z5ZHZYjI/bW4XmIkCsn/yKdS48UENtW0lTRbziawma8DMKf9oEQxHG8x/edbBO/SzytPEzlcdPSohUUmj4NBfkVm29+K5amIWTv8onrsizqwMU0mzieZ6Jel8gxTazM/dTFyr4a2G9o2+q0Sg7wLR6jaQuc6aQWTXJkp0/WLP3jNrUIPRUgrjnTPDsRH9wqeam4ws7o8oY8GB9+v8UBNN4nsCLWPsGkjuRPUf9lMblceqZE8ZF0bW8a+7ObQIub95eMkJnPNx5Fq38+IfILg5C18zjPqA0KUg3rGEYOrr15mpS6nqNjB4Tp0vP6NztxREfr9jjLHeH2dOOd/dyIp6Zc00bxdGuxaQ5GdCbNncDOPr/sgXu+T/WpOHbbKvl31Nf3Ad64Sk1ZNtez3qhsqSVCwBfrhLnE7GESWHO+elRXgUUUSnj6Hy1yjXW0ll5J27yUS+9TZFxgOs9L0IFE2/Ha5FAWjelluKP40Vw7z39ZqTJujpztE0JQSPJUBZ9W1b/vVPIpMpbQDrWPBziRlSyHesZQwfadLrg7vrzTBgzMYEt2RwNqijux6HArBCz7oBojF5VwFP1H0PlngfQcKXpevLW8KX4bNg8Cv4AwkdG3NibvpQuv0lcrXjW5PwmDHf137tWL+ihGYYO1XCzr9Z8iG/iw1ihfbn7M/yll9hX3qg4/IUaw7MdEqvHqVQ19QKQTCKwYirrMpiCVsSY5aOU2potiV7GBpr1hkfFqp7DO+egIwcPYKfr7TgpTBYYX50gs2XvRaQJsfVTMwLvKCKJlm2Kt96i9Pyr2COj4eoaaKfkb+RddZ4wbqJLg+5pypHOV2Cs5y+299Fqrc9uFrtTHkXUuuJ1h9kF6boZaQyqSmWw4wlCZ1+d2tEYWC5+3/1tt+yCPAtB5LeNvEv3DX4AtS6k9+q+cUdR4AninZhDPNiD1fR7eL4pJovp8xpD1ZlsK+c/sGbrZ2DQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 060ed151-2d82-4024-b843-08dcc3633774 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:03:28.1400 (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: F2KLEeIF9yQ9uwJLkKDCw+e0TIIblF+K6kXsm0oK1gYzDUhjIQlwaYRGINLlb5QHEdYKfOXcJMjv/nks2JjkTeKTKf2dzWdcmUp9pnXIhPo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1327 Received-SPF: pass client-ip=2406:e500:4420:2::726; 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 | 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:03:00 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: 13775003 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 6D601C52D7C for ; Fri, 23 Aug 2024 11:05:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shS5Y-0001mo-6M; Fri, 23 Aug 2024 07:04:16 -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 1shS5V-0001f1-UA; Fri, 23 Aug 2024 07:04:13 -0400 Received: from mail-sh0chn02on20726.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::726] 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 1shS5U-0003L3-1f; Fri, 23 Aug 2024 07:04:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fStQIaJuQxwUJu+FAobu6ftQCjsYKRREq5p1lz33KUL8NCKcRmWNjRbzdBL3yB9oRB/sEdWL/B68SW5hTHMZ+F3k6ThtmoHKH1AKjQymIX+P+UkGgTYehtJk594gcrupV76R8ApIg8JdBpFle6K/4Ry5OuAT5zpJFnVQHzmeVkKB0JS45R/Q/omEuRo/00cSPYfQEVI2W9b9duGmfI5j3aI2A0TwUQ07KrDddFPW+UyesRfcmLdxxlv/wEB8ih5ojNoPV48Bun8bXObSndDc3gPk6q0OseJEriLZku08VSIofuzlS8zscnDk7y9l5PtN+7VUqwn7xo38SIkFs0bDPQ== 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=M/IBKqsvFuN8ZcMqkirBZQFOipoK/v0nuuVyhCh4p/bhJWbx0+UNJE/PJDXUpOuWdSq/0HltjPEdvaBE10hVS0J32Elq0H3lpGyGK11dGdgUb+b0Qnh6722AFbr8VGvPB6mBCHWLnfZzh9Gb2C7Uqg/3I1FYB82nkEPvIBMLgF24HpHlHnS0GFB4r3ii0KYHFkUU0IiZcr506ABIiCqqXINyz/cEBMpyG4Z+4sNABCa5QjcWyVu+7nXqBFiiHERIsgckpUL1tBWCQ7AgLucu7l7fkvZA8d5oDGjepYa8uTmQ1eHfoO54l7OnaXMlTJlsKY3USGDP3LTPYe2fqu5c3w== 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 NT0PR01MB1327.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:10::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.25; Fri, 23 Aug 2024 11:03:32 +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:03:32 +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 v4 2/3] hw/acpi: Upgrade ACPI SPCR table to support SPCR table revision 4 format Date: Fri, 23 Aug 2024 04:03:00 -0700 Message-Id: <20240823110301.161588-3-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> References: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: BJSPR01CA0021.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:c::33) 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_|NT0PR01MB1327:EE_ X-MS-Office365-Filtering-Correlation-Id: 700d705f-e02e-4652-3e3b-08dcc36339fa X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: uoUCLpGX0grGmxq3hIqqtqjRnkoMjOLARQDv9qizBRoKVrT9QOeo2SCbwo5eH2xFEonYpD5NOUpcsTvKIRu+KR4Pm0ATJwwUlPMM53rx4CGJf2sHyzot1Kb9h9smTiIR6YNMeyJCP7l9/lfv2sqqoQA+L8+2+0jK8XLe99cN8Wx+L9ioSaSSdLnDPxtDW4tJC20C8Fibiv84WVNWGn4g+Ilyt5Xf81FPUfCI/zFgj3zhsENQdcBzBBRYcmAzXYaWATVjhkkW413jSY+liQ03FgqfcLKh2/RcTBB1egwvRg9kjesPFCSictbxPzWDQxBmVtidPZvXpcUReeKAyyqCjBgkN5vcYMB684vNGVt19m68CpHvE/7NQqSQkNfm+2ilWtyN3fIvg4jIRAFnBvkRGIIVs4RE7zWXxZ3pKfg4jQu7Ua30eJmEIf0rt2Od0GCnyx5AHviMS2Qs2+SONV/onJJ+3JMuKEp69OCOHaWmCaqNgKo7pMVfIySZeoiK/eHr8N0iSmkUVOCkY38Vlc9RFBktGlzZNqT1TNoeq58Aqo1kiXFfScptLaPzyzhEWF8tnLtn1OmUz+wjMyAbkkMizrgrJfbEECv0hYBq3EsabEytOnTpsdFtxIQsYJ7js0eF 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)(366016)(41320700013)(7416014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RXNIpm+xZVJRRyFiuJE/KGUHF93zKb2FNlwFxAjnG15CO7G1mBvuDCUwCgRZceT/rbyS9ngajfZLrLJsXbxOLiXYM7t3pWinX6Pag88CgBUsUF3QPCPHFPhb0x2QTjdGGi2jRQhkppICm9tZUbZ5hxfHTcPJFMO0g9SsETnhrK0nj/An4l9HmUK6R826qPL069vwKNd7XZ+9nMILk2EURFqPhOOckEq5wj6gS/1V0wql7KtDTlHuqkkwA938DN32AybSqN0BDkYz+nc6N6swzkHu7/u9fNaLtpIsc74VuNwx3us9LHof6cYLVW5SKuAhebt4WuUMXy3AnJs7rsugdAjlaqtS3jjH4Chtt/DXbeaFwbHJsnpRftOQGetmgp4zJFw2R9IOcN8JXyNl26hUi1pyiL5DM92yPWz0y5eUbqMbDQ2dzayiMpA373ah64IPdvu3V/EnOo8NklJ2DieCjgxXWAXHQFwYywSoH066urpJdhpVqjaLm5OO4A7r36/sVehuJ6udOfV84oVR4X3K9XczK6L7s750SCYr1HwLsAkGNr69YdphjSPYCk3z23sUu6WoQ6qfGSbuLbXdtRVV9Uu6bfWViqp7dB8cWEq3hY6yxsf7xDaHgn0wCZdITdW9IQGgUJcqFpyVC4MGvSgNzThUiQBVRpJr/0ToU1CmysSMxO9h0GiFyH7z//e8KYlW4cNdiYQ/wx9WtAeVKFaAjIYGfH2s9w44lLVXBHP5bIoqrzZYXj6RC+4wylCzB2/pFrV813GoQbRuxGZRb3YBwOStXjqR0VxCGhloZ38Wv+4rtbQDLXDgyUZzy8Lembpyc09pW8IoaE5QEMkjiZogcxyX2F4lrV9XiFVNjygdPY1tEXxUrDSI6DeocnHJ4grseUIrPP4faLZTb79+u2jUFZSdjFw1O4IaFzfJNBhKHUhzbz0/3Nvw+hF/EFwngMUzBtnrFcC9AUOA2MJo/HS3xHTOwqYc8mvjiRnNO24zIkoMdMLiNKElU9hjP6f2Xsofmq86LEzrmz93nKjIyInlUrhXlEHYK0q9yfe9Iy8l+cMCqvkyfXQMNC25YFJ75uZ+tvPcNE4x2i2gdPc46m9QINuWnryeV7xD4aFB55szTAdTYT3TzeEd+0w5iC69BUquPIIVIZ9gsIHp/P4rEdK2kJYDphHZc60JTvcm+JvDOKqOoXuY8Ju7ykXY2dkHyug0neJfeySgTz9bpERGj1PTJMh2F4CpXIILEOKGENbl9YuSBv0A4IdYMk5DTWqvWEOeKg4+FraXWEIeEX13JqrXd7QPP6NwtdEz4UaUO0OZf3aoRMZWMkA9oAKDPv4XjRyl4qRYeJE8TH3AniZtnoqg+5lLYrRtChEQBkaNwKEsQwztBa4h0lykFl06UHuUx2ns4ctQM5QezQNgttA6RtFQ3PimHhYJplc9hJ7cuWpDUpN6yoBrIjge396tJ3KGXLBBTesAp0MZ6UI+F3jLvG84oLC0NWPXD8OYNjr6VrnMopRgqtNNNeE86ZTZDw7pauOzt8DoQke1M0KoPH9jramv9dxjCw7mRCHyQWU+9UZ7oKXY5QZY4S67BAcL77BmrHTnYDamEV1+2xxe1AJUbcGzWQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 700d705f-e02e-4652-3e3b-08dcc36339fa 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:03:32.3202 (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: MZgfEEtAFu7kKNKT7NteOhfqSc/M52Sg3k3TDt4U493USlO1N4oCtvQXwd10H3N2YTt0QddqrSkJoC8+l4UyDuHuiwRzpdwcanQwim2UmxM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1327 Received-SPF: pass client-ip=2406:e500:4420:2::726; 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 --- 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:03:01 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: 13775002 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 8C876C531DC for ; Fri, 23 Aug 2024 11:05:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shS5c-00020Q-US; Fri, 23 Aug 2024 07:04:20 -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 1shS5Y-0001rH-Qw; Fri, 23 Aug 2024 07:04:16 -0400 Received: from mail-sh0chn02on20726.outbound.protection.partner.outlook.cn ([2406:e500:4420:2::726] 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 1shS5X-0003L3-1A; Fri, 23 Aug 2024 07:04:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ei1bBUEDnQfFwBxnq+cLsTzyNvhjCHP6A6Ls+SsSezkWhaxIUgSUCJGd3g+dAIp0Fr96vsuwIDqiXDdSD7VpgJn7Rvn0zoHMeY3Y9Ac0v/ETRKxsCXjKAZocz2Lm60ImrXan2mBB9217LWKr9FmvmHZfWeYBGj3Qqz1HHc8R4F61wqy1l9NVMd7tMbV6tCkuoIwFixdaKTAIXVLlPivo4zdSdxSVbzKJr2jpS+hTRCG02qgdHpXBbDsPNmA5SvLO/F64NSR0L/znnnMrH4K2O4HT+v+Uy+KisNgnuIZJLUhfTpd7HrmLwcF8Pzx7Y9aMEIXtLZbBUmuQrsLLkvkGsg== 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=EZvC8aHf2QoBHCNIgvEL53pnKy+qGJQPF2Qq1BC/Bu9nfchGnWqrfAW5vpYMv/4tKL6WvM8rl3O6B5XRLIrglCB9Mg2eANcPUXkN8K+KYpsQqCFk5BLzwrDmjXV0u6aF092hTFq2/L53EGM2aZvpH8YLyfHlniFQKBMKOlXplGGyT+3QpO69+RBZXAdn5WdSMltimBTSTf8sSGGP5c94xJ8f/JKOGpBnQY4V0VFGb89p+Qc236NRfbLCJKXWBNYXHCq72xKS11vmj2pcJMyu45Pr6vdxNzL4y/lyiQSIIalrMTmuSP76g48owxiuCidDtwQKUOvozTGMeHCyLMQEDQ== 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 NT0PR01MB1327.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:10::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.25; Fri, 23 Aug 2024 11:03:36 +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:03:36 +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 v4 3/3] tests/qtest/bios-tables-test: Update virt SPCR golden reference for RISC-V Date: Fri, 23 Aug 2024 04:03:01 -0700 Message-Id: <20240823110301.161588-4-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> References: <20240823110301.161588-1-jeeheng.sia@starfivetech.com> X-ClientProxiedBy: BJSPR01CA0021.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:c::33) 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_|NT0PR01MB1327:EE_ X-MS-Office365-Filtering-Correlation-Id: 00d93843-dead-43cc-d401-08dcc3633c76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: M9Gj5r9pHGjlljW2D4Hv52nPnGx9/qA0hGKIo1rTk7sIC4r257A5CUFFYHnL4XcLyvd7vB+Dl0ANBNdX3x+5x8V30YpAcppdevfoaV6Wexw/JiWjtAl8hBhXL4rGSp41Bm+No3Rh8t5xhqcg9LFQ0fGJZkDLzqW/+h7oveFE7h+yLT1IN6cdHz1q3UyWyLei0CJMDfUE487rNm5AHZIVqx2l5VtALouPgYISZk+Z/rRuq9XfVl8AeiLujNeNQnnXY4AQpvPlPa/2FStklaKeyIfp569tkJywGMtPjIsvZe2wFozAt6Hy39qmN0LhiaM5b4XUsN5yovq1xHzCTq1Jc6SHrcCEac+USxNpYbJJF8kw0NN/Ut08odGOHASlrjp5IEqPJiAN5OvntccbCCE0+X0fGxHJFRjy4dvp+7EtVyEVUEjPHPYQ8TVQzNew/SDKFMlyklWif/VzoE+U/otb22HPScxELfzH3JmCP5cXA3OQsrO2Uc1qch7YM62AxZ2acnG/dEA/yduqgFK07Upv2pR+JNRZ25Gvx9bfMEHMhw7fhG75BpsJjZ0NpiXwUlEbPoH7B2XxRNSS11I+oqTGIg72e5FyBAMGRI91oluIFVMJV5QkD0Lzdt3g/3HecDEy 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)(366016)(41320700013)(7416014)(52116014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1vk9slB1n0OQ0+aNwzFBPQmo8keC6v22w5WeESBuQT6k8FCAn49VlwSVFhuUQb3UMA72sqXwgkUZtOQpYldWHgJQimCjEqHJPSBV3Gcnu4crhTeXfVC88E7szeTcm9VnGGmTuzsRC5GZsZ1/IQBOqQA7EI1vB/6pG3Jwqd4D3gqPAphUKPKLIgfw7SUO4IDF+Bd4FIFx/wzOk0rSA1Tgt4MnN6py1XmpsIHuhbfIby/8jsicxUGcn3S0RjUPe5YQSfLBFexbXYAuwbB0dN4jY0r2/G2pjlOzHFCz0LILgeK3YomeC2cnzbrcpurOP5+MCSFh8hy5WYfxNY1wsPpgNGA9Vf2SugeeYCsStZ+hWiAT1nKwt4lmoG98c4u7pjKvMZs3Beb73OdWrsgz/PxCG1MPRp6HHDPqV+ZDmKyQhrb/DSz8OBYIVrohcV4G6FfSJrDQpGucEU73Jb3MQi1PiBYnRuyifflVrtH0IMv0x8hvkDuFJ9EIQIbD+DpC8jXd55YVVsqUAluPbazBd2GlGE3/6UzFbqpa165DF5T7UfXKdKrri+E0WyXOCQtDqxXy3Sm6nc4ZLUpklhwItZmxf3MZDxV14K+mUskUdf3bXigUdM11tzsd3P7ik9PajmQbSv+u0A4MPl5aRY9DfMyLveWCb2jnHOvZkkdm79xR+c6wueqf7XBQnepusgttgL7/on0Sq/V/W/tX142CFMUNoVfK6IlDqq8BQjewQq8fBrJIlO7OppEHC/ZMs+X8Hdya7YdWw2tkhh6G/GgsE0znMWwcz018lNQgj5Nqz5rNE1cB3UGg4c+94Vw1AOG0DRt7+e7h86RuO40Qe2R8CM9b7lAEh0ReNPhNUGQW6D4bUoAHPiojYu9knl8D4dKr7nh0d395TXR5JLLd1SRYLCv3l/MPFUeY7Qio9/ta2bQzn8rtaKpK2PtLhBDZzHn93tk490eJYdAqLPugIkpp6yyeDCIPO+B9obdTgEJ759n5wKUlVChmirQAR84lG3ELrpo+iyefk/rhIlC3o8R0l4Vg+ReGZt9LGBlKx1jxKcVi+ojYZvJxmVAqF36IBXBhH6TVdA2kso8u92M7KiSUJf0Rlc5t76DsYOfgtaj5Ok52DG1HMfJ0X2aYJpKFNxeCeiB+aDJaQmJJ//jMskkYMrNCfZMETm1tKT0FyJtk+zp81j2JXxvLAjp4dsmeV6ZO3gWZCaV4XsKD/9xlSm8F+YwXXeBIJIKLNaUV/BwwD/Fu1mn1RiYudZdsz9+DyTOMCyvE07UmNxDZ4i7Q6zCZplGTilzA/hLqJdn2jVnaVfaGnx0WDS0UT2aoYNPVkp2xgFi5U27KNmvtiNdWaFQPEHLmlbo4o03lOK/1DxZbIup/x/Ar+iBqAHW/K8PH7KBZ7kbR97iXnRNZqBwNC9uj0+o7vHJbreTQ2ZOd+3y6D4yvatNzlTHTDSBsvdkjl1fFsFkbrnHFag9aqHpkkS62UJcXSpTX8SjlFD+tMvfsM7A7s/6zv9i0JbuWe08Vdm4zF0OF/9IKM9C6nRg0xGLBZeiTnOgBevFVbg1GvUY3RFERVrldaS2mtdJz0xtjYOM2SOZ7ukaZxYisM2PlNlVoqAXDuw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00d93843-dead-43cc-d401-08dcc3633c76 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:03:36.4921 (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: mFufVqqlvj8TwBwH0dO/YoC+mt4bUt7BxUNJYV2snkIw9qG2gHsRqyGylfSIVWHIHAH71aUeeZQU/DmClntz16KHPzbRUMLTmxDbX58npGQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1327 Received-SPF: pass client-ip=2406:e500:4420:2::726; 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",