From nobody Mon Feb 19 16:45:34 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 4TdpLk4y51z5C9Wn; Mon, 19 Feb 2024 16:45:34 +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 4TdpLk31b6z4cH4; Mon, 19 Feb 2024 16:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361134; 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=lH3Whj39SQn9EOFPJGjPZkGa0U1ww6Tsp6QXKUbmPRU=; b=s6wGjgXv7rQAGV5eBwFjJ4DFJdvS3lXW7V9QmZa2EAbc/epMvlakg3UbyJYjjrxmLX2lLj DaaxHF/ruXlA93qeMlga7z4/B1nD+LLuSFzLttchllPyarpzh7Cm8i/cjemmOfU0S+mrxG ZHTM3CiCPU05ZJ9nTv8IrmnafFGOvkx+eYRac9J1958t6lW3+0xnvsyJ4QmUMiMOqjuYeP LoKFnTYbO4TE8yosYGjVx36bofnLiv2iUFDXEA9nSDiHZ4k0WifcxX6AeBobNld1j7evAT mdmzOmXCSsgAbpaoYQYvqz2LVdpa6kcH2WTHduiyf36t6uye+my9YjrhDZfpTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361134; 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=lH3Whj39SQn9EOFPJGjPZkGa0U1ww6Tsp6QXKUbmPRU=; b=jAkNmAG0iUJEKPuDzGgGs5udgqLF7Qn3s35MQAVAnq/nOb+5rbpd01Yz+MWLy/lyO6DCc3 tOdtXmKIPA+D1OoBeIPU1VdwQVPWyjQBlDPDiJB5XcLxaFxAe3wtuktCZ7Hz7rPKUNcGAa rzwF3q3+rZeqloARtT2PFcETFDZAPqnBiUZN9zdn5kHYj3DGIo8KMalww+Rkd984RKbysn +beS5vE0siCXH6clbu+oNnWFVCHgzA5M34VlfmedSiMXzRsJDm0Ha5j9ze7YxJ9ulkXlDT wQhz6SXxlLSBcl2lp8QKVmitGFj7jXlHf+RoXN3WY3dFxExfveomWKog9DAu6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361134; a=rsa-sha256; cv=none; b=fnRo8upF3tiivr9RsrkZ+MWSjd7xiEmOCRThuITFMYfPD0FppovSR6vHSyOa9YzUvjF/CJ HuJ12VQjW0+9pellrB59JwJZBvkqoZbtRaeYbRw6DIfrh3R9tNx5/i/PyP3oJcIY5vns/G UEOyBsyo3wiQXHOitDC7yJ3BwbNGYT9/GnEUq+i2vnOmFskvZoEcCqCXBY2sEUa4Aqdi0E c1d0J67R40fQghcCaUfw+6qQnJhkRqZarEfhQP8NiVcEy1X0L3a60IeVvWAC7+uzHHbokz 8z4bvNhZALsm74k2gxoDvNB+wAL1jCB2f7hiQKTOyEoTSbwsTaAd0zCrhD8F0A== 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 4TdpLk26dczjGx; Mon, 19 Feb 2024 16:45:34 +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 41JGjYvC096737; Mon, 19 Feb 2024 16:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGjYg1096734; Mon, 19 Feb 2024 16:45:34 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:34 GMT Message-Id: <202402191645.41JGjYg1096734@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: f8c7bbd1c93f - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f8c7bbd1c93fc46610e2757760a0b55a31371780 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f8c7bbd1c93fc46610e2757760a0b55a31371780 commit f8c7bbd1c93fc46610e2757760a0b55a31371780 Author: Andrew Turner AuthorDate: 2024-01-09 13:29:47 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 13:17:56 +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 5eae06ceba6f..213f8eca457c 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;