From nobody Fri Apr 24 15:28:57 2026 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 4g2H1P4sw2z6bSPb for ; Fri, 24 Apr 2026 15:28:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2H1P0m46z3Cdh for ; Fri, 24 Apr 2026 15:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777044537; 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=ZxJ3rtusvBfTt56nSF0dPxEJhKuhqe8DuMqsFcU6IHk=; b=wxn4RRUDZxJV5umoP9x3pGFiW3tbj5H2gqtC6VpxTWApXR0dlWUD/YIQb7eRBMAtEb0pDQ jS7deWWCb1nkEt9NVfcsi14CUSw2ISbzx6c1eTr6e4NimLsGBiWyGtJ+60E3QtDf11reIJ cdFp2fi0ZWRctXd/dHh6UDIEeB1Re1MnA658Xdr/R8DS6CNZp79sbct6wQSrttrLOeoAp/ Z1wCBSBIoAAZuHohI/+WNuF/4dIhS6oRsyjq7vqHWZffdPjE7H1spdaC7Q8ajF8dX1Y3Pw NQPr8q9RcsacQ4q1QSCCiQCfxqf8McA5i73Me/RpsBCqfEgnBgf5CsDG8dmZoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777044537; a=rsa-sha256; cv=none; b=HLA8vzux5VgjMdOQNrwxcQYzYjMcWblg+O/uzexZ8Ql06HZZre2Ex0I08m4luOmhE8n17M Pu0NK9lzvCfEhqFYq28LvONrdKzjOEYKuKapMcjhtZAG+MYGisT44UU04nRvbPjxNRAK+a 8u6JjOBGAoOWb5lu1bH1jXGrYTaf/eau9g6CCNaNc25IxFDowKoG0nnLtaYjBFVphJ7+Mt lTmSf5fQ/B2j52we2NwcDg6W081e14soFmuW6MdeBxGuCj14r9rJdfEQePqlClCXD3htLp 8CGVagmbBZq66xQDtu5uQrlKrt31HATzVZi2XFusWTsPpWlEPjssHJ/T5nq6uQ== 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=1777044537; 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=ZxJ3rtusvBfTt56nSF0dPxEJhKuhqe8DuMqsFcU6IHk=; b=tECrjyIS2rjQGIIV+5zFxK/RvGUD5JOSsLu1NEFpX1GU4wsuVLfgvRrbUwd5osaBZROsug k3fTjfCmpQp70p7u6uD55yiEgmAZjzec7Wby5e9PggJtCqakR+NDdBCb3J6KnzTdhWEPWq g582a08jANXoMPVKEVAf9A6236c4qrcf4hijydX0msr8M78mddVkly/69F6KJF7z2SCRr7 oPzhtTXL5rX7xOdDQBDahvmx1NpXOcdaUxLrBz+kuiwW9Ihaw3pqJok3lgc5waZSKtDKJY UR+TdfnJ2lChmNRHpmQ0xruXuirJxnxhSXojRK6MgABsLBpsFxDlKka2YFUCOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2H1P05skz17lr for ; Fri, 24 Apr 2026 15:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:28:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2233463df7de - stable/15 - cxgbe: Stop using bus_space_tag/handle directly 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/15 X-Git-Reftype: branch X-Git-Commit: 2233463df7de6f95e45c018e26cf99fbdb1102bf Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:28:57 +0000 Message-Id: <69eb8c39.33c7c.5c9aded2@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2233463df7de6f95e45c018e26cf99fbdb1102bf commit 2233463df7de6f95e45c018e26cf99fbdb1102bf Author: John Baldwin AuthorDate: 2025-12-09 15:46:55 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:26:37 +0000 cxgbe: Stop using bus_space_tag/handle directly Reviewed by: np, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D53030 (cherry picked from commit bc2b10a5931442bb39653cd8d5712b2d7195cf46) --- sys/dev/cxgbe/adapter.h | 18 ++++++++---------- sys/dev/cxgbe/t4_iov.c | 6 +----- sys/dev/cxgbe/t4_main.c | 6 ++---- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 55f09fefb7e3..6ff1f07ddf50 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -941,8 +941,6 @@ struct adapter { struct resource *regs_res; int msix_rid; struct resource *msix_res; - bus_space_handle_t bh; - bus_space_tag_t bt; bus_size_t mmio_len; int udbs_rid; struct resource *udbs_res; @@ -1252,7 +1250,7 @@ t4_read_reg(struct adapter *sc, uint32_t reg) { if (hw_off_limits(sc)) MPASS(curthread == sc->reset_thread); - return bus_space_read_4(sc->bt, sc->bh, reg); + return bus_read_4(sc->regs_res, reg); } static inline void @@ -1260,7 +1258,7 @@ t4_write_reg(struct adapter *sc, uint32_t reg, uint32_t val) { if (hw_off_limits(sc)) MPASS(curthread == sc->reset_thread); - bus_space_write_4(sc->bt, sc->bh, reg, val); + bus_write_4(sc->regs_res, reg, val); } static inline uint64_t @@ -1269,10 +1267,10 @@ t4_read_reg64(struct adapter *sc, uint32_t reg) if (hw_off_limits(sc)) MPASS(curthread == sc->reset_thread); #ifdef __LP64__ - return bus_space_read_8(sc->bt, sc->bh, reg); + return bus_read_8(sc->regs_res, reg); #else - return (uint64_t)bus_space_read_4(sc->bt, sc->bh, reg) + - ((uint64_t)bus_space_read_4(sc->bt, sc->bh, reg + 4) << 32); + return (uint64_t)bus_read_4(sc->regs_res, reg) + + ((uint64_t)bus_read_4(sc->regs_res, reg + 4) << 32); #endif } @@ -1283,10 +1281,10 @@ t4_write_reg64(struct adapter *sc, uint32_t reg, uint64_t val) if (hw_off_limits(sc)) MPASS(curthread == sc->reset_thread); #ifdef __LP64__ - bus_space_write_8(sc->bt, sc->bh, reg, val); + bus_write_8(sc->regs_res, reg, val); #else - bus_space_write_4(sc->bt, sc->bh, reg, val); - bus_space_write_4(sc->bt, sc->bh, reg + 4, val>> 32); + bus_write_4(sc->regs_res, reg, val); + bus_write_4(sc->regs_res, reg + 4, val>> 32); #endif } diff --git a/sys/dev/cxgbe/t4_iov.c b/sys/dev/cxgbe/t4_iov.c index 452ebaaf0172..9ccf63fd6516 100644 --- a/sys/dev/cxgbe/t4_iov.c +++ b/sys/dev/cxgbe/t4_iov.c @@ -54,8 +54,6 @@ struct t4iov_softc { int pf; int regs_rid; struct resource *regs_res; - bus_space_handle_t bh; - bus_space_tag_t bt; }; struct { @@ -147,7 +145,7 @@ static inline uint32_t t4iov_read_reg(struct t4iov_softc *sc, uint32_t reg) { - return bus_space_read_4(sc->bt, sc->bh, reg); + return bus_read_4(sc->regs_res, reg); } static int t4iov_attach_child(device_t dev); @@ -249,8 +247,6 @@ t4iov_attach(device_t dev) device_printf(dev, "cannot map registers.\n"); return (ENXIO); } - sc->bt = rman_get_bustag(sc->regs_res); - sc->bh = rman_get_bushandle(sc->regs_res); pl_rev = t4iov_read_reg(sc, A_PL_REV); whoami = t4iov_read_reg(sc, A_PL_WHOAMI); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 22d2f504c257..88a1cb9d3eb9 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2660,8 +2660,8 @@ reset_adapter_with_pl_rst(struct adapter *sc) { /* This is a t4_write_reg without the hw_off_limits check. */ MPASS(sc->error_flags & HW_OFF_LIMITS); - bus_space_write_4(sc->bt, sc->bh, A_PL_RST, - F_PIORSTMODE | F_PIORST | F_AUTOPCIEPAUSE); + bus_write_4(sc->regs_res, A_PL_RST, + F_PIORSTMODE | F_PIORST | F_AUTOPCIEPAUSE); pause("pl_rst", 1 * hz); /* Wait 1s for reset */ return (0); } @@ -3971,8 +3971,6 @@ t4_map_bars_0_and_4(struct adapter *sc) device_printf(sc->dev, "cannot map registers.\n"); return (ENXIO); } - sc->bt = rman_get_bustag(sc->regs_res); - sc->bh = rman_get_bushandle(sc->regs_res); sc->mmio_len = rman_get_size(sc->regs_res); setbit(&sc->doorbells, DOORBELL_KDB);