From nobody Tue Feb 10 02:48:06 2026 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