From nobody Wed Jul 06 17:05:07 2022 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 C3DCF1D0CADE; Wed, 6 Jul 2022 17:05:09 +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 4LdQrz5xC7z3CPq; Wed, 6 Jul 2022 17:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127107; 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=yxcTlvuLvTneqGGwmhB7ZnDUVTeDEDcLJyr8Ch4z1Sc=; b=d7rTJ0HGj27KWtjQ0IcLHRDBvfQvEvV1xSQWxv3/szIjMo/CN5KHEdy+VOv7WZMLFBoKND iItqftMmfBjPrp+GeRfC3E2p74cD/XYO1gmSsQrU/4r/zVbqfzBwo8smOwTjVrfFfON0Kj sobIWN/0T07RcWprisROMsHUWWsWwjXhHZPPMvT6U3dbiMyziDvndQl9LdLkPQ+N2zN6Nj TftrDc+yREIjwZ1ZlmmJA8he0L9bJwGdMcIwN02H5KD15JGnmCQkYXKmWh5r/0bbDmJEhl /M2l0a/EhRZlGeYhp9fVbxN06yCvXwX/UcqYWBSD/rfzWLv5LlnDmng/UjWgLA== 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 54EE71E629; Wed, 6 Jul 2022 17:05:07 +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 266H57mj083789; Wed, 6 Jul 2022 17:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266H57BW083788; Wed, 6 Jul 2022 17:05:07 GMT (envelope-from git) Date: Wed, 6 Jul 2022 17:05:07 GMT Message-Id: <202207061705.266H57BW083788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 1334074959c1 - stable/13 - busdma_iommu: Eliminate a redundant trunc_page() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1334074959c19a3378387d4a892879c12b573816 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127107; 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=yxcTlvuLvTneqGGwmhB7ZnDUVTeDEDcLJyr8Ch4z1Sc=; b=PxWt2FJaK3ecj1j2+rc/zX3TOlKMV1oGDsLqHBGa5bcy2tS2VtjNrc59cic11dj2hq76bC VXJ04VynuIA0zHCcltWG8VPEQSo1nf9dOoRa0wyr0T2t546kNTRHE9H7pD/lSlrjrEcR8/ 3TaxBYQLBwsALuMMwNA07hIGnyli6E7qYTfcBA1vokIN9ej2eF/oDmjxMJ/Ur3VfQ/heNg VRiAaAeRSRdIVSVpkUx/CxFXGlMC62vzHpMq8kgPXbw3NrLKyN8wMBGUS38AAb0DpHHhiL n/DEXi90ferM7JpCABxfvTOkesPzDbOIqKzlck95w9J38qmfc+L8NFO5ByE3qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657127107; a=rsa-sha256; cv=none; b=JsTFZ91R2Vsr2+DgP8kpHUk0Ws6ZEaY3KFIon8dCffGS485oB/yQsq14zCQ5jh7bCXvSJe W/Mk1t9IBQFkN5U4WmdL4SjHiMYs6BoDgTdx/B4H20b9bgdY676JBmJgqJMLfIWlwTmqAf 9gAx+a6IzD/DLtDsCH99hWU3iZ9W/56oqFZUGEyr+OZrssPWRJfxu5qdn1OHaTr7VN0Sp6 QbLJLHBxFKfen8lc0EZ6g8Y5h9cEzpFnp6EH2P2dJn9LqYcU54Aeqyacnxmosv1bEVOr2M jy5J5+e4R2h9Y7x9PQ06iJ4yhJGLj/onLcYTtFDrADnKval4mLlk6iE8N/o7hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1334074959c19a3378387d4a892879c12b573816 commit 1334074959c19a3378387d4a892879c12b573816 Author: Alan Cox AuthorDate: 2022-06-20 18:40:42 +0000 Commit: Doug Moore CommitDate: 2022-07-06 16:52:52 +0000 busdma_iommu: Eliminate a redundant trunc_page() Since OFF_TO_IDX() inherently truncates the given value, there is no need to perform trunc_page() on it. MFC after: 2 weeks (cherry picked from commit 32e82bcc152783dfe0d03ffdd864cedfddbc80d7) --- sys/dev/iommu/busdma_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index da2318eac393..81d9e6ab969a 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -633,7 +633,7 @@ iommu_bus_dmamap_load_something1(struct bus_dma_tag_iommu *tag, segs[seg].ds_addr = entry->start + offset; segs[seg].ds_len = buflen1; - idx += OFF_TO_IDX(trunc_page(offset + buflen1)); + idx += OFF_TO_IDX(offset + buflen1); offset += buflen1; offset &= IOMMU_PAGE_MASK; buflen -= buflen1;