From nobody Tue Apr 7 22:04:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773236629; cv=none; d=zohomail.com; s=zohoarc; b=dI95XmqG4hVv4gh5X+VKVAoC+uSeyPJ1qx4J1ShqlHgeEKglfxuYHu0Htj/fB41n3VEMR5W/HOAwlljA0SvctholeZXX/LkhxXFsYbNauIaC3hycpvT4uISPD6CeRY+YfvcVUGMi4KxuMwr/bAzkBkkimFhmnmOtxxynwMXsb+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773236629; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9DLQCJfcLNIFBh1FAf44b3oNbNNiaQrckD7FruwOuK8=; b=P4zJctyBkKljhIHYH+q32k+qL1J/WxHc+X6UVf4E7r1RPk3DIIt7iQPOH/nl3MoOuNFWpPYP0A68J1lneaMeEAjr3FSCCNYlqWoUWXmwiXXBnx9s/SyfP4pILrPaUM4QiEzY5B0za7sBJ9O5yP1Ql0dHdYoZZ2Nvd0TdAtDEBVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773236629247596.4924294462743; Wed, 11 Mar 2026 06:43:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JqZ-00035O-5N; Wed, 11 Mar 2026 09:43:35 -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 1w0JqV-00034R-Of for qemu-devel@nongnu.org; Wed, 11 Mar 2026 09:43:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JqT-00071i-DW for qemu-devel@nongnu.org; Wed, 11 Mar 2026 09:43:31 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-rcZ4LV6JPdiffj4DZg_WRw-1; Wed, 11 Mar 2026 09:43:24 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-439a9182148so7995870f8f.2 for ; Wed, 11 Mar 2026 06:43:24 -0700 (PDT) Received: from lleonard-thinkpadx1carbongen13.rmtit.csb ([176.206.19.176]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fc0ba923sm1669167f8f.20.2026.03.11.06.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 06:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773236606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9DLQCJfcLNIFBh1FAf44b3oNbNNiaQrckD7FruwOuK8=; b=W2iR/VJPH3J9UqLPOxPIrxYsRzI7wF9fT664iGtuASZLTiEK4lyLuP+3v2Hy5DN6Say9u+ 2lIjU75RVslrK4QkIzE5+duT83gZyH0cVicgnwvsvfvF50m+jGY4bE5AWTEqJc7YQ/He9/ Q/C6e6kHyeeDyWTVZ0GeamK4x0iD3yg= X-MC-Unique: rcZ4LV6JPdiffj4DZg_WRw-1 X-Mimecast-MFC-AGG-ID: rcZ4LV6JPdiffj4DZg_WRw_1773236603 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773236603; x=1773841403; darn=nongnu.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=9DLQCJfcLNIFBh1FAf44b3oNbNNiaQrckD7FruwOuK8=; b=YBCvM2ELK3ECLthkUVH8ZJu+EVTANSc+iYEGOG9W4ZpbeNW15m+80QIWKiYZxTTopm 39oG+WBDCw5m/sz1K/lQvk0Bfuar/th39LkFlB6MmGm4VKJ2TpmaXWf9Nb2TzwESav6P v/hoLzAy38SqBKAyGH2mXyDZltdWBMBE4s6sSGhZco1RHQzpHPl3qRkJPH2xzxLRkYFK be2Be5s/EzPcO4R9zw0hDsQNacNRcKKEnYDuskNkde08Knecb2tThz3fBl7lz2Yp9JTB 5V61naOxQOzmQrazYKNZe+rymIBoQDZE624Dm+zUxiCpEXKKlqMEEHMAPfwSl2SjTVqf JeEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773236603; x=1773841403; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9DLQCJfcLNIFBh1FAf44b3oNbNNiaQrckD7FruwOuK8=; b=P1+aUIYFcUayMcgp4669KsXpzK8KLNvE314ymwJGMr9QJIf5YzZ7fVaKY2uAM2HRye lEIL5aBZ13uTXpui45afPrNSvnKvyI7n16yyxeEnfOXq6PLqboCg4Kh4RYGfp0ad+xCB 12mxoqrdXL5sOv0MFn5v924eNvSG2puKYBhQHOzDCAkiR0dgGlGUYHUyN+LeOnS29h7j PE2kfr9it3HpGpERuFtQnjeMHh8yTHAZWwSzUmryjClLnCqp43TWTSIKmkGzwUdmwDW6 OB9wHGgUxk/aZAY4Ba/BtXyaab3O4kF127qtrHi4f+SyaJrzsKnaFD10QT6PoKYl7+yq OfhQ== X-Gm-Message-State: AOJu0Yyrg5sDW1qIQz7NJDGqNYI1hXHcgUEiL2i7PJy7hHVME5uT7etR D1WU1lt9PbihuDOYeASCIcvzFh/eUBHm/PEFhV8Jb/UcSTWdSLU+enndazm0tHIybgdghxq6Sm+ LfTYujm9ipJuDQZ24CyMnJqYYznw3N+4f5hqZD9Z+TTiIic8mHPom+GOQ X-Gm-Gg: ATEYQzxdkJr3aupUO9ZnOvyi1Kr6zj3AZFxhWI69ndB3rxmAFrOtOevpzRTUs9s3AJj DevGGJpLczZTIUE6Rp3MKwVzydEwuAwETIAJnnIT71Pn5Q3vqpa2l3PmoeOYY+v5Ssg5rtdQBUw kEXqX4mRe/dB6xfQ01zbX2W8zhyn4kYHnKP7KGJGtioNO9YsW1tidViR9Be+JJaDlkIp2Ybdv0A ZOmw+XFTfIS4n++PNmJyGONxMI0tb6EUnBsuYlG+LgA5RecSv4lO8FicSRg9u8zBe+JvUl0/Mgg FJq0CBQDl2kVGRQgxwalziNMkrcpWXxhix6odVUFzX0IjHEAjyV4b+gj9/givD8ha6j00c6noId C/7rxx++5A1LgUkTbvfNgGnUkfqAVnndvv2w0bCf9QPcRhreW+sqEHTb5dfog X-Received: by 2002:a05:6000:200f:b0:439:c202:99aa with SMTP id ffacd0b85a97d-439f8222e99mr5261528f8f.38.1773236603039; Wed, 11 Mar 2026 06:43:23 -0700 (PDT) X-Received: by 2002:a05:6000:200f:b0:439:c202:99aa with SMTP id ffacd0b85a97d-439f8222e99mr5261475f8f.38.1773236602406; Wed, 11 Mar 2026 06:43:22 -0700 (PDT) From: Luigi Leonardi Date: Wed, 11 Mar 2026 14:43:20 +0100 Subject: [PATCH] hw/arm/virt: add serial-debug-level property for EDK2 firmware MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260311-edk2_arm_serial-v1-1-c25e237116f3@redhat.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDY0ND3dSUbKP4xKLceJDGxBzdVBMDIyOzVDNL09QkJaCugqLUtMwKsIn RsbW1APMn66NhAAAA X-Change-ID: 20260311-edk2_arm_serial-e40226e695eb To: qemu-devel@nongnu.org Cc: Peter Maydell , Pierrick Bouvier , Oliver Steffen , qemu-arm@nongnu.org, Gerd Hoffmann , Luigi Leonardi X-Mailer: b4 0.14.2 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=170.10.129.124; envelope-from=leonardi@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1773236632181158500 Add a machine property to pass a debug level to EDK2 firmware via the device tree. The value is set as an "edk2,debug-level" property on all pl011 UART nodes. This is to create a runtime parameter to set the verbosity of the debug log on the serial ports in edk2. Currently, the only way to set the verbosity is a compile-time option. DT is used because the fw_cfg interface is not yet initialized in early boot phases. Corresponding edk2 PR: https://github.com/tianocore/edk2/pull/12277 Suggested-by: Gerd Hoffmann Signed-off-by: Luigi Leonardi --- docs/system/arm/virt.rst | 6 ++++++ hw/arm/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 46 insertions(+) diff --git a/docs/system/arm/virt.rst b/docs/system/arm/virt.rst index fbe3ca9e129db514aeb7b0bddd6432a818d0a09d..adba8fff2157b62957f6c8770de= 44faa8449b34d 100644 --- a/docs/system/arm/virt.rst +++ b/docs/system/arm/virt.rst @@ -239,6 +239,12 @@ x-oem-table-id Set string (up to 8 bytes) to override the default value of field OEM Ta= ble ID in ACPI table header. =20 +serial-debug-level + Set the EDK2 firmware debug level for serial port output. Valid values a= re + the debug level bitmasks defined in the EDK2 + `DebugLib.h `_ + header (e.g. ``0x00400000`` for ``DEBUG_INFO``). + SMMU configuration """""""""""""""""" =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7456614d0585af52662c4eb5bb9c4eb76e729a7b..bbea1bb84a4f7613195f5d3fac5= fba31a0fb6e89 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -986,6 +986,11 @@ static void create_uart(const VirtMachineState *vms, i= nt uart, =20 nodename =3D g_strdup_printf("/pl011@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); + if (vms->serial_debug_level_set) { + qemu_fdt_setprop_cell(ms->fdt, nodename, "edk2,debug-level", + vms->serial_debug_level); + } + /* Note that we can't use setprop_string because of the embedded NUL */ qemu_fdt_setprop(ms->fdt, nodename, "compatible", compat, sizeof(compat)); @@ -2869,6 +2874,31 @@ static void virt_set_dtb_randomness(Object *obj, boo= l value, Error **errp) vms->dtb_randomness =3D value; } =20 +static char *virt_get_serial_debug_level(Object *obj, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + return vms->serial_debug_level_set + ? g_strdup_printf("0x%" PRIx32, vms->serial_debug_level) + : g_strdup(""); +} + +static void +virt_set_serial_debug_level(Object *obj, const char *value, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + uint64_t val; + int ret; + + ret =3D qemu_strtou64(value, NULL, 0, &val); + if (ret < 0 || val > UINT32_MAX) { + error_setg(errp, "invalid serial-debug-level value '%s', " + "must be a uint32 value", value); + return; + } + vms->serial_debug_level =3D (uint32_t)val; + vms->serial_debug_level_set =3D true; +} + static char *virt_get_oem_id(Object *obj, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); @@ -3643,6 +3673,12 @@ static void virt_machine_class_init(ObjectClass *oc,= const void *data) "in ACPI table header." "The string may be up to 8 bytes= in size"); =20 + object_class_property_add_str(oc, "serial-debug-level", + virt_get_serial_debug_level, + virt_set_serial_debug_level); + object_class_property_set_description(oc, "serial-debug-level", + "Set the EDK2 firmware debug lev= el bitmask for " + "serial port output"); } =20 static void virt_instance_init(Object *obj) @@ -3692,6 +3728,8 @@ static void virt_instance_init(Object *obj) =20 vms->virtio_transports =3D NUM_VIRTIO_TRANSPORTS; =20 + vms->serial_debug_level_set =3D false; + virt_flash_create(vms); =20 vms->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index dba8ac7f2f49fc07a857f8af55786cb0ef960bd2..1dddfa6a11c1309f82c241cb175= 6a3e8f28a4ad0 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -187,6 +187,8 @@ struct VirtMachineState { MemoryRegion *sysmem; MemoryRegion *secure_sysmem; bool pci_preserve_config; + uint32_t serial_debug_level; + bool serial_debug_level_set; }; =20 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) --- base-commit: ae56950eac7b61b1abf42003329ee0f3ce111711 change-id: 20260311-edk2_arm_serial-e40226e695eb Best regards, --=20 Luigi Leonardi