From nobody Fri Sep 5 18:42:37 2025 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 4cJQFT3Bchz66DbR; Fri, 05 Sep 2025 18:42:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQFT1pClz4P9L; Fri, 05 Sep 2025 18:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097757; 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=GPpVr8iO53riMa9xxWcEI/CKCZIeArpXRttq31INOD4=; b=xZvMF3nHyl1t4FzGrQUTH/N+vWH7FIIr8/Diz+IdQlN1+zMt2JQfE7PeGPbQ0yJAZfW76j ZTVui5168UWpxWc8fsok1M4XM0mNV0BvOctXiBQqrwMMGto4J4AfI45d9equRWaA/vvsT2 434Op4QmpMhEHTQiPTTt7jW5Pu1TAuujDWAi7913YbYtDSsZDZRyQs6hqGiKJOXWckWtIE 7x1+uKn9cnYgW7Cchr57kiBR6eZgl3HZHjTRqSB1OqxuEmfhnS627G8xnuM3VxedIcENV9 btOgc4kkQ7mSDD71p9VWQuYFMBVT0EsJpaeBBa7bdllMs+bcljaM41TQtBERUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097757; 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=GPpVr8iO53riMa9xxWcEI/CKCZIeArpXRttq31INOD4=; b=eh+OxLK42QyAnKBMh13YD4WywLEdI/SFvw9Y/yliUZ6Aap9PV/oSB+rF3+S/YPtg2HTjsm pd2gAhGfjZ5RE7x8FhD5JuuYHXnlkHTnDBQPmQI1AkvAiiFYVrvs3DRT1+wpvQgrNtovpb pA0GSotbJsN9pOnjI4wRIrarqBHcGIRsBkBcNBNuBHeArRDgpukdyk+PfmVsPhjWPGew58 4vGdBLdPdcDFHcrAab3g+HI2J1K7UuxAC0wVYB6eORGnDpoXzS8S08mHt2EP20qPoB2x6+ SlxjJCtdz3ehHm2ttevUDxQPCOhkXJXRPbioMGLk37POmjhzeLFQZXXnUs2MvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097757; a=rsa-sha256; cv=none; b=Td1T5z4aViUwt0E83GzoqLoDvFsBwz3Xy49KsqVnzhbVYTDQGAmX1XYTIlwuYowDg9fnZE DT1BgTBOwy1Xye1VhBKeqnfvI5YbFiHLS1NVVYsXFpTjx4fDmjZYr41pCBF+gvuLu1bqXD sYVxymyLCo2dtaBEijjMXRydc08c3isiGnF6rY0hVNG8njPruVV49PhYr35xsLK6P6JCgH D/9yzD3m4etXJcxj/DGVnl9Mdd1EJtA1FRTziAEo7r0pFhBGdjjhJDOb5V7gUyMQ+GqrQf 1fpC+hvE9aOZ9hixlpSy49XI89zpXxm8E8abENSr0aqm1DTtEvEQbsTM5XodEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJQFT18ztz11JC; Fri, 05 Sep 2025 18:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585Igbe8096823; Fri, 5 Sep 2025 18:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgbnM096820; Fri, 5 Sep 2025 18:42:37 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:37 GMT Message-Id: <202509051842.585IgbnM096820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9ae3c3010a0d - main - gpioled: use hw pin inversion if available 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ae3c3010a0deb80eb96b1184734904ed61fecef Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9ae3c3010a0deb80eb96b1184734904ed61fecef commit 9ae3c3010a0deb80eb96b1184734904ed61fecef Author: Stéphane Rochoy AuthorDate: 2025-08-12 09:28:49 +0000 Commit: Warner Losh CommitDate: 2025-09-05 18:42:23 +0000 gpioled: use hw pin inversion if available Add hint.gpioled.%d.invmode to allow setting the pin inversion method. Accept the following values: - auto Use hardware pin inversion if available, else fallback to software pin inversion. - hw Use hardware pin inversion. - sw Use software pin inversion. Default is auto. This hint is ignored when no pin inversion is requested (hint.gpioled.%d.invert=0). Signed-off-by: Stéphane Rochoy Sponsored-by: Stormshield Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1805 --- sys/dev/gpio/gpioled.c | 108 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 91 insertions(+), 17 deletions(-) diff --git a/sys/dev/gpio/gpioled.c b/sys/dev/gpio/gpioled.c index ba53cb733971..71af5741b2fe 100644 --- a/sys/dev/gpio/gpioled.c +++ b/sys/dev/gpio/gpioled.c @@ -55,13 +55,13 @@ device_get_nameunit((_sc)->sc_dev), "gpioled", MTX_DEF) #define GPIOLED_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) -struct gpioled_softc +struct gpioled_softc { device_t sc_dev; device_t sc_busdev; struct mtx sc_mtx; struct cdev *sc_leddev; - int sc_invert; + int sc_softinvert; }; static void gpioled_control(void *, int); @@ -69,20 +69,19 @@ static int gpioled_probe(device_t); static int gpioled_attach(device_t); static int gpioled_detach(device_t); -static void +static void gpioled_control(void *priv, int onoff) { struct gpioled_softc *sc; sc = (struct gpioled_softc *)priv; + if (onoff == -1) /* Keep the current state. */ + return; + if (sc->sc_softinvert) + onoff = !onoff; GPIOLED_LOCK(sc); - if (GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, - GPIO_PIN_OUTPUT) == 0) { - if (sc->sc_invert) - onoff = !onoff; - GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, - onoff ? GPIO_PIN_HIGH : GPIO_PIN_LOW); - } + GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, + onoff ? GPIO_PIN_HIGH : GPIO_PIN_LOW); GPIOLED_UNLOCK(sc); } @@ -94,27 +93,102 @@ gpioled_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +static int +gpioled_inv(device_t dev, uint32_t *pin_flags) +{ + struct gpioled_softc *sc; + int invert; + uint32_t pin_caps; + + sc = device_get_softc(dev); + + if (resource_int_value(device_get_name(dev), + device_get_unit(dev), "invert", &invert)) + invert = 0; + + if (GPIOBUS_PIN_GETCAPS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, + &pin_caps) != 0) { + if (bootverbose) + device_printf(sc->sc_dev, "unable to get pin caps\n"); + return (-1); + } + if (pin_caps & GPIO_PIN_INVOUT) + *pin_flags &= ~GPIO_PIN_INVOUT; + sc->sc_softinvert = 0; + if (invert) { + const char *invmode; + + if (resource_string_value(device_get_name(dev), + device_get_unit(dev), "invmode", &invmode)) + invmode = NULL; + + if (invmode) { + if (!strcmp(invmode, "sw")) + sc->sc_softinvert = 1; + else if (!strcmp(invmode, "hw")) { + if (pin_caps & GPIO_PIN_INVOUT) + *pin_flags |= GPIO_PIN_INVOUT; + else { + device_printf(sc->sc_dev, "hardware pin inversion not supported\n"); + return (-1); + } + } else { + if (strcmp(invmode, "auto") != 0) + device_printf(sc->sc_dev, "invalid pin inversion mode\n"); + invmode = NULL; + } + } + /* + * auto inversion mode: use hardware support if available, else fallback to + * software emulation. + */ + if (invmode == NULL) { + if (pin_caps & GPIO_PIN_INVOUT) + *pin_flags |= GPIO_PIN_INVOUT; + else + sc->sc_softinvert = 1; + } + } + MPASS(!invert || + (((*pin_flags & GPIO_PIN_INVOUT) != 0) && !sc->sc_softinvert) || + (((*pin_flags & GPIO_PIN_INVOUT) == 0) && sc->sc_softinvert)); + return (invert); +} + static int gpioled_attach(device_t dev) { struct gpioled_softc *sc; int state; const char *name; + uint32_t pin_flags; + int invert; sc = device_get_softc(dev); sc->sc_dev = dev; sc->sc_busdev = device_get_parent(dev); GPIOLED_LOCK_INIT(sc); - state = 0; - - if (resource_string_value(device_get_name(dev), + if (resource_string_value(device_get_name(dev), device_get_unit(dev), "name", &name)) name = NULL; - resource_int_value(device_get_name(dev), - device_get_unit(dev), "invert", &sc->sc_invert); - resource_int_value(device_get_name(dev), - device_get_unit(dev), "state", &state); + + if (resource_int_value(device_get_name(dev), + device_get_unit(dev), "state", &state)) + state = 0; + + pin_flags = GPIO_PIN_OUTPUT; + invert = gpioled_inv(dev, &pin_flags); + if (invert < 0) + return (ENXIO); + device_printf(sc->sc_dev, "state %d invert %s\n", + state, (invert ? (sc->sc_softinvert ? "sw" : "hw") : "no")); + if (GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, + pin_flags) != 0) { + if (bootverbose) + device_printf(sc->sc_dev, "unable to set pin flags, %#x\n", pin_flags); + return (ENXIO); + } sc->sc_leddev = led_create_state(gpioled_control, sc, name ? name : device_get_nameunit(dev), state);