From nobody Fri Oct 3 00:04:22 2025 X-Original-To: dev-commits-src-all@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 4cd86H0T3Dz6BN1F; Fri, 03 Oct 2025 00:04:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cd86G4zfdz3s11; Fri, 03 Oct 2025 00:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449862; 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=9SxBAr0Tw+U5HwvldrwMw5HU1gE7cjqk+dAyfoVNowU=; b=pMr5UtdHdiZL3r5OeVR6Z9yU6eG5qQ0CAPagBXhSDKC4nF/aBhmxtxeu+TE/Jm1X2wWLsO Vrag3hPkgylJz0+l+oYx97VYR9UOoR2R+w3CMtWDd8RvGnDZ1qScqsX9k41J+N08DGwh6u F70ZeD2ao3INTg/tgFMV5TGZniND4/lp07tVia4V8KA1Wt4LdlurSLVFaDswVBW3akvmm2 jSBaaJZuIRg5Ifyo61CeuIEGYJ9TbrV3M8BcHhcIRyQkp6lPG98EBZ0bEAAvrP/5hwEpxL iCr6oM7NGoXjdVuullvNt0P2x+E8/CWYi6Qd7y/awfclKGsMNZ8BkrVJybXleQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449862; 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=9SxBAr0Tw+U5HwvldrwMw5HU1gE7cjqk+dAyfoVNowU=; b=nRG4JSders8UXESl3bSpa7rcmNdwTFzc9iUecvIiY5oDaLb+OLmp1HC7zlonp69vMzoCWR xKWXX3+S8yU+0eyLCu0B3AgqNwKe9F2Cy/2Lw9JlfR6HDL5sVa175W4s8B1i2CyFHFGAnV VUoSZcWppHm8j8ieebakogE4lKlzU+TrRVLvkTRdURPFORbvhXo5RRx8v/Ggf7CoURxLzn yey3502MbUlKT6CTJnLz3Zg8jwMPLws1VuqRmpVyntbHZIbqK3Md2LcgphD4f04fvlBIEZ sid9cXk72kTIn1xO37kcuomalYqe1KF6KQmqyAUihRAHMmwaC/1qb9YTLGm1fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759449862; a=rsa-sha256; cv=none; b=kASLgGJcZO2WqAUT2Hzkpp2dJqFNRnbjtoGuv9O2G8xzlcvwLdG4qfooeVOUCShphxHDNZ 9FZimKHStMkgidDs1Hz61/M2VE/e8dqTNGH0Z8gsuMdFcBDazYDRrR6JM1wCUD20IwOezE WVjgdpZFwVFd4ngABAio1N0qMKB8d7BcsYu9sy+cb/FywX0a1hft5xB7lfGPpGTcD+w7oJ R0NEf80ADUU7PmHc3D1FOA49XW1MuGFQN0xKzQv2Lx/9FftzjOYdtlieRfaoPnazD8oNs9 8Z4RIZggI2R/shuEVhneVVD+tW57I7bYTNRSSYBodhNA0IwIlr5XJMO7cGgoRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cd86G4KQSzVcr; Fri, 03 Oct 2025 00:04:22 +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 59304MYZ056777; Fri, 3 Oct 2025 00:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59304Mtb056774; Fri, 3 Oct 2025 00:04:22 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:04:22 GMT Message-Id: <202510030004.59304Mtb056774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 3a5c5aabdf71 - stable/15 - cxgbe(4): Add T7 support to routines that deal with memory windows List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a5c5aabdf71b1eececa35524d1d2c4c09b42845 Auto-Submitted: auto-generated The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=3a5c5aabdf71b1eececa35524d1d2c4c09b42845 commit 3a5c5aabdf71b1eececa35524d1d2c4c09b42845 Author: Navdeep Parhar AuthorDate: 2025-09-29 08:17:17 +0000 Commit: Navdeep Parhar CommitDate: 2025-10-02 22:09:04 +0000 cxgbe(4): Add T7 support to routines that deal with memory windows Sponsored by: Chelsio Communications (cherry picked from commit 87d3ee5d14ba2e912010531e5bb601180bd5803d) --- sys/dev/cxgbe/t4_main.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 6a52810c5d8d..01899bda0216 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -4051,7 +4051,7 @@ setup_memwin(struct adapter *sc) const struct memwin_init *mw_init; struct memwin *mw; int i; - uint32_t bar0; + uint32_t bar0, reg; if (is_t4(sc)) { /* @@ -4079,9 +4079,10 @@ setup_memwin(struct adapter *sc) mw->mw_aperture = mw_init->aperture; mw->mw_curpos = 0; } - t4_write_reg(sc, - PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_BASE_WIN, i), - (mw->mw_base + bar0) | V_BIR(0) | + reg = chip_id(sc) > CHELSIO_T6 ? + PCIE_MEM_ACCESS_T7_REG(A_T7_PCIE_MEM_ACCESS_BASE_WIN, i) : + PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_BASE_WIN, i); + t4_write_reg(sc, reg, (mw->mw_base + bar0) | V_BIR(0) | V_WINDOW(ilog2(mw->mw_aperture) - 10)); rw_wlock(&mw->mw_lock); position_memwin(sc, i, mw->mw_curpos); @@ -4089,7 +4090,7 @@ setup_memwin(struct adapter *sc) } /* flush */ - t4_read_reg(sc, PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_BASE_WIN, 2)); + t4_read_reg(sc, reg); } /* @@ -4102,8 +4103,7 @@ static void position_memwin(struct adapter *sc, int idx, uint32_t addr) { struct memwin *mw; - uint32_t pf; - uint32_t reg; + uint32_t pf, reg, val; MPASS(idx >= 0 && idx < NUM_MEMWIN); mw = &sc->memwin[idx]; @@ -4116,8 +4116,14 @@ position_memwin(struct adapter *sc, int idx, uint32_t addr) pf = V_PFNUM(sc->pf); mw->mw_curpos = addr & ~0x7f; /* start must be 128B aligned */ } - reg = PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, idx); - t4_write_reg(sc, reg, mw->mw_curpos | pf); + if (chip_id(sc) > CHELSIO_T6) { + reg = PCIE_MEM_ACCESS_T7_REG(A_PCIE_MEM_ACCESS_OFFSET0, idx); + val = (mw->mw_curpos >> X_T7_MEMOFST_SHIFT) | pf; + } else { + reg = PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, idx); + val = mw->mw_curpos | pf; + } + t4_write_reg(sc, reg, val); t4_read_reg(sc, reg); /* flush */ } @@ -13013,7 +13019,9 @@ t4_dump_mem(struct adapter *sc, u_int addr, u_int len) { uint32_t base, j, off, pf, reg, save, win_pos; - reg = PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, 2); + reg = chip_id(sc) > CHELSIO_T6 ? + PCIE_MEM_ACCESS_T7_REG(A_PCIE_MEM_ACCESS_OFFSET0, 2) : + PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, 2); save = t4_read_reg(sc, reg); base = sc->memwin[2].mw_base; @@ -13025,6 +13033,8 @@ t4_dump_mem(struct adapter *sc, u_int addr, u_int len) win_pos = addr & ~0x7f; /* start must be 128B aligned */ } off = addr - win_pos; + if (chip_id(sc) > CHELSIO_T6) + win_pos >>= X_T7_MEMOFST_SHIFT; t4_write_reg(sc, reg, win_pos | pf); t4_read_reg(sc, reg);