From nobody Wed Sep 30 19:28:25 2026 X-Original-To: dev-commits-src-main@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 4hw4pK5l08z6v43V for ; Wed, 30 Sep 2026 19:28:25 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw4pK55Ppz4Mtl for ; Wed, 30 Sep 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790796505; 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=zS1skNuDr5VX68GjpsBGa2YO4B+bJ3geKh01eTwrNeY=; b=ugkfjyKnDy3OWQKYjZNj8vmRzAg2yKdD7kmeWQE/45A8PV9WpruMqIj4Bxdfd5h50FEZ0K TkAnTN3ZPn3hnlkh6x1hs9SlHoUZSuoRs8lU1BE1pAYN3DJ7SSelRWR1wQO3eSrgIA+nsY Q6L1z1VqT3cmSJi6h87JjcK8Vwo6v29Gzjj5EyFzfcqUv0R5Ap1bthbVM1TF14gIn8owIY ToGSMwYdvn6NdcGsQ+OD6jNrrWrKmHehlt28l/lIV5PLIJgNXTb8bRm1REGY81uWfPvqCg er49VSkHmNT42YONjuo2dqNajLGYI4ZKHgi+/Yn4s8DrbkY9XDfPcgQ0XQA6wQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790796505; b=KhSdzhDHu2TA1rLu2zKSKEJfpjHC75976oBRLiIrm2hWe80Jbb1d8NUU+yDDlA3rxnKho1 pI3zUUAxIysd7jFAM03kIs3eodbt6sBGPMVqvrxWGNkTvy4boWsN0H4dnRK+LkiaGoW+LE 0EZ0nYto84yd3kShACwJcgUhtqMSBMZM33nh1RiqUbHuyN7RulWQRb71hpyM6suiS5rRqZ hPIiJRqZgqW3JI9HA4nuw/Aw+gyKzYZoqcAmLAtB2xBXC5PQj1/j/YZDN3/GaQbc9AHrt7 QPerP3x25ILf1Gdhijy1VvBTodQXX2O9BQmarxXMJJWWy+lcWO/JdOnGf1Sa1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790796505; 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=zS1skNuDr5VX68GjpsBGa2YO4B+bJ3geKh01eTwrNeY=; b=G+MBm01q1jOV6+lpjoyF3tXsHlJtB+ErzGVvK1/LlfMYqT62q88DX/Kc9Zse24a+rwCLb6 jvgEJzlI0/WKb/UL+mNXDvzTH7Sv76tkPrSL8BZokPEkvE/kz1Pn5Bl4q4qh/NiORb78yC QUB5hi1uDcJgkZV41CLyVeaOwokCiqJEom5JFwPWxehl37qPCMAv73xIWH6gpHX+kPQkGR 1UTYWoUpd94k8edjtR6pHOfdHxu6DbIf66h25++q0aTeT7VW2hPyi23Q5OzSafFUvU0Se5 yqIv7VmoNUv3cngDP44rSrhgFhDVMj3euOF6fftj7jG70rbUqxe3plgtAeB1Bw== 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 4hw4pK3qZnzyh3 for ; Wed, 30 Sep 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 19:28:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 6f9d0f02e72c - main - jh7110_gpio: handle preset high/low List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: 6f9d0f02e72cdcf64af6e0a034af4d4f065b26f8 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 19:28:25 +0000 Message-Id: <6abd62d9.22c97.6b6762be@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6f9d0f02e72cdcf64af6e0a034af4d4f065b26f8 commit 6f9d0f02e72cdcf64af6e0a034af4d4f065b26f8 Author: Mitchell Horne AuthorDate: 2026-09-30 19:23:03 +0000 Commit: Mitchell Horne CommitDate: 2026-09-30 19:26:04 +0000 jh7110_gpio: handle preset high/low Take action in the presence of the GPIO_PIN_PRESET_LOW/HIGH flags. This part of the GPIO interface seems to be unused, but is trivially implemented in our driver. Reviewed by: Brian Scott MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59991 --- sys/riscv/starfive/jh7110_gpio.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/sys/riscv/starfive/jh7110_gpio.c b/sys/riscv/starfive/jh7110_gpio.c index fdf40e5c147d..22e435a8d146 100644 --- a/sys/riscv/starfive/jh7110_gpio.c +++ b/sys/riscv/starfive/jh7110_gpio.c @@ -92,6 +92,7 @@ static struct resource_spec jh7110_gpio_spec[] = { #define JH7110_GPIO_LOCK(_sc) mtx_lock(&(_sc)->mtx) #define JH7110_GPIO_UNLOCK(_sc) mtx_unlock(&(_sc)->mtx) +#define JH7110_GPIO_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_OWNED); #define RD4(sc, reg) bus_read_4((sc)->res, (reg)) #define WR4(sc, reg, val) bus_write_4((sc)->res, (reg), (val)) @@ -145,11 +146,26 @@ jh7110_gpio_pin_get(device_t dev, uint32_t pin, uint32_t *val) return (0); } +static void +jh7110_gpio_pin_set_locked(struct jh7110_gpio_softc *sc, uint32_t pin, + uint32_t val) +{ + uint32_t reg; + + JH7110_GPIO_ASSERT_LOCKED(sc); + MPASS(pin <= sc->maxpin); + + reg = RD4(sc, sc->doutcfg + GPIO_RW_OFFSET(pin)); + reg &= ~(DATA_OUT_MASK << GPIO_SHIFT(pin)); + if (val != 0) + reg |= 0x1 << GPIO_SHIFT(pin); + WR4(sc, sc->doutcfg + GPIO_RW_OFFSET(pin), reg); +} + static int jh7110_gpio_pin_set(device_t dev, uint32_t pin, uint32_t val) { struct jh7110_gpio_softc *sc; - uint32_t reg; sc = device_get_softc(dev); @@ -157,11 +173,7 @@ jh7110_gpio_pin_set(device_t dev, uint32_t pin, uint32_t val) return (EINVAL); JH7110_GPIO_LOCK(sc); - reg = RD4(sc, sc->doutcfg + GPIO_RW_OFFSET(pin)); - reg &= ~(DATA_OUT_MASK << GPIO_SHIFT(pin)); - if (val != 0) - reg |= 0x1 << GPIO_SHIFT(pin); - WR4(sc, sc->doutcfg + GPIO_RW_OFFSET(pin), reg); + jh7110_gpio_pin_set_locked(sc, pin, val); JH7110_GPIO_UNLOCK(sc); return (0); @@ -303,6 +315,13 @@ jh7110_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) WR4(sc, sc->iomuxcfg + PAD_OFFSET(pin), reg); } + /* Handle preset values. */ + if ((flags & GPIO_PIN_PRESET_LOW) != 0) { + jh7110_gpio_pin_set_locked(sc, pin, 0); + } else if ((flags & GPIO_PIN_PRESET_HIGH) != 0) { + jh7110_gpio_pin_set_locked(sc, pin, 1); + } + JH7110_GPIO_UNLOCK(sc); return (0);