From nobody Thu Feb 27 14:17:04 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 4Z3YLn2Mfkz5qFY0; Thu, 27 Feb 2025 14:17:05 +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 4Z3YLn0Zcyz3xMT; Thu, 27 Feb 2025 14:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665825; 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=eym0QiXoc1fofSrOB57wTdgEztu+wS1aUaMYtfS2MZ8=; b=TKxg6EutWmvxNCqOyE/8xx5xL23+nixCUF22sB0GoVzoMC1lcQrtn8bBNNQQxn/G5KAcdP YjsgEv6q3RduXda21FQZSKUzO/TltDtf4uIeph7LUVruHX7pvA8xIyvQsG2zZuxBp611xq u8SuKmeDNaAm9fUdym7XOikXiMxQF+8aUAFtYnaNtZYgB8Y4tYYytukIy508eklt2SDMPT ZJVuIbOuVgb99fW7ULWn0/WfNM1PaPNy76XaNvqC/kbHhj//HP1g7fRsI40Ajhc+5DU5iR x4N5b2frWzuNTFVLpoklC6XMG1ES9syw6CLGznBnTeqRF75H9j4rwSqT0nExpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665825; a=rsa-sha256; cv=none; b=QzUaMWDmuNl5FlJMLiPlGCUmXi5Zsu5HMYDAg5/5aG/FTcIcB6aBK6H/jHupJwutrHW4J7 1bdDBsSZ1NleQYSPeKdKNQ4+/gdTFR5YPcLeZZcecyKpyaCIzbWZPeu+0ay/vMm6+wDC7S fiZXnuhr1bJ1AQUlGOmD2eTxE90WgGCcRrlfdSpn+Kco3F+UMaRxRcXGmfNEAUWjUDIUu+ KYev/A/pBIsMiJUe/u+nHFjG1sJVNxK0LUM+3p4zr41RRnCT8xnuDBUeMBzNW2lNaYTQqc 2QBuQ4+QH8zcfiJbqIprltT4mscRFmKSVFrG/lPMa3IIFgdWYpyq/wOI+urkZg== 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=1740665825; 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=eym0QiXoc1fofSrOB57wTdgEztu+wS1aUaMYtfS2MZ8=; b=gkgSbiznHBa4CdUr0ZzmiXZCJhSf7vLr1wO2uV4/arhqU1QSloCqmXDTamEe34iXhOWInD 8QHWktEFKUmyXQF6Bb0GrNRRt/R5oKsisAdGf3o2cRYbDigXtZ4d7Gt6lOt+O/jvFYZOzL 1VEU9X5c/bxaSveQd3siff/EV0mpXjUP3Y2XvFgG8TL3rXIIRr1bXDC7vrsgkSJA2x8Wn/ 1Hm9o827jtO7b3TeDGj0XvVYPMAMxMgtjBs4VzX5QzaQGxdeXpREn6KwP4exeGCBtTBdxm 1pme6INav61aR0X7PefRyq0hgOHRO5fuS8N2kBP+gcmgsL76gysOKXRX6YqDVw== 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 4Z3YLn05T2zmdx; Thu, 27 Feb 2025 14:17:05 +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 51REH49T016710; Thu, 27 Feb 2025 14:17:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REH4wf016707; Thu, 27 Feb 2025 14:17:04 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:04 GMT Message-Id: <202502271417.51REH4wf016707@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: 1b0dd6b64b8e - stable/14 - pci_host_generic: Fix build without PCI_RES_BUS 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: 1b0dd6b64b8e0d75362d70e1e68c2e55f90acffc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0dd6b64b8e0d75362d70e1e68c2e55f90acffc commit 1b0dd6b64b8e0d75362d70e1e68c2e55f90acffc Author: John Baldwin AuthorDate: 2024-02-16 20:09:46 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 pci_host_generic: Fix build without PCI_RES_BUS Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation (cherry picked from commit 66d37dbedfbf2dc94ccf49e6983c3652d5909b91) --- sys/dev/pci/pci_host_generic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 386b8411d29a..520462972a66 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -537,10 +537,14 @@ 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) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; +#endif struct resource *res; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) sc = device_get_softc(dev); +#endif switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS)