From nobody Thu Feb 27 14:17:21 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 4Z3YM611Gpz5qGJt; Thu, 27 Feb 2025 14:17:22 +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 4Z3YM60Ll6z3xDP; Thu, 27 Feb 2025 14:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665842; 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=S4f7jbzMihCOcRKyXBeUQFSFbgy1W4gEEjWprnOBXYo=; b=VbEd7ZbX8yL+u26Xj2O9mlCS5bxGpFnZBP/jBHJie1XwU3DbvikR7WgpO3GMKa5H7oK9Cf fqbBm6WRuOc99dWSDPPNw/qljNmbghkaAwBK/la60yjjv8TiIsavmTVZp0m+B8p14hGcYV DeQmC0lg3i9FtM5vGvAmfx6xu5HZ5eHdYLcj9+6IV0Si/OSPy1WcOQOiK7GMyfNtLxBAdm DTLNeZvUTmolBLEi0tCJbqlIJjJ/SodXp6iNbeTwC0yiwV2W+m1pru/4TcA34atz1ewRT4 oNvY1ikseJB5GQIb5mOGjkKq/D8HxBHNto9nMLJe1bORaEP5g9ixleP/gl4JuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665842; a=rsa-sha256; cv=none; b=e+ks2Y/Sf61jPmFgyqr/5UFDjVBlGs82H99Yz6sjq7+XM2MsG+ZvL7ubTJgaOnDrleEfjN YqV+z8CSKaDqWVDbMX3xiSnEVy74D1ouPKWQRTzMsxKEksh0Isg8ufVOXURagp2XQ3iLvF xpSXegMkFj+jKW1fLT24Jpvcl5g859tcrKbYPUvDZz4sKu3B9zT9gzc2eAmXeMe4cOQGCQ Lixase8bFO0MJVTD2htyYLM8xkEcO1cHWu9nq0vOtx9J7o+et3Hx4G1CoUMzfIiaQQbYXj QXoTTkVAWjAVLTShoQUKsaV1TOWg+oPoi3mNaWgWnh3M54F4wWlZSRS0rfiTEQ== 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=1740665842; 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=S4f7jbzMihCOcRKyXBeUQFSFbgy1W4gEEjWprnOBXYo=; b=IbE2xlaliHTvbmRCzIOtzyH30p/ouk419MetGGCODXu9cnKWJizTqZBH6grjoAwCUldcDr 0HHrT51aso6J1EY1E1pePiXtM7FRLOcA57EU+S/SCoKrygELRDHhwPW2Ewcqu0wClfksdL NlvxatDdPVwPXhxfrtuXg6NaTeg/IZ4zlAWoXJgbSaiAOrY0yFStczLfjpDWOFK5NdfFGs 0wiaf40aJa55D699ifVivBfo1037R+Nc16OGLryJeLqQgxwkg01sNMM71ThCw/XrBVI5Sq CdLrKFc33kanyXJ/D9q1LJlmNhsMmMaUbn2Qf/jt0sYP44YO3wOmFYtvF6tNEQ== 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 4Z3YM56vm3zmf0; Thu, 27 Feb 2025 14:17:21 +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 51REHLWm017222; Thu, 27 Feb 2025 14:17:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHLj1017219; Thu, 27 Feb 2025 14:17:21 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:21 GMT Message-Id: <202502271417.51REHLj1017219@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: 6343760d7405 - stable/14 - bhnd: Use rman_get_type in bhndb_find_resource_limits 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: 6343760d74050b27eb84dc7c3712837361661a1d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6343760d74050b27eb84dc7c3712837361661a1d commit 6343760d74050b27eb84dc7c3712837361661a1d Author: John Baldwin AuthorDate: 2024-03-13 22:05:53 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:23 +0000 bhnd: Use rman_get_type in bhndb_find_resource_limits Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44126 (cherry picked from commit 3351964c5e5d29ef93b3f26b7fc31a4972aa9af7) --- sys/dev/bhnd/bhndb/bhndb.c | 2 +- sys/dev/bhnd/bhndb/bhndb_private.h | 2 +- sys/dev/bhnd/bhndb/bhndb_subr.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/bhnd/bhndb/bhndb.c b/sys/dev/bhnd/bhndb/bhndb.c index 978ad9c3e62b..ea5230bf459b 100644 --- a/sys/dev/bhnd/bhndb/bhndb.c +++ b/sys/dev/bhnd/bhndb/bhndb.c @@ -1113,7 +1113,7 @@ bhndb_adjust_resource(device_t dev, device_t child, int type, goto done; /* Otherwise, the range is limited by the bridged resource mapping */ - error = bhndb_find_resource_limits(sc->bus_res, type, r, &mstart, + error = bhndb_find_resource_limits(sc->bus_res, r, &mstart, &mend); if (error) goto done; diff --git a/sys/dev/bhnd/bhndb/bhndb_private.h b/sys/dev/bhnd/bhndb/bhndb_private.h index 851cbe82d3a7..7b56f0b05c84 100644 --- a/sys/dev/bhnd/bhndb/bhndb_private.h +++ b/sys/dev/bhnd/bhndb/bhndb_private.h @@ -73,7 +73,7 @@ int bhndb_add_resource_region( const struct bhndb_regwin *static_regwin); int bhndb_find_resource_limits( - struct bhndb_resources *br, int type, + struct bhndb_resources *br, struct resource *r, rman_res_t *start, rman_res_t *end); diff --git a/sys/dev/bhnd/bhndb/bhndb_subr.c b/sys/dev/bhnd/bhndb/bhndb_subr.c index 94d415d67064..b695785a4f7a 100644 --- a/sys/dev/bhnd/bhndb/bhndb_subr.c +++ b/sys/dev/bhnd/bhndb/bhndb_subr.c @@ -988,7 +988,6 @@ bhndb_find_intr_handler(struct bhndb_resources *br, void *cookiep) * returned. * * @param br The resource state to search. - * @param type The resource type (see SYS_RES_*). * @param r The resource to search for in @p br. * @param[out] start On success, the minimum supported start address. * @param[out] end On success, the maximum supported end address. @@ -997,14 +996,14 @@ bhndb_find_intr_handler(struct bhndb_resources *br, void *cookiep) * @retval ENOENT no active mapping found for @p r of @p type */ int -bhndb_find_resource_limits(struct bhndb_resources *br, int type, +bhndb_find_resource_limits(struct bhndb_resources *br, struct resource *r, rman_res_t *start, rman_res_t *end) { struct bhndb_dw_alloc *dynamic; struct bhndb_region *sregion; struct bhndb_intr_handler *ih; - switch (type) { + switch (rman_get_type(r)) { case SYS_RES_IRQ: /* Is this one of ours? */ STAILQ_FOREACH(ih, &br->bus_intrs, ih_link) { @@ -1043,7 +1042,8 @@ bhndb_find_resource_limits(struct bhndb_resources *br, int type, } default: - device_printf(br->dev, "unknown resource type: %d\n", type); + device_printf(br->dev, "unknown resource type: %d\n", + rman_get_type(r)); return (ENOENT); } }