From nobody Tue Apr 29 18:30:33 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 4Zn8555nvyz5vMsn; Tue, 29 Apr 2025 18:30:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn85525YZz4HTk; Tue, 29 Apr 2025 18:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951433; 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=DW4yVM5Z4flCTWg5Sq0kTtXnAvZmorJfeJWJ2jtfPMc=; b=Kvb5HN2qCZijLQSMjaW9KjP7p2LvJjgabmDIQcOeMfEVMAcZaNF+PNrXbumX3ZJpckBDxb omMUoAE7+cycmskt/wZeh4USoayzMb8vMsc4HmiupbZVVdY4in02hR3a4jtQRHYvdrt7h0 GMUjAoFGYh4IOOAKgzmGOS4Bp2sDwOiiYcTNaZmeFsn8b+ICLiFK4R4ofRBuvDnwwQFcsD wzEIEqe1pxSZNOB0Lr8bqhIG8JT0fsXTfuK+SVDvp68R73bpwuiwp56DDIt8R3MrHfaPyW MwQfhlvJA4+LB/F1Nzc24HfImOGz3VxErU8bfWkqtDHJfaE7z0+n29doko1/Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951433; a=rsa-sha256; cv=none; b=AfTbyWk49dj8TgpKanshHYrChjUO8cuqQnyeffRfQOPw+K2nrlVVtT2IC0CvgiTy+dvrYU UaXC6g1VsyLwRZCtXKkipCOClOOnYHnV7t4cdop8PjNTdnevcxmV7zE7Fm7Xeuj/sYYbtG zxWe+WQHlmh33kCa29v4FID1tIIq82MXC/qc23UnEQCCr5ba/Las7LxlJUMt0pfDJ85aiO +1QtC5w7WSQQDA1wStksQG4chsJXLmhWGu5sS0uG8CrHr2n5yP0t/id7xxTWNDjXBAldfu 7pXGSID/7G7mHLNntF2Cams8UgceAXXde6tVdI2WzfXRFXOlcEYL/dD64UWxJw== 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=1745951433; 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=DW4yVM5Z4flCTWg5Sq0kTtXnAvZmorJfeJWJ2jtfPMc=; b=yDZlnJfYpXWxUAbNoeZDwMtL5xoRmBtOROTOu6Ndl1AtlVaifK7FX8KOLlFZedA35Zi/h6 OYQpnZqK+4AjjI95L5OnW2UNh3brR9Ri2n2LX6xncgG4pQM1JI1LXbO/CiU+vn4BrsvRd1 ck0uSzRxUqlUg7axzibBC1+pawJR8myC7zu5EjB5HQjYS2Y5VQJzHgjGHqAXXegl4V6kjt 8PmF2jRZ+o+FEEgYd2mPP+vg/bY4xdgmpn7uRM2z8OeQS6RvaW/qNuvRt5CaFTCWp2PX9i A50b3PEooBpeG201DtXluIlJcdpxhqGhgKu57jWN2PMvSL9Vz01zBLLweOnZdw== 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 4Zn8551L62zXV5; Tue, 29 Apr 2025 18:30:33 +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 53TIUX6b022412; Tue, 29 Apr 2025 18:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUXkN022409; Tue, 29 Apr 2025 18:30:33 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:33 GMT Message-Id: <202504291830.53TIUXkN022409@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: cbaa32c28a05 - stable/14 - pci_host_generic: Use SYS_RES_MEMORY for the parent of I/O resource ranges 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: cbaa32c28a05bbc0e8ae5c37dcad4ffd6dc18f8f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cbaa32c28a05bbc0e8ae5c37dcad4ffd6dc18f8f commit cbaa32c28a05bbc0e8ae5c37dcad4ffd6dc18f8f Author: John Baldwin AuthorDate: 2025-01-21 15:51:53 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:18:35 +0000 pci_host_generic: Use SYS_RES_MEMORY for the parent of I/O resource ranges When a SYS_RES_IOPORT resource crosses a pci_host_generic bridge, it is translated into a memory access for an associated range, so use SYS_RES_MEMORY for the resource allocated from the parent. Tested by: markj Differential Revision: https://reviews.freebsd.org/D44207 (cherry picked from commit c19f1ad1c252f434146c7210155d805b2ed0ff95) --- sys/dev/pci/pci_host_generic.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 2552dc6cc599..0fa663c12a56 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -91,7 +91,7 @@ pci_host_generic_core_attach(device_t dev) const char *range_descr; char buf[64]; int domain, error; - int flags, rid, tuple, type; + int flags, rid, tuple; sc = device_get_softc(dev); sc->dev = dev; @@ -187,19 +187,16 @@ pci_host_generic_core_attach(device_t dev) sc->has_pmem = true; range_descr = "prefetch"; flags = RF_PREFETCHABLE; - type = SYS_RES_MEMORY; rm = &sc->pmem_rman; break; case FLAG_TYPE_MEM: range_descr = "memory"; flags = 0; - type = SYS_RES_MEMORY; rm = &sc->mem_rman; break; case FLAG_TYPE_IO: range_descr = "I/O port"; flags = 0; - type = SYS_RES_IOPORT; rm = &sc->io_rman; break; default: @@ -209,7 +206,8 @@ pci_host_generic_core_attach(device_t dev) device_printf(dev, "PCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx, Type: %s\n", pci_base, phys_base, size, range_descr); - error = bus_set_resource(dev, type, rid, phys_base, size); + error = bus_set_resource(dev, SYS_RES_MEMORY, rid, phys_base, + size); if (error != 0) { device_printf(dev, "failed to set resource for range %d: %d\n", tuple, @@ -217,8 +215,8 @@ pci_host_generic_core_attach(device_t dev) continue; } sc->ranges[tuple].rid = rid; - sc->ranges[tuple].res = bus_alloc_resource_any(dev, type, &rid, - RF_ACTIVE | RF_UNMAPPED | flags); + sc->ranges[tuple].res = bus_alloc_resource_any(dev, + SYS_RES_MEMORY, &rid, RF_ACTIVE | RF_UNMAPPED | flags); if (sc->ranges[tuple].res == NULL) { device_printf(dev, "failed to allocate resource for range %d\n", tuple); @@ -253,7 +251,7 @@ int pci_host_generic_core_detach(device_t dev) { struct generic_pcie_core_softc *sc; - int error, rid, tuple, type; + int error, rid, tuple; sc = device_get_softc(dev); @@ -272,18 +270,15 @@ pci_host_generic_core_detach(device_t dev) switch (FLAG_TYPE(sc->ranges[tuple].flags)) { case FLAG_TYPE_PMEM: case FLAG_TYPE_MEM: - type = SYS_RES_MEMORY; - break; case FLAG_TYPE_IO: - type = SYS_RES_IOPORT; break; default: continue; } if (sc->ranges[tuple].res != NULL) - bus_release_resource(dev, type, rid, + bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->ranges[tuple].res); - bus_delete_resource(dev, type, rid); + bus_delete_resource(dev, SYS_RES_MEMORY, rid); } rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman);