From nobody Thu Nov 12 16:21:53 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 4jQQdF1lKsz70rNt for ; Thu, 12 Nov 2026 16:21:53 +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 4jQQdF16Txz4G6P for ; Thu, 12 Nov 2026 16:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794500513; 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=1bhEGk6sLlbI2juGDfB1JrHHJQ8kSv1/FVqr8mbCHY4=; b=BCt99CJAPOAXaqOaXeMgfg8pnUkH0LUIXb+MwJ5ldR/QUmyTDvyAnOgTQhl2AUpESxI5oR tri2JULcYs9f9McSRcRgZzmaSdrEIzB1y3D53G+hdhahPaF5mQuAvuMGdUy848vFPUjYMh Oz+87dsc+sYaRAq+7T1Bh+SCJubgkQJ6OPEnUd/+hDBk0pljN1koI/ZiS/KvBIN8ZGP2S5 V1efr449gxmrO+W+pV0YJAlrCA7Z+EpRCS/T8gB4VM6A3eWptB8erm68hLIyaewBxF9ExF rfq8/9rlGVK+NuEyELjncOlt7XLWHMJnnR36GWvTmrceDn7/vONbmRN/onXuAQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794500513; b=JUILKmviWFIuIMCGecGLpWcI2Vzzt5a6sf70ObIc4pcKurfAsC2O0UX2741nyi5jgzlpIC 1urK5ksJkMHyKQ0ULu0vNULL05LakJUCHMynaw+4m9Sa/nJOGxNYe+e7bgROLhNpihpbSh RKnMHhGC7keYZ3153+KzqRGopgtm3cOwc8NaR4tU2HZ6HCGn6sYtzHgDYv3xku/SOQxGJ8 A29CHLGTol8naHKzjakFftUHC/RjeBKOchhpU3xFczqUIEEvoGX3SykUUnd0ijFaZZ7DOj B2chV6NOR4PAa98zfY15Y/QWSxdM9+dtwmxNGmy9gTJu4iV4+n931RyyYIR64Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794500513; 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=1bhEGk6sLlbI2juGDfB1JrHHJQ8kSv1/FVqr8mbCHY4=; b=vZoI2DU2O2K5uAVgJhtmuxAJOX1rmeAx7zmQ234JaCgTs9LEy1SN3vDW4GAZXk1PySr3jb RwR/ZGTUUjNApqniaq0WMoMlcIKQwEJkLSBkFDUxc1s/+lQG5e8h+hebGKPqT3mOrfPPtI 0tjSslioJAOQ60vAOaNcLgoFZxTDap/AOo9lGJFJYyCDk0j4Pt/T9lbDJwjEf/Dt2BqjWN JM5MS5/sY7F48C3GVx7Qztm9GQGU30KdI+Ih+mNF03b/3wYkufQzddkNb5A7drTU53j+1z 9X0HjxdVxpTCiXz8HJJ924c0brOO7VSz+2zNCpPr7HBemwJWy4U8t6CiwoNzUg== 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 4jQQdF0nB6z18rP for ; Thu, 12 Nov 2026 16:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:21:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rick Richard From: Mitchell Horne Subject: git: 4b9057dbb7c1 - stable/15 - 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4b9057dbb7c1c87e74921403c2f6e1dea0efd103 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:21:53 +0000 Message-Id: <6af5e7a1.2c8e.4bef9fad@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4b9057dbb7c1c87e74921403c2f6e1dea0efd103 commit 4b9057dbb7c1c87e74921403c2f6e1dea0efd103 Author: Rick Richard AuthorDate: 2026-10-03 16:00:00 +0000 Commit: Mitchell Horne CommitDate: 2026-11-12 16:21:46 +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 (cherry picked from commit 9db8ae83e62e9a1391674a14b0b7d76de2e3c3f7) --- 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);