From nobody Mon Feb 19 16:45:07 2024 X-Original-To: dev-commits-src-branches@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 4TdpLD2RJzz5C9FZ; Mon, 19 Feb 2024 16:45:08 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpLC4zX1z4bTV; Mon, 19 Feb 2024 16:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cpftWmdCRlj0V8pac1uNMPY4BwHJoLrTW2nlkJif7Q=; b=dQtClKFakLRKe+rjr0m4tTA3Sp3WZzkOk4ur7E2HHCd4IOhAcl5C3iBlW35L5SBEmslJj3 ClPGEJjAHAxcX3vDEuUAL1iH8Zia7XG+5nWvqSDB4DKfwOdfzZjqf5Dofr7PSPX40jTYZK Jc7XncZHonzloWC3Ryo6cHHfybjQGzaR6S0N4vRXc0glQXL+e4Ln8dMO9Cidv1sSgeL+Zm AYzUiypbl6d+1z2Ec5NpiAoEr0Ysytc+iD5X8Z6WL2uxfO6HBzA5+vrXo8ayunARnSEqDQ +cEsDKR+akpTKbbUlCk4I1gziheWCKzEPlutpJI/zXepoicrCtnZJm5UXGvm0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cpftWmdCRlj0V8pac1uNMPY4BwHJoLrTW2nlkJif7Q=; b=JahVCowYjgx8Hc3UzlDs0oYn3zYvkVLOl8EPTmeEBUgJjfZasEA9z3Ov0a++eGH990ISUG 8cRHt6m+JaqMSsW22516CH3+1iv4GQvioF/p0NQowkHf2W5WQjLZRKhS6G1a+PI1WdBu8X NEtfWjWmw5qHMFFM4QWw2INvzKpChLxHOKXzGHGeTTwOGEq+1wPY2EC98Xgmr6SBEwblhQ Xv0J8EUGnfBDChbPKEUqhLXORqwJqcAs2F6JdShLOFH+c3gzCNGSQK3oYJ7IFiGKwvwWqs 9R10Hy4YWSYjEBbTP5F4KzpFoWX3Kq620x3arGzP3mdf03N3OtkNoFetA5PfzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361107; a=rsa-sha256; cv=none; b=CHbUtCe5DzFWs7pJo4Czpb5JC9r1n+j3c9pf7cIMps+BcE+NDw9aUj+c6wgm3PnD6rb5gv nt30sOFeDVO55onRXZodfjg9Ec9p5P5d2Znxkc6/WUCzAk5IfXBpFr/p3OYuBwL8Ksfs2p iytTIg5DpRpOyw4zeDvvlpZS5E6+phLEe8OwR4fzSO4XbDBykzmo8s81km9aT3C+36KOIU eErBIJ6l0jKv1DJH5bmLprnF5w2VX3eZKH1UZ/r5cl+R97mu3dpIVWix/d4VhYfvsYSA8B HKGsXeQDErPRTryPeagvts8GYnktxjr+nYjDyZa4/vL4tkoqXCBOY/HOgMs71g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdpLC45Vwzj9R; Mon, 19 Feb 2024 16:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGj7m2095407; Mon, 19 Feb 2024 16:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGj7bF095404; Mon, 19 Feb 2024 16:45:07 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:07 GMT Message-Id: <202402191645.41JGj7bF095404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2ea922e9e38f - stable/13 - dev/uart: Support 8-byte register access List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ea922e9e38f1a8e633617901492fb221305ad5a Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2ea922e9e38f1a8e633617901492fb221305ad5a commit 2ea922e9e38f1a8e633617901492fb221305ad5a Author: Andrew Turner AuthorDate: 2024-01-09 13:29:47 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 12:45:51 +0000 dev/uart: Support 8-byte register access While we only support 4-byte registers in the uart code the physical access may be to an 8-byte register. Support this as an option on non-i386. On i386 we lack the needed 8-byte bus_space functions. ACPI has an option for 8-byte register io width, and FDT can be given any size. Support these sizes, even if we don't expect to see hardware with an 8-byte io width. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43374 (cherry picked from commit a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce) --- sys/dev/uart/uart.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h index 8e31cd49fd52..31d58d829579 100644 --- a/sys/dev/uart/uart.h +++ b/sys/dev/uart/uart.h @@ -54,6 +54,11 @@ uart_getreg(struct uart_bas *bas, int reg) uint32_t ret; switch (uart_regiowidth(bas)) { +#if !defined(__i386__) + case 8: + ret = bus_space_read_8(bas->bst, bas->bsh, uart_regofs(bas, reg)); + break; +#endif case 4: ret = bus_space_read_4(bas->bst, bas->bsh, uart_regofs(bas, reg)); break; @@ -69,10 +74,15 @@ uart_getreg(struct uart_bas *bas, int reg) } static inline void -uart_setreg(struct uart_bas *bas, int reg, int value) +uart_setreg(struct uart_bas *bas, int reg, uint32_t value) { switch (uart_regiowidth(bas)) { +#if !defined(__i386__) + case 8: + bus_space_write_8(bas->bst, bas->bsh, uart_regofs(bas, reg), value); + break; +#endif case 4: bus_space_write_4(bas->bst, bas->bsh, uart_regofs(bas, reg), value); break;