From nobody Tue Feb 13 11:51:54 2024 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 4TZ06g0wzpz5B7FF; Tue, 13 Feb 2024 11:51:55 +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 4TZ06f4rtgz44nD; Tue, 13 Feb 2024 11:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825114; 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=z2RQkk6uvEE0dmZzUHUdqNgKzKnAaShPe9eMR31OamU=; b=i6EK7o6aw0ZZL9a9zZf4fhtK07mUk8JVUfmdjhzGUHLAueBTXe3k7Vr7hXModYu15JEg9Z dlHn5mBn3Spcm3HzkymguPF35XQwd8LL5SNVYhRTJsO389K4QXgdE4FYc8s8zapWH9clin cOmURMxXjk8VFYj8HKX6EBgNP9+jBHBNa8BhWQnb4HlKtkIcXM1gu8Busc01HKcuCVwe0x UbQCo8Dko+3wU1jdx5TKrCylWlaNLcm/FGMpFWpqKA7VWeMAEaNT3+SMR+bgygAv1HleaK ZLRbvwoLv2V6nq/SlfFfwqUjP9nvP9gcmpwCLlFqAs5l419nJ5u/NhS9WSFVKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825114; a=rsa-sha256; cv=none; b=SD6lfrAwaNpqXlx1mkxoZheMKWKpZsG1aUHotQUJ1hWIU5SOJNpvg3zp/KCTEXTlRQTfKW IRdSO+bijOKU1Ypy9Up/G86ALCuhGAms2RGElSHUS9qMXJWyDwC7t8MDmpXrqINYg0uXW4 VOkSuyWOnWcw70Pmr7OQhE61YMjcvXtquZ9SIvuddJI0CMg+PrPsGGwnIIkD1QUIe93VKs hl38E15l3Zg0XlUlHhOj5hIibSGMr6qmQU5XinCNib2N/ftyTkMyO4d3s7N/5f69KCDmOX Uxty8m4twnaiiP76EmvfP7NM5DujEUTdkImxqr8+AAdvi+4lg1EOb1hUHTGSAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825114; 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=z2RQkk6uvEE0dmZzUHUdqNgKzKnAaShPe9eMR31OamU=; b=V/JM7iKcvbJSTVFfT+qz70j/eB/NZUHL2ltK8ooosTriwI361KHR46DhsReq9ZDSjMeXyN XrWlbBA78RywoldK81lbRemGZGs0tRKcbw6aCFXuZuWD0++YfO2ROb5apTVVcdPEDUYoxK Bp48a5sPdDQH45j03e6AILZErGv8ltdCeA+2DNS4/t+v12+Esob93XxRrfRDQrfY75OY3W TWugQCnT5NRYRzlNySVMslyk7Y/8rN3UXuAks7sX0MUbUYEXruoApVvsSCIIta7plSAGWl VKFMJjbPMxQPYEez34ak3PhORsNJnt1KlA7fwza1tNopzlDLkVEihKXrW5q4Xg== 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 4TZ06f3wY2zDbQ; Tue, 13 Feb 2024 11:51:54 +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 41DBpsPC046171; Tue, 13 Feb 2024 11:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBps7v046156; Tue, 13 Feb 2024 11:51:54 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:54 GMT Message-Id: <202402131151.41DBps7v046156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a9fc9d6d15f0 - main - dev/uart: Support 8-byte register access List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce commit a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce Author: Andrew Turner AuthorDate: 2024-01-09 13:29:47 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:53 +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 --- 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 987152283c81..4cdec00c9829 100644 --- a/sys/dev/uart/uart.h +++ b/sys/dev/uart/uart.h @@ -56,6 +56,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; @@ -71,10 +76,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;