From nobody Thu Feb 27 14:17:14 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 4Z3YLz2tvDz5qG2M; Thu, 27 Feb 2025 14:17:15 +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 4Z3YLz15GRz3xPb; Thu, 27 Feb 2025 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665835; 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=WtGqKK6Noe0LGu+K5LInQeyjSHnLo/fZqIXTq1aSnAA=; b=BiCdp45hANMsINouHWEFosjwen9KPnzBFVye+YOPcMRLuN9XMqEvfH+DMIKGWkDiJXj2sq EdHzPVtkREUZVSnYoiYxm6bNGHshrnulPoT2uODXDm+9X5pbvuywPzF/QiCpN4GB4Rz8I3 fsKQHzd5OIEovsCCuwFMCwlUduX+o33cZHFZQYL4ygX3Zhksj6v5c6o478Ijf8jOFROfbT 339tYuohr4ie+wu7NVyt7FZlMLcgUW0qBXtSml177BHVGGEa66Uqd9wvRvYpiJ5B+PMe6N JfogacaPSmqEX3zEl6Qumql17LAMA2XHwmrB2q61OxrCCPjE2Ltb6MzQW2ThDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665835; a=rsa-sha256; cv=none; b=RniANNx8LEscAfREUmGh0hG0cQE3u+dsFpIB13JdUs1Rd2xDJQRBCjN5VTMqJDlbtQCuD6 fEYXWCfSg3tv0IEe0XHdMAkwe1raS6zo63NPpozEkW+c7qLYwWWB/mIP+dO9zH9/b2w4t9 9HMnFZuxpIDwcU83v7kRx61byzR481lHcWRbW49gqJyT1EX0ABpp1Qfu8jTWKOchYQsQXB cJyQ90cMwh7FXBCJbA+YkO1Js4zLSli1Jgrxek26sOGmGIuTl7SzjE10A7EANhA6qng0Y3 jiLq8I5uTjOcOuH2R1+81NS42HaW67KgJKcs6dyWARExFbah0gySShNB0+Lu6w== 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=1740665835; 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=WtGqKK6Noe0LGu+K5LInQeyjSHnLo/fZqIXTq1aSnAA=; b=RGMdu0ZlHbA8b+KyMZJzj86bo7yMfkIbcUxSmQePyTEXygOTVJwZRg5o8pxT7SVq53S70a 8+DOrLAPMcVzaB8BzpCXH7aXpRTDzWO0Jr1tIPsBQM/Hux/VfJ+gumm16JpSLWGPkZQsj7 syW/1ZCAddnOIp+/WvKwRxsWLP4w4wdxsJDInSYUodZdgdVB2Rv9mj+RPy7WSs3t3f3+de M182Mx79xGaLds1K7iOgTbcpRJCK2arvs0FnKZ+csXhTiB+ne8yaywpfaSbpZqC6ATqOYd weo0sk2tR1aIyWDLVGcj2qdRiUfR7M+s2urtVYHWGIUGf+EWqGFiOFuUoD9Ofw== 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 4Z3YLz0gs7zm7P; Thu, 27 Feb 2025 14:17:15 +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 51REHEBG017018; Thu, 27 Feb 2025 14:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHEDa017015; Thu, 27 Feb 2025 14:17:14 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:14 GMT Message-Id: <202502271417.51REHEDa017015@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: fff81f9d4e14 - stable/14 - pci_host_generic: Simplify generic_pcie_translate_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: 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: fff81f9d4e140e0ff03ff338f541d3f2c13982f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fff81f9d4e140e0ff03ff338f541d3f2c13982f6 commit fff81f9d4e140e0ff03ff338f541d3f2c13982f6 Author: John Baldwin AuthorDate: 2024-03-05 04:53:21 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 pci_host_generic: Simplify generic_pcie_translate_resource Inline generic_pcie_translate_resource_common into its sole caller. No functional change. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44206 (cherry picked from commit 291079d0ebdd078840ccb27aaa5d286e03e2e7e6) --- sys/dev/pci/pci_host_generic.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 0f85e23eb028..da49edcf91f5 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -504,8 +504,8 @@ generic_pcie_containing_range(device_t dev, int type, rman_res_t start, } static int -generic_pcie_translate_resource_common(device_t dev, int type, rman_res_t start, - rman_res_t end, rman_res_t *new_start, rman_res_t *new_end) +generic_pcie_translate_resource(device_t dev, int type, rman_res_t start, + rman_res_t *new_start) { struct pcie_range *range; @@ -513,34 +513,20 @@ generic_pcie_translate_resource_common(device_t dev, int type, rman_res_t start, switch (type) { case SYS_RES_IOPORT: case SYS_RES_MEMORY: - range = generic_pcie_containing_range(dev, type, start, end); + range = generic_pcie_containing_range(dev, type, start, start); if (range == NULL) return (ENOENT); - if (range != NULL) { - *new_start = start - range->pci_base + range->phys_base; - *new_end = end - range->pci_base + range->phys_base; - } + *new_start = start - range->pci_base + range->phys_base; break; default: /* No translation for non-memory types */ *new_start = start; - *new_end = end; break; } return (0); } -static int -generic_pcie_translate_resource(device_t bus, int type, - rman_res_t start, rman_res_t *newstart) -{ - rman_res_t newend; /* unused */ - - return (generic_pcie_translate_resource_common( - bus, type, start, start, newstart, &newend)); -} - struct resource * pci_host_generic_core_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)