From nobody Wed Mar 13 22:13:38 2024 X-Original-To: dev-commits-src-all@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 4Tw4Xg1jKLz5DX2s; Wed, 13 Mar 2024 22:13:39 +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 4Tw4Xf6bftz4qVw; Wed, 13 Mar 2024 22:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710368018; 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=mSrjkYM2Dek0hJ8uwmS2JVeZ9xZ3WGkSbkeOm3TkV3A=; b=SYic3FnRMrm8OrWiPpyiEw/eOWeDCWr14XAsga6n8LeMMhUoyWbfeNmijdS9OOFY+UaGZS vebpdjke/nI0Umqj7BpM8L2SDCZZArg703E6+laL3UPiYaZBVbV23kVvySh+8/lZXmzv+E c6i7J+Mk6Wzd01NYnKydYnYWM6TRNEM10GhDR51AMghWSADUJk9A4XjeMbML2rJPQKZZHt 1KhB9EIHQF7rUGxH+pF8Q3nfqm8v8kNfUg0/ahc4iHFXGE/JhsMQqigl/zQgPAgAq4sLSY LUiwQv/bgUG1pgfDOwmOnlfwUgEnpiPeicS+qKfCw+VMSG7GT3e7F/9MoOrA5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710368018; a=rsa-sha256; cv=none; b=ZblFFw2xEucOOipT5udQ1RpFa85kx6M4z1pifOy36WEKrCMPJfLD9YIKdXyon33E0U6MU5 DfM0krLdRiDmzc1z00nntDbzWLJ55zQGa8fKjjvcVa8BckMCQXZIX7i8+C/jpgAX677NEh UK2XFdU/W392EaM0JSImrN+LOpttgspQFLgv0qc0IjrMvnVXHEHo1pqLWk6dfM/2AQTnKz qwA557z3eSTeLgcNJOUesn/sHW0C4K42WL213ocHWR1CQpbOv3Fe0+JqNttkdcbUVmrc+A fK6Agrxb96yArYCFBFpTENbmv57CuZk4dS7hDBqvJM3J1stQVWKsqsFsVQ0DXg== 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=1710368018; 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=mSrjkYM2Dek0hJ8uwmS2JVeZ9xZ3WGkSbkeOm3TkV3A=; b=OvsS7+ctq+Qf055Q60eHh9g8lgVegwOHZiWlSRVHoMu3q3B0HZqlV2RWYJMsGg50YN7zqH FS9MuMjGIaNcBGHK5ngCQyj19c57oXnU6FpLiGbAyMToZ+Ck2FwRJX4OdMrUHvDumjqdU1 Zm0PSN8sfqwhRwhbQaTzSppdxAEphXPxl01fd71lM2QM8t0/fAp1LWJ5LvMlMdobPGkPUn cme34YUfR5WQzpnOPptaLwRp/0MuIH1dYMHlQRd9DxJyklk2888/+qNeedMLTpDjHtmoyl bsXfPvyB/Z5CO7+EEsGdWCklFd5BGatknblYA8oRbVGtMetuNErI7EDNh2rl5A== 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 4Tw4Xf69Q0z11hm; Wed, 13 Mar 2024 22:13:38 +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 42DMDcTl074987; Wed, 13 Mar 2024 22:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DMDcJZ074984; Wed, 13 Mar 2024 22:13:38 GMT (envelope-from git) Date: Wed, 13 Mar 2024 22:13:38 GMT Message-Id: <202403132213.42DMDcJZ074984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 582b84cd252d - main - pcib: Use rman_get_type in internal functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 582b84cd252d56f06556134b1103da3a0425fdbd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=582b84cd252d56f06556134b1103da3a0425fdbd commit 582b84cd252d56f06556134b1103da3a0425fdbd Author: John Baldwin AuthorDate: 2024-03-13 22:05:54 +0000 Commit: John Baldwin CommitDate: 2024-03-13 22:05:54 +0000 pcib: Use rman_get_type in internal functions Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44127 --- sys/dev/pci/pci_pci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 68eab2a6633b..da09a917b9bc 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -164,9 +164,9 @@ SYSCTL_INT(_hw_pci, OID_AUTO, clear_pcib, CTLFLAG_RDTUN, &pci_clear_pcib, 0, * sub-allocated from one of our window resource managers. */ static struct pcib_window * -pcib_get_resource_window(struct pcib_softc *sc, int type, struct resource *r) +pcib_get_resource_window(struct pcib_softc *sc, struct resource *r) { - switch (type) { + switch (rman_get_type(r)) { case SYS_RES_IOPORT: if (rman_is_region_manager(r, &sc->io.rman)) return (&sc->io); @@ -188,14 +188,14 @@ pcib_get_resource_window(struct pcib_softc *sc, int type, struct resource *r) * resource managers? */ static int -pcib_is_resource_managed(struct pcib_softc *sc, int type, struct resource *r) +pcib_is_resource_managed(struct pcib_softc *sc, struct resource *r) { #ifdef PCI_RES_BUS - if (type == PCI_RES_BUS) + if (rman_get_type(r) == PCI_RES_BUS) return (rman_is_region_manager(r, &sc->bus.rman)); #endif - return (pcib_get_resource_window(sc, type, r) != NULL); + return (pcib_get_resource_window(sc, r) != NULL); } static int @@ -2386,7 +2386,7 @@ pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, * If the resource wasn't sub-allocated from one of our region * managers then just pass the request up. */ - if (!pcib_is_resource_managed(sc, type, r)) + if (!pcib_is_resource_managed(sc, r)) return (bus_generic_adjust_resource(bus, child, type, r, start, end)); @@ -2411,7 +2411,7 @@ pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, * Resource is managed and not a secondary bus number, must * be from one of our windows. */ - w = pcib_get_resource_window(sc, type, r); + w = pcib_get_resource_window(sc, r); KASSERT(w != NULL, ("%s: no window for resource (%#jx-%#jx) type %d", __func__, rman_get_start(r), rman_get_end(r), type)); @@ -2447,7 +2447,7 @@ pcib_release_resource(device_t dev, device_t child, int type, int rid, int error; sc = device_get_softc(dev); - if (pcib_is_resource_managed(sc, type, r)) { + if (pcib_is_resource_managed(sc, r)) { if (rman_get_flags(r) & RF_ACTIVE) { error = bus_deactivate_resource(child, type, rid, r); if (error) @@ -2466,7 +2466,7 @@ pcib_activate_resource(device_t dev, device_t child, int type, int rid, struct resource_map map; int error; - if (!pcib_is_resource_managed(sc, type, r)) + if (!pcib_is_resource_managed(sc, r)) return (bus_generic_activate_resource(dev, child, type, rid, r)); @@ -2495,7 +2495,7 @@ pcib_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource_map map; int error; - if (!pcib_is_resource_managed(sc, type, r)) + if (!pcib_is_resource_managed(sc, r)) return (bus_generic_deactivate_resource(dev, child, type, rid, r)); @@ -2533,7 +2533,7 @@ pcib_map_resource(device_t dev, device_t child, int type, struct resource *r, rman_res_t length, start; int error; - w = pcib_get_resource_window(sc, type, r); + w = pcib_get_resource_window(sc, r); if (w == NULL) return (bus_generic_map_resource(dev, child, type, r, argsp, map)); @@ -2563,7 +2563,7 @@ pcib_unmap_resource(device_t dev, device_t child, int type, struct resource *r, struct pcib_softc *sc = device_get_softc(dev); struct pcib_window *w; - w = pcib_get_resource_window(sc, type, r); + w = pcib_get_resource_window(sc, r); if (w != NULL) { r = pcib_find_parent_resource(w, r); if (r == NULL)