From nobody Fri Apr 29 23:12:51 2022 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 39B971ABD657; Fri, 29 Apr 2022 23:12:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KqpDg6xXRz3wNF; Fri, 29 Apr 2022 23:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273972; 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=CNdJfC4tkwB2zTWL+0fd9WV+AtimQpaRGCrZ9Ctg36E=; b=g51VOSeTqTel5/+EDMpkn0dUvP2hw539RKb/AETyMF2aNx6YdZeJJLueGnhzP9N+cKcfjR HmjC3SPlFBhX5But4FaZtiGLGLtEdt78TcQKLhdAd3FpRZRLSKb8K2VWJ2r0Ni7UfwviN2 p0pyylLyhfnVrSCPHe2bglGP6aLLXNm7sj/ZfzqjEt65bzE65Xlsxn3kXOl2CauIZ5xVMc lFEY3mquzthQt3tE4/Nr+r1S97PvDPgbTmaPm3tZE2JnBGjYynrsooz0HVqB3Pto9pp45v kx1Vl4GLGSdjc/PYswd40S29++XQTILAaXK4u7iacjFHRfVcBhfLtU4WVZNsMQ== 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 3157F160CE; Fri, 29 Apr 2022 23:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23TNCpGs045197; Fri, 29 Apr 2022 23:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCpeX045196; Fri, 29 Apr 2022 23:12:51 GMT (envelope-from git) Date: Fri, 29 Apr 2022 23:12:51 GMT Message-Id: <202204292312.23TNCpeX045196@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: 3b29ee793e4a - stable/13 - cxgbe tom: Use VM_PAGE_TO_PHYS(). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 3b29ee793e4af6ce66e24d8da5447ab6e994df8e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273972; 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=CNdJfC4tkwB2zTWL+0fd9WV+AtimQpaRGCrZ9Ctg36E=; b=cKeYjzx4b9JMHVQQFLM7HkeNH5MVY+5Oy0fO6oUl8f5uYDd3rFE+PyYqgvB7nMiLSShA41 yasoF6HHmLSxNC0Bn2mwZAUnYREzm4r7kPgpTjt1E4CRovabFPkPai+CA5kUaQ92FsL3+k 1l7MA3WK8Blb7T68bEgYPEyRgh2QuiRZZHxO+RqLmuaaRg03B7HlzcqvQr2GvNFkn63wlF Swz2Ffm8N8JB3yNzpdgdGRY3By0kO77d0v5Si7MSAP5zCIST3SqKU6nST5Gb8E6JgbMNVk pBbQOxxn1Nv9aGP+olOOtfUuHnmmhQVVrrlyM+jXSMZKOixAVQjEuQGqaE5afg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273972; a=rsa-sha256; cv=none; b=YIRex/ou4m84Ld5zZTFwID7TWhLpVouwh38dAq1Cy6AU8rQoKhy4AbwHCtjWa5qhSULwk2 /x8yzlMzCVz8l0g/Ae+sriKPv2lRlAkU8WIHSLgjz9262qMTAxB6uJFFuvAWK6xAs/HN0Q FICeyGo/TbGVGymUB6z36P+VECumOWxmqeE7AQEk+BdFERc2BA8io98Bt2EjvRSUFbT5WL HZo4/AailHQE/UMNKizE+oAOEX6s+FCWN2gx3p0rqkTmoYczRKQYGjwzxrPLIHV14uPWH4 hiFp09hZuQzFn8vTBCtpdCttt+k3FMxjI/tcz5eEiE+gcgchCulSGidLFGcLsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b29ee793e4af6ce66e24d8da5447ab6e994df8e commit 3b29ee793e4af6ce66e24d8da5447ab6e994df8e Author: John Baldwin AuthorDate: 2022-03-08 18:10:59 +0000 Commit: John Baldwin CommitDate: 2022-04-29 23:10:43 +0000 cxgbe tom: Use VM_PAGE_TO_PHYS(). Sponsored by: Chelsio Communications (cherry picked from commit 87b0e7711f2552ff6ad575deb546124d8b5ae5d8) --- sys/dev/cxgbe/tom/t4_ddp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 428e942a29cd..7c1e3011df7f 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -907,8 +907,8 @@ t4_alloc_page_pods_for_ps(struct ppod_region *pr, struct pageset *ps) for (i = 0; i < ps->npages; i++) { seglen = PAGE_SIZE; while (i < ps->npages - 1 && - ps->pages[i]->phys_addr + PAGE_SIZE == - ps->pages[i + 1]->phys_addr) { + VM_PAGE_TO_PHYS(ps->pages[i]) + PAGE_SIZE == + VM_PAGE_TO_PHYS(ps->pages[i + 1])) { seglen += PAGE_SIZE; i++; } @@ -1103,6 +1103,7 @@ t4_write_page_pods_for_ps(struct adapter *sc, struct sge_wrq *wrq, int tid, uint32_t cmd; struct ppod_reservation *prsv = &ps->prsv; struct ppod_region *pr = prsv->prsv_pr; + vm_paddr_t pa; KASSERT(!(ps->flags & PS_PPODS_WRITTEN), ("%s: page pods already written", __func__)); @@ -1147,8 +1148,8 @@ t4_write_page_pods_for_ps(struct adapter *sc, struct sge_wrq *wrq, int tid, idx = i * PPOD_PAGES * (ddp_pgsz / PAGE_SIZE); for (k = 0; k < nitems(ppod->addr); k++) { if (idx < ps->npages) { - ppod->addr[k] = - htobe64(ps->pages[idx]->phys_addr); + pa = VM_PAGE_TO_PHYS(ps->pages[idx]); + ppod->addr[k] = htobe64(pa); idx += ddp_pgsz / PAGE_SIZE; } else ppod->addr[k] = 0;