From nobody Mon Apr 21 16:28:31 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 4Zh9m01RFfz5sj5p; Mon, 21 Apr 2025 16:28:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zh9lz1dvSz3g2c; Mon, 21 Apr 2025 16:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745252911; 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=Kll6us8Dn5hogffnX+fQuUPFu5+jscya0oFgTPe62iE=; b=Js2uKbm1u26tpCAmIdznwk3H0XCn/PyQ97bsZAai6tohfvW9qVsOvBR33GK18+8ue6PiNp MR9nq+Ugz0pPc4qlNWlGM5IF6jBVqX+B6cHv2f00+Ikj5BcmZMMyS7L/eUNTQqd0IszoH9 0Oevp979MbUoHgzO2yRWqo9Jw3mffE4IE5TgU0p22BAQkK8fVe5vv0o6v4jNlQ+anAHoaw 40neNeEkjR3c3oZKpihVcuXTqImyiZv2Av7BhPNFjmt70NJQlpulzBoF/oGlyOfDlOo24m 4bYA+u4gTo50xNwTMy5YzNU75mE7I+Yphb4vJlp+TcxgweYbNNuWXlY27PIlUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745252911; a=rsa-sha256; cv=none; b=ocTdp6tW3Hs5rZYm4DnR99OLTYDF4cz6wS5rv5zHW+LMfgeErhlzhREexEFWZLUFXEeC82 VTzGAuI9QzKLccMHtt7+6Z+e+yJLS7LK1BMWCfzgPS6xho/nQt9Yj5iSoSEzqHd9NOG08y 3/pw1Ec+gL2YigHNXRYqp3zEwyI3iZWY/M+GySBQV1d5hYTlHCwi/Fjyn5JTSwDcBBq9mM t+AzLg/y6iAYn1C6dI+ryk34stwfAX0yiaCNAYkbj5TnKkH9wr4Vjp+LFSNIuYezFRVxF1 lNTk0sBmhsroXNHV+y4k0fwE5ieZncaLivYYjsETpoHYrHchj1BOpDZzKa2Mkw== 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=1745252911; 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=Kll6us8Dn5hogffnX+fQuUPFu5+jscya0oFgTPe62iE=; b=BYFtc5bprTbFMgX1Qp1nr6BIPH6CVV37Q7VedPyTGwsKo2ikEAdX2UlfxSyyqnq4+SVtYR yYLo8b0o3p0e72yyYJNm9+m+CNuUUcz5JZ/QL3b1qeyRf0SFfuDkCyN+y5MY63JexGd8mh FkwlceqiTJG5CVzIYs0aRt/EIryk7jv6g5JxbDWtuYLaV28M+EYctQNjKL3zuc2/hiz4ir 9z2LB2oxvxrjkfFvCSVh1g6ifJM+ShsHWYmWsHlwz0GIeidM3FiNGXSsekbdNKhp3Dr0tj HNrPLmySWCS9zGspfRfxShNSWvsQjeqWvipDw0zIPHgaNP91ommNKLWwLwVOcg== 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 4Zh9lz1F6yzxS5; Mon, 21 Apr 2025 16:28:31 +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 53LGSV7Y089690; Mon, 21 Apr 2025 16:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LGSV45089687; Mon, 21 Apr 2025 16:28:31 GMT (envelope-from git) Date: Mon, 21 Apr 2025 16:28:31 GMT Message-Id: <202504211628.53LGSV45089687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: da94bc915a14 - main - gpio: don't misuse pin->flags 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da94bc915a142d3ca44dea6277db89f194f3f628 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=da94bc915a142d3ca44dea6277db89f194f3f628 commit da94bc915a142d3ca44dea6277db89f194f3f628 Author: Ahmad Khalifa AuthorDate: 2025-03-11 11:39:28 +0000 Commit: Ed Maste CommitDate: 2025-04-21 16:28:14 +0000 gpio: don't misuse pin->flags The flags member of gpio_pin_t was only meant for pin flags acquired via the FDT. Instead, make an accessor so gpioaei can still access the flags and remove the now unused gpio_pin_get_by_acpi_index. Reviewed-by: Warner Losh Pull-request: https://github.com/freebsd/freebsd-src/pull/1667 Signed-off-by: Ahmad Khalifa --- sys/dev/gpio/acpi_gpiobus.c | 20 +++----------------- sys/dev/gpio/acpi_gpiobusvar.h | 5 ++--- sys/dev/gpio/gpioaei.c | 9 ++++++--- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 935f4bb4569c..96faec5e6f02 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -380,23 +380,6 @@ acpi_gpiobus_detach(device_t dev) return (gpiobus_detach(dev)); } -int -gpio_pin_get_by_acpi_index(device_t consumer, uint32_t idx, - gpio_pin_t *out_pin) -{ - struct acpi_gpiobus_ivar *devi; - int rv; - - rv = gpio_pin_get_by_child_index(consumer, idx, out_pin); - if (rv != 0) - return (rv); - - devi = device_get_ivars(consumer); - (*out_pin)->flags = devi->flags; - - return (0); -} - static int acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { @@ -406,6 +389,9 @@ acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *resul case ACPI_GPIOBUS_IVAR_HANDLE: *result = (uintptr_t)devi->dev_handle; break; + case ACPI_GPIOBUS_IVAR_FLAGS: + *result = (uintptr_t)devi->flags; + break; default: return (gpiobus_read_ivar(dev, child, which, result)); } diff --git a/sys/dev/gpio/acpi_gpiobusvar.h b/sys/dev/gpio/acpi_gpiobusvar.h index 77cb91110cb5..f8d502eab9d1 100644 --- a/sys/dev/gpio/acpi_gpiobusvar.h +++ b/sys/dev/gpio/acpi_gpiobusvar.h @@ -34,16 +34,15 @@ enum acpi_gpiobus_ivars { ACPI_GPIOBUS_IVAR_HANDLE = 10600, + ACPI_GPIOBUS_IVAR_FLAGS, }; #define ACPI_GPIOBUS_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(acpi_gpiobus, var, ACPI_GPIOBUS, ivar, type) ACPI_GPIOBUS_ACCESSOR(handle, HANDLE, ACPI_HANDLE) +ACPI_GPIOBUS_ACCESSOR(flags, FLAGS, uint32_t) #undef ACPI_GPIOBUS_ACCESSOR -int gpio_pin_get_by_acpi_index(device_t consumer, uint32_t idx, - gpio_pin_t *out_pin); - #endif /* __ACPI_GPIOBUS_H__ */ diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index f43674b53c7d..6cbb5f1bb7ed 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -79,6 +79,7 @@ gpio_aei_attach(device_t dev) { struct gpio_aei_softc * sc = device_get_softc(dev); gpio_pin_t pin; + uint32_t flags; ACPI_HANDLE handle; int err; @@ -87,17 +88,19 @@ gpio_aei_attach(device_t dev) /* Store parameters needed by gpio_aei_intr. */ handle = acpi_gpiobus_get_handle(dev); - if (gpio_pin_get_by_acpi_index(dev, 0, &pin) != 0) { + if (gpio_pin_get_by_child_index(dev, 0, &pin) != 0) { device_printf(dev, "Unable to get the input pin\n"); return (ENXIO); } sc->type = ACPI_AEI_TYPE_UNKNOWN; sc->pin = pin->pin; + + flags = acpi_gpiobus_get_flags(dev); if (pin->pin <= 255) { char objname[5]; /* "_EXX" or "_LXX" */ sprintf(objname, "_%c%02X", - (pin->flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin->pin); + (flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin->pin); if (ACPI_SUCCESS(AcpiGetHandle(handle, objname, &sc->handle))) sc->type = ACPI_AEI_TYPE_ELX; } @@ -113,7 +116,7 @@ gpio_aei_attach(device_t dev) /* Set up the interrupt. */ if ((sc->intr_res = gpio_alloc_intr_resource(dev, &sc->intr_rid, - RF_ACTIVE, pin, pin->flags & GPIO_INTR_MASK)) == NULL) { + RF_ACTIVE, pin, flags & GPIO_INTR_MASK)) == NULL) { device_printf(dev, "Cannot allocate an IRQ\n"); return (ENOTSUP); }