From nobody Wed Jan 3 22:02:47 2024 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 4T53cS18gDz56nsq; Wed, 3 Jan 2024 22:02:48 +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 4T53cR6ndtz4YWx; Wed, 3 Jan 2024 22:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704319367; 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=QBvmykGuZmoIYZL1z7kx0HVH3AcP52L0dIw0NUWd+/U=; b=ylJBkyVGOR0sAEmyg7Xe1rFnFEYEtLhqoUy5HBP0pettVWYWBGo54hjgoZHZXq0Tjrx/9u m3fEYbrMi9+ijhMeCvIXPCTs1jxRWh8jgamdvFG5ZWBUDIcJ2zquqYX6iGXxiERdW2l4A+ sv9ajWGDmuHuQ6gU6XbIkH874bB56Ic6ttSpvmekTNK8APE7X3DL4sTOiC5K1EpowaewXj ZjC1VWenI1yyUOIbzwedQG+pnsOIQtZRItfBfgruOGEv8F/uWrUXtNLubt7nyVE5cZpQGK 0wyRqfHX2E3qDUfB0cY5p7M5AQHxTF/ZcuWE4pBV+VJKHh9m6Fz69tKqAyKvfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704319367; 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=QBvmykGuZmoIYZL1z7kx0HVH3AcP52L0dIw0NUWd+/U=; b=YZu6Aq5GvMSCyIBLxQ7FwI1U8Joukj41/qVxW+xuISn9Qk0L9mVSQA27XHJLD32CUubCvG a9CKGTyl2KFuHipq6REAgWdM1BrsOge+JpZTNc0U/I5RUJpc3yzP64dZ/LogvaKib3LVa8 vhglk/ZT3lG1buNv+3q0bPQtImsc9kcZKJ+oK1XeLomhkMnHrqlFI6Ys2kKx4iBnxzct9A 7CG2nmVZlmpzFSZfac/tnNjLhcZsgRnwejzLDDBwjrY5lrHez0kloc2KXClHIgP21VP3fW pTtA6GMa3m/wGLYBHClgv1No4w7LSOhKv0LRIK9womgYHuYF5x8j3vAtxdmAkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704319368; a=rsa-sha256; cv=none; b=S//50PyNGxwA60XEpOU1pFJxHtl28fLLhdLXg7ccJyzagxGFcSQpU+l5vm0LQxIatrj/8y PL6BHuw0OvN8VQ2UFu9EGHvfupgoloO3EH2EGVpdVLujpP1wtG52ECbw65ML18YgrI/Y2B p+LGqebniTBE3cLXOEtTBHRxhbTm2ofMRBLVyaVbAH0H/XlRsMRx5WHTvr9Ij9YIv5/vfr s/y9Lonf2yiisi8kdJmq1zsT1ODqK8PN2IY4ZCmmj/F7LpOQkHwZcDR3xzMhR3Y9hOfl+s 0eWBp7Vcqr/AdqG+Hjd5QOasoGGv0if3waOns4gZ62929ydY541B+A0bzE40yg== 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 4T53cR5nzdz12Xj; Wed, 3 Jan 2024 22:02:47 +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 403M2l83072720; Wed, 3 Jan 2024 22:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403M2l5t072717; Wed, 3 Jan 2024 22:02:47 GMT (envelope-from git) Date: Wed, 3 Jan 2024 22:02:47 GMT Message-Id: <202401032202.403M2l5t072717@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: 25d378703a1b - stable/14 - aarch64 nexus: Use bus_generic_rman_*_resource 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 25d378703a1b5349784e9d77fbbb8b6cf6f430c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=25d378703a1b5349784e9d77fbbb8b6cf6f430c5 commit 25d378703a1b5349784e9d77fbbb8b6cf6f430c5 Author: John Baldwin AuthorDate: 2023-11-24 17:28:19 +0000 Commit: John Baldwin CommitDate: 2024-01-03 20:48:28 +0000 aarch64 nexus: Use bus_generic_rman_*_resource Custom activate/deactivate_resource methods are still needed to handle IRQ resources. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42741 (cherry picked from commit 658501d25930bcf24839f3308ee1da971145c018) --- sys/arm64/arm64/nexus.c | 123 +++++++++++++++--------------------------------- 1 file changed, 37 insertions(+), 86 deletions(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 5bd9b15dde2c..f97bf635446e 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -106,12 +106,11 @@ static bus_add_child_t nexus_add_child; static bus_print_child_t nexus_print_child; static bus_activate_resource_t nexus_activate_resource; -static bus_adjust_resource_t nexus_adjust_resource; static bus_alloc_resource_t nexus_alloc_resource; static bus_deactivate_resource_t nexus_deactivate_resource; static bus_get_resource_list_t nexus_get_reslist; +static bus_get_rman_t nexus_get_rman; static bus_map_resource_t nexus_map_resource; -static bus_release_resource_t nexus_release_resource; static bus_unmap_resource_t nexus_unmap_resource; #ifdef SMP @@ -133,12 +132,13 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_activate_resource, nexus_activate_resource), - DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_rman_adjust_resource), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), + DEVMETHOD(bus_get_rman, nexus_get_rman), DEVMETHOD(bus_map_resource, nexus_map_resource), - DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), #ifdef SMP @@ -213,6 +213,21 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) return (child); } +static struct rman * +nexus_get_rman(device_t bus, int type, u_int flags) +{ + + switch (type) { + case SYS_RES_IRQ: + return (&irq_rman); + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (&mem_rman); + default: + return (NULL); + } +} + /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -222,10 +237,7 @@ nexus_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 nexus_device *ndev = DEVTONX(child); - struct resource *rv; struct resource_list_entry *rle; - struct rman *rm; - int needactivate = flags & RF_ACTIVE; /* * If this is an allocation of the "default" range for a given @@ -244,70 +256,8 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, count = rle->count; } - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; - - case SYS_RES_MEMORY: - case SYS_RES_IOPORT: - rm = &mem_rman; - break; - - default: - return (NULL); - } - - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) - return (NULL); - - rman_set_rid(rv, *rid); - rman_set_bushandle(rv, rman_get_start(rv)); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv)) { - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); -} - -static int -nexus_adjust_resource(device_t bus __unused, device_t child __unused, int type, - struct resource *r, rman_res_t start, rman_res_t end) -{ - struct rman *rm; - - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; - case SYS_RES_MEMORY: - rm = &mem_rman; - break; - default: - return (EINVAL); - } - if (rman_is_region_manager(r, rm) == 0) - return (EINVAL); - return (rman_adjust_resource(r, start, end)); -} - -static int -nexus_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) -{ - int error; - - if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); - if (error) - return (error); - } - return (rman_release_resource(res)); + return (bus_generic_rman_alloc_resource(bus, child, type, rid, start, + end, count, flags)); } static int @@ -415,8 +365,10 @@ nexus_activate_resource_flags(device_t bus, device_t child, int type, int rid, rman_deactivate_resource(r); return (err); } + return (0); + default: + return (EINVAL); } - return (0); } static int @@ -438,23 +390,22 @@ static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - bus_size_t psize; - bus_space_handle_t vaddr; - - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - psize = (bus_size_t)rman_get_size(r); - vaddr = rman_get_bushandle(r); + int error; - if (vaddr != 0) { - bus_space_unmap(&memmap_bus, vaddr, psize); - rman_set_virtual(r, NULL); - rman_set_bushandle(r, 0); - } - } else if (type == SYS_RES_IRQ) { + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, r)); + case SYS_RES_IRQ: + error = rman_deactivate_resource(r); + if (error) + return (error); intr_deactivate_irq(child, r); + return (0); + default: + return (EINVAL); } - - return (rman_deactivate_resource(r)); } static int