From nobody Wed Nov 04 17:33:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jKXbJ4YyTz6yZ8Y for ; Wed, 04 Nov 2026 17:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKXbJ3Dpbz4yJ3 for ; Wed, 04 Nov 2026 17:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793813596; 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=ge5IbxfGzfdPx1IIh0RQURxM5sdkLB/Jj3k1QvslB2E=; b=Y5yvXnkzbQ71kC9wD7ydOheMozHsvdss7qfm5IZK/9zCbs4jvpk3/GHDE/LfA+b7UX2YbC wRknrBflX1djOAvhQb7CQcZQnu+G1bTIae/AEZ2YLA/KeLq5uXmuzKTmza2S8BggbQB+Lz pHz0oPG2H/K7ky+sOCtRdaSoG7zl9DJ2kVUaTx85Q4aPjK4Rx1gVovhyi3Zcjj3NpnrNH5 d1eNrhYQbTeJq0N0Nn1ayNOkECVBW6v76MyC15/vEH/W4FagU6hUGBZi/ULSo3d54kq1zq y5QrwFlzBKc2uOMQTdYJ6Y4rf2AMBpIDdN5X5klgm17HJH9woyFLQ5mikE9Rqw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793813596; b=ZqQxxzyGufgx+FF9c+PVGdZYBgmPW8uavTBiSiknoSUB9YA+aj+XYgVYAXjWaBreFO0XeC oKDGUcHVmm42isyEFi9d6VKEz4BZ+YpLLlWKIvFgLesblW0awHR8sv8FAbTUzEJQImuBLf c+gHZ1+VsogeMoynPCcRw6ln5J9+WIzcYlPVodXSg0o0II6a1BTWnpTtke/TEkUYOySC4n fLJCWZheIS1k0w1fz/KWLvIpiW/iiLCVnycRU51HYZSQfbDSieK+UaOHUu40hJX3QivCTr WjxH2lc0MT/FlZmDtAGIJnXktr1oBTuO9Dhdg6eoEAw6obNwGLOlmNtqYQt5Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793813596; 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=ge5IbxfGzfdPx1IIh0RQURxM5sdkLB/Jj3k1QvslB2E=; b=Ec8O2kQgM3TFvmH1Hu4+ijZ8EDiw0bIzCAK+Rrd2kY8Ut8F2wMgS0jJeS4M8qbYTC+kAYe s5Bk+htf7B/5QCs3xQC4SAKXSMwxkNjGZoenfL5BXfXm+jwmwsgT/TiI+DpF4lKWKSLArl N/pcBHkDEhg/Oz+7gShATiy8L61NmEGHvF4d47qUt3SfFhWCs43VkKlwnpUq52ySgnFplI 29z8vsZnKiQcmJ5oopFfWI7Lwxdde/4M7amf3ZgAlvp8HHm0lm4SQrcwb6Wn/tfkqzuSNq uJYmC0NIhmVFwxBr6w6F4isAEXLQBg0nv+Nw2zB2gn1mGqB4cs3AuNnPxNXVjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKXbJ2vFMz1CHw for ; Wed, 04 Nov 2026 17:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 17:33:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Rick Richard From: Mitchell Horne Subject: git: 9db8ae83e62e - main - uart: Set the bus space tag before parsing hw.uart.console List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9db8ae83e62e9a1391674a14b0b7d76de2e3c3f7 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 17:33:16 +0000 Message-Id: <6aeb6c5c.26137.5949f22a@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9db8ae83e62e9a1391674a14b0b7d76de2e3c3f7 commit 9db8ae83e62e9a1391674a14b0b7d76de2e3c3f7 Author: Rick Richard AuthorDate: 2026-10-03 16:00:00 +0000 Commit: Mitchell Horne CommitDate: 2026-11-04 17:31:03 +0000 uart: Set the bus space tag before parsing hw.uart.console uart_cpu_getdev() lets hw.uart.console override the FDT, but uart_getenv() maps an "mm:" address with uart_bus_space_mem, which is only assigned after the FDT probe. On riscv and arm it is still NULL at that point, so bus_space_map() faults before there is a console. On riscv this happens on any EFI boot where the firmware provides an SPCR table, since the loader turns it into hw.uart.console. Initialize uart_bus_space_mem to fdtbus_bs_tag, as uart_cpu_arm64.c does with &memmap_bus (See also 0624eddcffefe). PR: 299089 Reviewed by: mhorne MFC after: 1 week Signed-off-by: Rick Richard --- sys/dev/uart/uart_cpu_fdt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c index fd1647cd78aa..bc7b9e2cb016 100644 --- a/sys/dev/uart/uart_cpu_fdt.c +++ b/sys/dev/uart/uart_cpu_fdt.c @@ -50,6 +50,8 @@ #include #include +extern bus_space_tag_t fdtbus_bs_tag; + /* * UART console routines. */ @@ -78,6 +80,8 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) u_int shift, iowidth, rclk; int br, err; + uart_bus_space_mem = fdtbus_bs_tag; + /* Allow overriding the FDT using the environment. */ class = &uart_ns8250_class; err = uart_getenv(devtype, di, class);