From nobody Fri Dec 19 06:34:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1748429912; cv=pass; d=zohomail.com; s=zohoarc; b=Z6cpCiyUjl2M9q53rEwANt1hq6AGbKeBxsZy6BL3IJqzatWVrki7mb+8eAfAgra8q/p/F3gJGFzp/AZp766/yEtut7RmzDxiLfHBYZx1+hb7nxEQRzRWIRUDSxDMcaNa+wn8W5RmcX7/gg63goXPxNRxdgabdciBiAT5SITtjms= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429912; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/J0KyIoEEEGj1a9BXUsWljklUYkHWQeuMesc/u2b6jI=; b=eaFS05bfurEYQC8inO+qvn/ylfpQqTQmNj0VWS5p59WtvZkfG9/zDjW1XIdAk+TzxgEzI/lEL9fLIabxXcrXVeSpr2I7+8DjsKsdhNkAFff5XcTzjs0FeRzrvMVdGD3baNM+G4IZG3fKc70GzW7j31EVlGrGDPaq9rvUylWYpHo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748429912229317.6832723718986; Wed, 28 May 2025 03:58:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKETn-00073i-Ic; Wed, 28 May 2025 06:57:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKETb-0006zE-Vi; Wed, 28 May 2025 06:57:40 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKETZ-0007rw-RY; Wed, 28 May 2025 06:57:39 -0400 Received: by mx.zohomail.com with SMTPS id 1748429668606438.1301081577275; Wed, 28 May 2025 03:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748429670; cv=none; d=zohomail.com; s=zohoarc; b=Y6rdc7tqi0BYHBq6I7PMpix820xx7SBS0szaVEHq8OO36TtjzrDZ5HzQUbUGZEDWVnYzLizmgTmTIo5nAK7hXNgLGwIo9xDh7SAkrXNk+wd8l4qsI4pJDPR8FPQMCFtyGYyMK+LOcXGdMTpuTLJ0HXIGy2kRHv6ab1H7BIJxY18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429670; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=/J0KyIoEEEGj1a9BXUsWljklUYkHWQeuMesc/u2b6jI=; b=JfoHrlou20b6fgTNDnBqXYiOphFvGkWpP/348OMpuHb4emz+mvULP9/DRA3DRfJwCrldSkqux6sBOsRlB4qkGd7GJqZyyf62lTRk19cOXzgH5bmvni2A9XUyOevLrtgJPzF8FOW7kZi8/gF5QuuU0MQhRC2Bu6CsIMxAM79ignI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748429670; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=/J0KyIoEEEGj1a9BXUsWljklUYkHWQeuMesc/u2b6jI=; b=sklHU4JSlF4wpZ1fx2ePirgFauxzmhDzKLjcIXOcFPZxiNSJXa0wlQQ00SqOBiL5 WS5jSEgIK1UsGQtWkrYrMLqteI39yMbgicpqEMiNVE50I4iIl8Hu9DkRCOoXY3lva3c bEzPnZUxSKG1gqfNOrNMSwOJ3ZB16NsD4Ueb0j1Y= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Cc: Li Chen , Bibo Mao , Gavin Shan Subject: [PATCH REPOST v4 1/4] acpi: Add machine option to disable SPCR table Date: Wed, 28 May 2025 18:53:35 +0800 Message-ID: <20250528105404.457729-2-me@linux.beauty> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528105404.457729-1-me@linux.beauty> References: <20250528105404.457729-1-me@linux.beauty> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1748429914072116600 From: Li Chen The ACPI SPCR (Serial Port Console Redirection) table allows firmware to specify a preferred serial console device to the operating system. On ARM64 systems, Linux by default respects this table: even if the kernel command line does not include a hardware serial console (e.g., "console=3DttyAMA0"), the kernel still register the serial device referenced by SPCR as a printk console. While this behavior is standard-compliant, it can lead to situations where guest console behavior is influenced by platform firmware rather than user-specified configuration. To make guest console behavior more predictable and under user control, this patch introduces a machine option to explicitly disable SPCR table exposure: -machine spcr=3Doff By default, the option is enabled (spcr=3Don), preserving existing behavior. When disabled, QEMU will omit the SPCR table from the guest's ACPI namespace, ensuring that only consoles explicitly declared in the kernel command line are registered. Signed-off-by: Li Chen Reviewed-by: Bibo Mao Acked-by: Michael S. Tsirkin Reviewed-by: Gavin Shan Reviewed-by: Sunil V L --- Notes: Changes since v3: 1. Add Reviewed-by from Sunil V L 2. rename enable_spcr to acpi_spcr_enabled as suggested by Philippe Mathieu-Daud=C3=A9 Changes since V2: Add Reviewed-by from Gavin Shan for the first patch and fix style issue. Changes since V1: add Reviewed-by and Acked-by hw/arm/virt-acpi-build.c | 5 ++++- hw/core/machine.c | 22 ++++++++++++++++++++++ hw/loongarch/virt-acpi-build.c | 4 +++- hw/riscv/virt-acpi-build.c | 5 ++++- include/hw/boards.h | 1 + qemu-options.hx | 5 +++++ 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 7e8e0f0298..d77d16cbd3 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -936,7 +936,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildT= ables *tables) } =20 acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, vms); + + if (ms->acpi_spcr_enabled) { + spcr_setup(tables_blob, tables->linker, vms); + } =20 acpi_add_table(table_offsets, tables_blob); build_dbg2(tables_blob, tables->linker, vms); diff --git a/hw/core/machine.c b/hw/core/machine.c index c3f3a5020d..4438eeff54 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -595,6 +595,20 @@ static void machine_set_nvdimm(Object *obj, bool value= , Error **errp) ms->nvdimms_state->is_enabled =3D value; } =20 +static bool machine_get_spcr(Object *obj, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + return ms->acpi_spcr_enabled; +} + +static void machine_set_spcr(Object *obj, bool value, Error **errp) +{ + MachineState *ms =3D MACHINE(obj); + + ms->acpi_spcr_enabled =3D value; +} + static bool machine_get_hmat(Object *obj, Error **errp) { MachineState *ms =3D MACHINE(obj); @@ -1299,6 +1313,14 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } =20 + /* SPCR */ + ms->acpi_spcr_enabled =3D true; + object_property_add_bool(obj, "spcr", machine_get_spcr, machine_set_sp= cr); + object_property_set_description(obj, "spcr", + "Set on/off to enable/disable " + "ACPI Serial Port Console Redirection " + "Table (spcr)"); + /* default to mc->default_cpus */ ms->smp.cpus =3D mc->default_cpus; ms->smp.max_cpus =3D mc->default_cpus; diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index 073b6de75c..15a56280a0 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -557,7 +557,9 @@ static void acpi_build(AcpiBuildTables *tables, Machine= State *machine) acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, machine); acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, machine); + + if (machine->acpi_spcr_enabled) + spcr_setup(tables_blob, tables->linker, machine); =20 if (machine->numa_state->num_nodes) { if (machine->numa_state->have_numa_distance) { diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 8b5683dbde..ee1416d264 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -894,7 +894,10 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBui= ldTables *tables) } =20 acpi_add_table(table_offsets, tables_blob); - spcr_setup(tables_blob, tables->linker, s); + + if (ms->acpi_spcr_enabled) { + spcr_setup(tables_blob, tables->linker, s); + } =20 acpi_add_table(table_offsets, tables_blob); { diff --git a/include/hw/boards.h b/include/hw/boards.h index a7b1fcffae..e29fadd300 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -444,6 +444,7 @@ struct MachineState { SmpCache smp_cache; struct NVDIMMState *nvdimms_state; struct NumaState *numa_state; + bool acpi_spcr_enabled; }; =20 /* diff --git a/qemu-options.hx b/qemu-options.hx index 7eb8e02b4b..eac8730692 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " nvdimm=3Don|off controls NVDIMM support (default=3Dof= f)\n" " memory-encryption=3D@var{} memory encryption object t= o use (default=3Dnone)\n" " hmat=3Don|off controls ACPI HMAT support (default=3Do= ff)\n" + " spcr=3Don|off controls ACPI SPCR support (default=3Do= n)\n" #ifdef CONFIG_POSIX " aux-ram-share=3Don|off allocate auxiliary guest RAM a= s shared (default: off)\n" #endif @@ -105,6 +106,10 @@ SRST Enables or disables ACPI Heterogeneous Memory Attribute Table (HMAT) support. The default is off. =20 + ``spcr=3Don|off`` + Enables or disables ACPI Serial Port Console Redirection Table + (SPCR) support. The default is on. + ``aux-ram-share=3Don|off`` Allocate auxiliary guest RAM as an anonymous file that is shareable with an external process. This option applies to --=20 2.49.0 From nobody Fri Dec 19 06:34:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1748429944; cv=pass; d=zohomail.com; s=zohoarc; b=iJmPwrHmhumuKQStsmO+WHila4HLgGtlY9qEXw2IJA8vlpW17c8Ow1ejZLow6HQdvY3iocPBnihAlc42yc4OFiUGBJSJsbeS6AknKQLkUik425bYBwUp5WusEYI169T08LJ1nIoddhSvjh/fqeQac3cmrIg6NckUNtQ92nsvTpw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429944; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=ML4LzS7i9Ey8e5UHRMTS6egrK/St3IML6nnVISO052pLlIuSurHazPeEo+kCns9rsZZlddEnn/wTVEOSsPAVCX5dozl8Bf7UY5dbXphWc20yB4pumEZeXvtJyEN9+ICQXUFK6NnPIUPnBysJl/C2Hfg4qRBV74LKtLIz2OsHtWE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17484299445421012.0403792134003; Wed, 28 May 2025 03:59:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKEUG-0007Hq-Am; Wed, 28 May 2025 06:58: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 1uKEU9-0007Dt-Ki; Wed, 28 May 2025 06:58:14 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKEU6-0007uu-EU; Wed, 28 May 2025 06:58:11 -0400 Received: by mx.zohomail.com with SMTPS id 1748429673760272.6198314666002; Wed, 28 May 2025 03:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748429676; cv=none; d=zohomail.com; s=zohoarc; b=ZKF18XAFk0kG7laTR6kFGuQvE/ikl97/K2HAjjgQmSbnaBa8t4XpjgICCCz30mq8NwfPZXG5DeNibDg/LxMJVE8IXfBj4OK3yppEXS8IfBhXfmay2QJ5Tn59sQWno+dHZHZvoXVKwjKhjYcjrMacGiEZKFUC0DI3zyUqj+iqkng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429676; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=GSay3zsNvR/wGAbijItLYpZxCsUQK3WBmipgeHTbA6mlY51etaBibfqgon89X8vUJwl/QIIMBxaLLnZTwZO3F/sGuatg+9ktPLbv3xwYg7h8SdYQRE5l15VGVwu8CSPYc8lN5vbwD8ovaaJDTnl1n1hWT7bCjRrSQ7BEmgOpwcg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748429676; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=2c0O9T1s6X8/ZTemOXWayC8UqGgBEItGWgmlUlE7g6Y=; b=U+m7GROlVgSXmakrLzdtYLpkyIc9LhIi5NYpUmD2tVcH5pCWoiJ6qSl3zcFyH62A TlO96rxitS4HzZmmjorbhCf1m6OPsc+nJyuS6Nz/Vmy6lWWuHmA500z2/y8X/i/fXPa Nyy3SVf6/oxL+8VUF1rWTg9CjRVWfg9Fivg0laUU= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Cc: Li Chen Subject: [PATCH REPOST v4 2/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on AArch64 Date: Wed, 28 May 2025 18:53:36 +0800 Message-ID: <20250528105404.457729-3-me@linux.beauty> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528105404.457729-1-me@linux.beauty> References: <20250528105404.457729-1-me@linux.beauty> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1748429946749116600 Content-Type: text/plain; charset="utf-8" From: Li Chen Add ACPI SPCR table test case for ARM when SPCR was off. Signed-off-by: Li Chen --- tests/qtest/bios-tables-test.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0a333ec435..d2a1aa7fb3 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1789,6 +1789,24 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) free_test_data(&data); } =20 +static void test_acpi_aarch64_virt_tcg_acpi_spcr(void) +{ + test_data data =3D { + .machine =3D "virt", + .arch =3D "aarch64", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-arm-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.= qcow2", + .ram_start =3D 0x40000000ULL, + .scan_len =3D 128ULL * 1024 * 1024, + .variant =3D ".acpispcr", + }; + + test_acpi_one("-cpu cortex-a57 " + " -machine spcr=3Doff", &data); + free_test_data(&data); +} static void test_acpi_tcg_acpi_hmat(const char *machine, const char *arch) { test_data data =3D {}; @@ -2583,6 +2601,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb= ); qtest_add_func("acpi/virt/oem-fields", test_acpi_aarch64_virt_oem_fields); + qtest_add_func("acpi/virt/acpispcr", + test_acpi_aarch64_virt_tcg_acpi_spcr); if (qtest_has_device("virtio-iommu-pci")) { qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_vi= ot); } --=20 2.49.0 From nobody Fri Dec 19 06:34:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1748429948; cv=pass; d=zohomail.com; s=zohoarc; b=WLtph1YLzuMEDSm3ON+X2I+AGr6exLwyWeqBOLU7nNDL88QD687bNctDYQJq4oHYLrkewNJijzSVL5qqxr8nBB1rUx1Bew/3H/phwWdUixTSHXIvpwe48sqDYY3pFbZMnFYmVzxul9AK7H3EQAsvKFj3pfT26ROLweUJwXMnp2w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429948; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lkf4l1yBoJd5nVO2DdqP/p99kdIBVO4AMESrAq6NwTE=; b=RYfdo9G8vjl8GUr4glQllT5MGsKsDY7WL9k8LIhwr1CRFjyqJBfsJUmGj+ia4OY1kv9BLcrwyqV2PuaKZU+u9yDEUnZiMjAK3OTSuS08WarnQdYCroAYXbcVsuzWcuQ1NQ7BCOCZX4FDQUa2K8XrPTfk291gvm+kv2pKthhUvBA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748429948515785.7182988742842; Wed, 28 May 2025 03:59:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKEUr-00083S-4V; Wed, 28 May 2025 06:58:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKEUf-0007uh-SZ; Wed, 28 May 2025 06:58:45 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKEUe-0007yk-A9; Wed, 28 May 2025 06:58:45 -0400 Received: by mx.zohomail.com with SMTPS id 1748429678830603.4858246647274; Wed, 28 May 2025 03:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748429680; cv=none; d=zohomail.com; s=zohoarc; b=ftuedtoybYZ8A0dkGnWFsFslUyZ+nRyCHbU44fSAZGblWV6u26+5VFGMCgkLw7VVFO7EcAij4WpjM6EJnTopvWDpnCfxA+EE2dHjU0uPSuDDCffJI9g+xsp26SYL1gG/FkoxLOaU9ecm1AtkAj6str6zcqLwJSccbgLdX17UTBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429680; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=lkf4l1yBoJd5nVO2DdqP/p99kdIBVO4AMESrAq6NwTE=; b=Kte4WNm94+tAArIEGVuNI2MDPNixfig8KT1VfV5UDgi6dIt0CZs/JawhVWzenfheVQG69Kwtxt7fdH/jmQQYJm61RFvZTBqSwudbZ6S9v/rSxkrVgzbvlhsj15lw1Bzk37elalsiT3vz4BHHz5hW4Xf1E1gHpGn0z+GfxDQyTNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748429680; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=lkf4l1yBoJd5nVO2DdqP/p99kdIBVO4AMESrAq6NwTE=; b=Mis9jwJX9quXNW4b3ALMLXlTPuWASYRf1yc/oJSjCmF/dthoWwFLgyRywKBrzHVt uTtVXEskn2Emgu9CVMcJLdX6GJnVklK+HtkBAW1P2QKYROBzf68CVq3/Js2bruMQi4H rv7DFtR7kmrzYB5SJV+ZZgbKUTn8IWA4XJ0fZJyA= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Cc: Li Chen Subject: [PATCH REPOST v4 3/4] tests/qtest/bios-tables-test: Add test for disabling SPCR on RISC-V Date: Wed, 28 May 2025 18:53:37 +0800 Message-ID: <20250528105404.457729-4-me@linux.beauty> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528105404.457729-1-me@linux.beauty> References: <20250528105404.457729-1-me@linux.beauty> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1748429950587116600 Content-Type: text/plain; charset="utf-8" From: Li Chen Add ACPI SPCR table test case for RISC-V when SPCR was off. Signed-off-by: Li Chen Reviewed-by: Sunil V L --- Notes: Changes since v3: Add Reviewed-by from Sunil V L tests/qtest/bios-tables-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index d2a1aa7fb3..44de152a36 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1807,6 +1807,26 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(voi= d) " -machine spcr=3Doff", &data); free_test_data(&data); } + +static void test_acpi_riscv_virt_tcg_acpi_spcr(void) +{ + test_data data =3D { + .machine =3D "virt", + .arch =3D "riscv64", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-riscv-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.= qcow2", + .ram_start =3D 0x80000000ULL, + .scan_len =3D 128ULL * 1024 * 1024, + .variant =3D ".acpispcr", + }; + + test_acpi_one("-cpu rva22s64 " + "-machine spcr=3Doff", &data); + free_test_data(&data); +} + static void test_acpi_tcg_acpi_hmat(const char *machine, const char *arch) { test_data data =3D {}; @@ -2612,6 +2632,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_riscv64_virt_tcg_numamem); + qtest_add_func("acpi/virt/acpispcr", + test_acpi_riscv_virt_tcg_acpi_spcr); } } ret =3D g_test_run(); --=20 2.49.0 From nobody Fri Dec 19 06:34:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) ARC-Seal: i=2; a=rsa-sha256; t=1748429967; cv=pass; d=zohomail.com; s=zohoarc; b=hdiND8AOKJWPdUUeqFpSHC5YcsmeyCuf2DeETiS6KJfMKv3TX0n3EwvGVSIqrDZe55LKS4ooXkuTOfr4zOQzMvJ1ubi2xYhbfdoDvZTD+yrW2SqgF+bL47FFkXWPDIxGpwVxPx46d8vwEqhW93l+BJp9xI3eGl5FRYyUyOPCeEY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429967; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QieK8ummDzYSt1d8R3ZdIk/G5jCHT48ZJ1lngca8f9o=; b=XT+5EKs5whnt9dMb8A4CnrGDNOPnexJCJ602KMlfrNpcQpsGsSWHRawq5bx9D7vE4wB3fkdEMRtuWXufSxann4UCJkfU+oR04TN8erXNUGEBRdo8o1/sBBEUXJRT1YZGxMk7sLnCoDLZ4vP6AILQHkSrtf8BiiYAEqwkZuLwUSI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=me@linux.beauty; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=linux.beauty) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748429967235730.3671352199854; Wed, 28 May 2025 03:59:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKEVC-0000rz-8G; Wed, 28 May 2025 06:59: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 1uKEV8-0000hX-Og; Wed, 28 May 2025 06:59:15 -0400 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKEV6-00081a-Nb; Wed, 28 May 2025 06:59:14 -0400 Received: by mx.zohomail.com with SMTPS id 1748429685035790.013264683852; Wed, 28 May 2025 03:54:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748429686; cv=none; d=zohomail.com; s=zohoarc; b=UE+TB4jHcUlvosDMs8f3decNIk1hBhBc/1P7uAL1phTTqbvFbM8b5wjt9NHAvbwnZ0SCS7tjBWElgXo3UJ2MWDT+Js6Bc2y2dk9uwmaO8AuzvdaECcs6N1a1ddW3deS7/D3glrlRfxe+Gp/aoCseAaNtbSCQb2kx+xXdggXMf5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748429686; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=QieK8ummDzYSt1d8R3ZdIk/G5jCHT48ZJ1lngca8f9o=; b=MxDHEIjDYvRRRJ1BmLI4fauex03bTHc6zc4/tkXjYq6A+T2mueUA5AQfEXPCsZkorodM7SjPCJboCQFr1yT/pTVORmdSlQ2gk5QOyva1L4uF87tAa021/tDlQqoN9C/RYGRmAI3ghvanNhphVDBisEuYgWHdE1kCpGh+UXatMgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=linux.beauty; spf=pass smtp.mailfrom=me@linux.beauty; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748429686; s=zmail; d=linux.beauty; i=me@linux.beauty; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=QieK8ummDzYSt1d8R3ZdIk/G5jCHT48ZJ1lngca8f9o=; b=ks1Rg9j6TiuitsJxmDpQSOy+2u1SpNhbimuVWyb0MF08vloewPCPdENKgLpYS0W0 F0OBzalltA7jc+GovLrl3ur1UDX19kSwSEsbHk0zeEvddCEE0Oad8QJupWaKYn0mlD0 1DAj0H57mgg5ggUZE4r/sI4XL+A+8Ena6lxHK3x4= From: Li Chen To: "Peter Maydell" , "Shannon Zhao" , "Michael S. Tsirkin" , "Igor Mammedov" , "Ani Sinha" , "Eduardo Habkost" , "Marcel Apfelbaum" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Yanan Wang" , "Zhao Liu" , "Song Gao" , "Jiaxun Yang" , "Sunil V L" , "Palmer Dabbelt" , "Alistair Francis" , "Weiwei Li" , "qemu-arm" , "qemu-devel" , "qemu-riscv" Cc: Li Chen Subject: [PATCH REPOST v4 4/4] acpi/virt: suppress UART device & SPCR when guest has no serial hardware Date: Wed, 28 May 2025 18:53:38 +0800 Message-ID: <20250528105404.457729-5-me@linux.beauty> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528105404.457729-1-me@linux.beauty> References: <20250528105404.457729-1-me@linux.beauty> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.15; envelope-from=me@linux.beauty; helo=sender4-op-o15.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity me@linux.beauty) X-ZM-MESSAGEID: 1748429968834116600 From: Li Chen The virt machines always instantiate a PL011/16550 at UART0 and describe it in ACPI (DSDT device node plus optional SPCR table). When the command line contains =E2=80=9C-serial none=E2=80=9D there is no backen= d attached to that UART, yet the guest still discovers it via ACPI and may try to use it as a console, causing unexpected results. And also explicitly add "-serial stdio" in bios-tables-test.c to allow serial device creation, otherwise DSDT assert would get failure because "-nodefaults" will not create uart device by default: ``` stderr: acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-BMOL72]= , Expected [aml:tests/data/acpi/aarch64/virt/DSDT]. See source file tests/qtest/bios-tables-test.c for instructions on how to u= pdate expected files. acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-RNOL72.dsl, aml:/tm= p/aml-BMOL72], Expected [asl:/tmp/asl-ZVQL72.dsl, aml:tests/data/acpi/aarch= 64/virt/DS DT]. ``` Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Li Chen Reviewed-by: Sunil V L --- Notes: Changes since v3: 1. Add Reviewed-by from Sunil V L 2. Explicitly add "-serial stdio" to pass DSDT assert hw/arm/virt-acpi-build.c | 15 +++++++++------ hw/riscv/virt-acpi-build.c | 7 +++++-- include/system/system.h | 2 ++ system/vl.c | 5 +++++ tests/qtest/bios-tables-test.c | 5 +++-- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index d77d16cbd3..c26aedb1b1 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -59,6 +59,7 @@ #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" #include "target/arm/multiprocessing.h" +#include "system/system.h" =20 #define ARM_SPI_BASE 32 =20 @@ -821,11 +822,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Vi= rtMachineState *vms) */ scope =3D aml_scope("\\_SB"); acpi_dsdt_add_cpus(scope, vms); - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], - (irqmap[VIRT_UART0] + ARM_SPI_BASE), 0); - if (vms->second_ns_uart_present) { - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART1], - (irqmap[VIRT_UART1] + ARM_SPI_BASE), 1); + if (serial_exist()) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], + (irqmap[VIRT_UART0] + ARM_SPI_BASE), 0); + if (vms->second_ns_uart_present) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART1], + (irqmap[VIRT_UART1] + ARM_SPI_BASE), 1); + } } if (vmc->acpi_expose_flash) { acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); @@ -937,7 +940,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->acpi_spcr_enabled) { + if (ms->acpi_spcr_enabled && serial_exist()) { spcr_setup(tables_blob, tables->linker, vms); } =20 diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index ee1416d264..80bf3c3cec 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -39,6 +39,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "system/reset.h" +#include "system/system.h" =20 #define ACPI_BUILD_TABLE_SIZE 0x20000 #define ACPI_BUILD_INTC_ID(socket, index) ((socket << 24) | (index)) @@ -474,7 +475,9 @@ static void build_dsdt(GArray *table_data, memmap[VIRT_APLIC_S].size, "RSCV0002"); } =20 - acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); + if (serial_exist()) + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); + if (virt_is_iommu_sys_enabled(s)) { acpi_dsdt_add_iommu_sys(scope, &memmap[VIRT_IOMMU_SYS], IOMMU_SYS_= IRQ); } @@ -895,7 +898,7 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuil= dTables *tables) =20 acpi_add_table(table_offsets, tables_blob); =20 - if (ms->acpi_spcr_enabled) { + if (ms->acpi_spcr_enabled && serial_exist()) { spcr_setup(tables_blob, tables->linker, s); } =20 diff --git a/include/system/system.h b/include/system/system.h index a7effe7dfd..ca1af38432 100644 --- a/include/system/system.h +++ b/include/system/system.h @@ -75,6 +75,8 @@ extern unsigned int nb_prom_envs; /* Return the Chardev for serial port i, or NULL if none */ Chardev *serial_hd(int i); =20 +bool serial_exist(void); + /* parallel ports */ =20 #define MAX_PARALLEL_PORTS 3 diff --git a/system/vl.c b/system/vl.c index fd402b8ff8..e340ee3a95 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1485,6 +1485,11 @@ Chardev *serial_hd(int i) return NULL; } =20 +bool serial_exist(void) +{ + return serial_hd(0) ? true : false; +} + static bool parallel_parse(const char *devname, Error **errp) { static int index =3D 0; diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 44de152a36..452566fa86 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -824,10 +824,11 @@ static char *test_acpi_create_args(test_data *data, c= onst char *params) /* * TODO: convert '-drive if=3Dpflash' to new syntax (see e33763be7= cd3) * when arm/virt boad starts to support it. + * NOTE: Explicitly add "-serial stdio" to enable uart in DSDT. */ if (data->cd) { args =3D g_strdup_printf("-machine %s%s %s -accel tcg " - "-nodefaults -nographic " + "-nodefaults -serial stdio -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -= cdrom %s %s", data->machine, data->machine_param ?: "", @@ -835,7 +836,7 @@ static char *test_acpi_create_args(test_data *data, con= st char *params) data->uefi_fl1, data->uefi_fl2, data->cd, params ? params = : ""); } else { args =3D g_strdup_printf("-machine %s%s %s -accel tcg " - "-nodefaults -nographic " + "-nodefaults -serial stdio -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don %= s", data->machine, data->machine_param ?: "", --=20 2.49.0