From nobody Tue Mar 8 22:31:11 2022 X-Original-To: dev-commits-src-main@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 75D5519F595E; Tue, 8 Mar 2022 22:31:12 +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 4KCqmc1M6Pz4XTt; Tue, 8 Mar 2022 22:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646778672; 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=eGQcLemeBWvHX+9ULg8Y0uTHj45qT+iEx820T/HW5q8=; b=pcHiSQy6WGu9yAada0iSqOK/3Jo2xQmFdOHNly5LGzp5AcpOW0B8JeabdchT+j2hA9ldKc XXmH8sbUKGhZTbjQrVk9NN7FOm63k+5388bh2I3cDFP+RsOguj5TIrZV0twaAbftB1zU2U GpivEdXaO7++ikIC0Ve71PxoGNPCQm6FbFAT1WRslXk2hbei0w4Tb11WFVsqxHTWoGFBkd MSZrVzZEzpn/01tDwjU/5pXhVliocanuVc978f+3fEQyZXxmD1uQFM2xlIHpJ7TDQmxVxs NJ4h3c2qnLqpt2kWuOdp7/EIP15oZx4U52wRMz4sz6iwigAIfqCqEYRHkgrR7A== 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 EC03324D73; Tue, 8 Mar 2022 22:31:11 +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 228MVBGF060257; Tue, 8 Mar 2022 22:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228MVBIi060256; Tue, 8 Mar 2022 22:31:11 GMT (envelope-from git) Date: Tue, 8 Mar 2022 22:31:11 GMT Message-Id: <202203082231.228MVBIi060256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 87b0e7711f25 - main - cxgbe tom: Use VM_PAGE_TO_PHYS(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 87b0e7711f2552ff6ad575deb546124d8b5ae5d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646778672; 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=eGQcLemeBWvHX+9ULg8Y0uTHj45qT+iEx820T/HW5q8=; b=i/FGcYFFyTovSC7v1L4AglWNl5f+KbkymSgFLGqrYEibGEnV3vM6pxdcNvbO9zw/Kj9fri EA+7tCVuo8me5gfrYyRnd05xcb4BtPnOZUsnVUj7GeRq05Ytb20opS88R2fxhsrpl7xC6k 9lqmcq3sVEuN1xKdRVT0vMHIEXypDvv+kWnh80bfis4ey0Wm+aBM6JtVhMZbgqC0iPeIu5 q0+Az9G+Tn7yqHC2aSRSCJPLPTwkLHYJRwUNJoKXA6GhzReeLazRMZIfsiIJYZij/nMp+X SDI+3pPuUtTP+fofx8K9RkSl9QbmAyBQpKRBiTMR1EGIPJp1n3H+LJD6HSqf1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646778672; a=rsa-sha256; cv=none; b=otZ91k7FITwimBkjF2bzY8sb++6dBWu1qxQNhx6EzLIwXfbuG7JuCrIlm5yo4yOu9gvbEb Vj787bvGRHfHQ27qpByvhAJX2Bx8Y56IU0/bYyZKJeTz3wuHppzaBo1kW02eYqaptKIlZd 3PQ2xlrryRwMke9ibH9VOBRkR6uYsP6LjbszPrP+GNm6J+YspzrBfuYr7cu4aYXQ+Fu/Pe aOomv4EWP6cDaQFj+n75wFxxFuIXupsj+YSi4EPziTPl8SkQbFQ7w8gqiVugA/sSjTJ3WT X0eorIlmg3sEv25QWkkAj2q5eZhRgQyVhXoW22CW3MR/mmErzT1gwEjEg0DDGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=87b0e7711f2552ff6ad575deb546124d8b5ae5d8 commit 87b0e7711f2552ff6ad575deb546124d8b5ae5d8 Author: John Baldwin AuthorDate: 2022-03-08 18:10:59 +0000 Commit: John Baldwin CommitDate: 2022-03-08 22:30:26 +0000 cxgbe tom: Use VM_PAGE_TO_PHYS(). Sponsored by: Chelsio Communications --- 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;