From nobody Thu Feb 27 14:16:51 2025 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 4Z3YLW4ftfz5qGJs; Thu, 27 Feb 2025 14:16:51 +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 4Z3YLW44f0z3xP4; Thu, 27 Feb 2025 14:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665811; 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=74q+D3gW5myxB2ffB4WItcGOkJaklBSZ72t1uxTyOjE=; b=rEEVZsebaNsxQOC3zcqRlFj/5t50u/MQNz7Y8tiXeQyZwCN3Zc00PVw4FQiixab3pcp4dU h8DisZYqYqRs7jnxVDDRMIGS4d3S07Jl4YEGvdFYfr/uVOUCPa3Nfyj4tOk7Vra9k+j6yf M0TD6NkAPhK8i+SFxImY1t195BYL4QZgjQwEN7RZzl8mSSjCb3cwft8ZdXihaF2/Z5I/9i PIgN7f5+TemmhG/hlZJqXe9H7ba3UvrUEZ6gEA3ID1TWkz+oY2nbxl79hsWzG8ezyGVmPT 70nb5xNlP7besCM+HsBDZYqA6cGwodmFvfp5LATf1EL4XnSvdPtGPZ+9qJQa2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665811; a=rsa-sha256; cv=none; b=vM4gmnFfaj4nEU6XZQcE7ewkYOTrmkJ3Jk1ydI7PWLLUxFuDpTSFmXEtoW6eNvRf4gIEtT NQvJktdDg+pyg9mt9ov6L9Q3S975w+OcI30/Fz5jca+TzcICqFYZKW4pybrfEOcgGrVI1e HTxWNsotxw5ZBk+xvMeSTd7Fu0FfT1NusoOQY67lEjOzrousckc9h620RycBxPTvNx0nfV AnvCbulC1MhU0ghSs97K/0MWnr2OzeNlVVngDhfOMb5auvtBg1BU/3YlCYo6qQgvDBFRcR ygzqCrjMUX61bU8Sy47GYJNlqnwe8TUgyIHgSNZ9t73A9QD296rSRLFugQeiaA== 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=1740665811; 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=74q+D3gW5myxB2ffB4WItcGOkJaklBSZ72t1uxTyOjE=; b=JlS0M64iiUIjlrUNKE9aIPHTHx+g0XdX8eMgH9UYFwlMcfmX6iA35xJtQenquz8k6OzwD6 yaRet4WO5tq9EGmz7DRor5wNmmtRUHc57wJ5ZEeXkiqKtkW0ggKDall6x4cQcZeYo/XR/5 a5jCeHSqGI65BWWZrNfHYIpFs6D/KDuSHdNwtvnj9ShEynG2H7TYtIFIWh62Tmthze7sxh 5/QeW4NTMQA2HekBCpNkmc7B/KCxRWZq/jcWue0trJflwOT5CEVJECkzpNNqTBWSIy8wIs 4c/M3I52yTMSMuMkp0Ci3qgn9rBLQ6ffG81QVZYXvGcRYz6yAHhYQ6Fystig/Q== 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 4Z3YLW3gjXzmpY; Thu, 27 Feb 2025 14:16:51 +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 51REGpfR016275; Thu, 27 Feb 2025 14:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REGpQ8016272; Thu, 27 Feb 2025 14:16:51 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:16:51 GMT Message-Id: <202502271416.51REGpQ8016272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a818e65ec2bd - stable/14 - gpiobus: Use bus_generic_rman_* 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a818e65ec2bda220f163c3a041710ef1533918b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a818e65ec2bda220f163c3a041710ef1533918b9 commit a818e65ec2bda220f163c3a041710ef1533918b9 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:21 +0000 gpiobus: Use bus_generic_rman_* Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43887 (cherry picked from commit 5bda26333a8ebf34190e3a9124895e6a18e58e93) --- sys/dev/gpio/gpiobus.c | 57 +++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index db18703606aa..18129c32133d 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -805,20 +805,29 @@ gpiobus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) return (0); } +static struct rman * +gpiobus_get_rman(device_t bus, int type, u_int flags) +{ + struct gpiobus_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_IRQ: + return (&sc->sc_intr_rman); + default: + return (NULL); + } +} + static struct resource * gpiobus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct gpiobus_softc *sc; - struct resource *rv; struct resource_list *rl; struct resource_list_entry *rle; int isdefault; - if (type != SYS_RES_IRQ) - return (NULL); isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1); - rle = NULL; if (isdefault) { rl = BUS_GET_RESOURCE_LIST(bus, child); if (rl == NULL) @@ -826,40 +835,12 @@ gpiobus_alloc_resource(device_t bus, device_t child, int type, int *rid, rle = resource_list_find(rl, type, *rid); if (rle == NULL) return (NULL); - if (rle->res != NULL) - panic("%s: resource entry is busy", __func__); start = rle->start; count = rle->count; end = rle->end; } - sc = device_get_softc(bus); - rv = rman_reserve_resource(&sc->sc_intr_rman, start, end, count, flags, - child); - if (rv == NULL) - return (NULL); - rman_set_rid(rv, *rid); - if ((flags & RF_ACTIVE) != 0 && - bus_activate_resource(child, type, *rid, rv) != 0) { - rman_release_resource(rv); - return (NULL); - } - - return (rv); -} - -static int -gpiobus_release_resource(device_t bus __unused, device_t child, int type, - int rid, struct resource *r) -{ - int error; - - if (rman_get_flags(r) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, r); - if (error) - return (error); - } - - return (rman_release_resource(r)); + return (bus_generic_rman_alloc_resource(bus, child, type, rid, start, + end, count, flags)); } static struct resource_list * @@ -1056,9 +1037,9 @@ static device_method_t gpiobus_methods[] = { DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_alloc_resource, gpiobus_alloc_resource), - DEVMETHOD(bus_release_resource, gpiobus_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_rman_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_rman_deactivate_resource), DEVMETHOD(bus_get_resource_list, gpiobus_get_resource_list), DEVMETHOD(bus_add_child, gpiobus_add_child), DEVMETHOD(bus_child_deleted, gpiobus_child_deleted),