From nobody Thu Nov 2 13:40:10 2023 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 4SLlP667qFz50Lrr; Thu, 2 Nov 2023 13:40:10 +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 4SLlP65dwsz4Pg7; Thu, 2 Nov 2023 13:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932410; 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=zrY77KtrUR+FKxVgEt+bzK96BzcSdw00cmX92OX2fkM=; b=flo8Lgl6NLbNdW3HTdqCmI0SNLeMvyAX0ATSH9HiAXQW5Dv30Bk7q8eMRceBrawkHPAYxj 9j4n9jArWGy3p9ZFEyvC8PJ+exybeaMETxhIjoUJPGnVqQbRMqUlPFO+Xa8FvGjKrXVpNQ u1Ms2ZQLawijPkxIACS0te0AQ9wInmkRm5S2hkt1XcfeSYpPYnwiPPmbxWCRCK6M8irDKV 7owAYQ6I5SekBqFL9Dk39HUbJQcXZKFHQpuOW8PJLEidYfDM+IhW/oSc30VYTxSwEGVd/m 34J8yJAEtxph9Grb99Smg5Ldk6mZwLn9Np4EhW8AExdHxhjBBZEeIrfOYsKjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932410; 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=zrY77KtrUR+FKxVgEt+bzK96BzcSdw00cmX92OX2fkM=; b=aMw6UaqjaCbjS5um1hrwnZMpgoQgnQRMPGw8M5jeDT4jN1MXSHjNskya7eUdO4ljIvBCh6 I1E9bGNRbWZLFB6wAPN+RyHT2HnBfaYEEGARBH0htgbTpKbmfSRbyOgt3ME49dwoo6MLGi XTODk9FS/t1F4jXhkQcwuKk6IZxmzdE3G27jFMSFMsexgfs9bZV9X+pguUhvggXgEzzyob 0e89nPWyxH/VRqV1YKG1vDP6+Q56b2vNrRxYD/28ev0XVT3I+vUkCSJ5RKVnkXPGi3mWhw cTuPwd/YeXc5zLK9QLXsDiC2oQvmL5nVTs1w59pXINbyMH8A/bYiWVg+hf9s9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932410; a=rsa-sha256; cv=none; b=kVrV60z2hIwttUxfbKRUwo4SlplwEDqxss9LpDFt4u/1GNiNUb2StQxD5A+61ra0qi5HiQ 2PeafZ7YwyiXT0CvgDNlgYBMLYY4o/vtC2LNXB9uC+AfmxtvzouvM8HP3fETmUOl+4dVAY 6GpNPI6g4jP/OiHe0AHbj9M0EHkspMWqS05gDdj7hRiddv5r5KIruS3PcNRQE6550CppV8 j9tAITXGcj6QOxYd3an6y3zyMNQmW3MARhlQRErydKwK9NFrjJjB5n0ktVbmJcZnrgnSNe V2Lv5JuEnSN3bEZ/GLtQSvFA3LFpq7geQ6JROuNx3uepZSa6bxYxkXbtE2m5Qw== 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 4SLlP64jpRzXFL; Thu, 2 Nov 2023 13:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2DeAlR029865; Thu, 2 Nov 2023 13:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2DeAc2029856; Thu, 2 Nov 2023 13:40:10 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:10 GMT Message-Id: <202311021340.3A2DeAc2029856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2c7dd66d09a1 - main - linuxkpi: dma_get_cache_alignment(): Fix off-by-one result 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c7dd66d09a1b92a4698232996cded6e5315b3bd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7dd66d09a1b92a4698232996cded6e5315b3bd commit 2c7dd66d09a1b92a4698232996cded6e5315b3bd Author: Olivier Certner AuthorDate: 2023-10-13 15:13:28 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 linuxkpi: dma_get_cache_alignment(): Fix off-by-one result Substituting 'uma_align_cache' by the appropriately named accessor uma_get_cache_align_mask() made apparent that dma_get_cache_alignment() was off by one, since it was defined to be the mask derived from the alignment value. Reviewed by: markj, bz MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42264 --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 53c59bea8ef2..84f0361de765 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -351,7 +351,7 @@ dma_max_mapping_size(struct device *dev) #define dma_unmap_len(p, name) ((p)->name) #define dma_unmap_len_set(p, name, v) (((p)->name) = (v)) -#define dma_get_cache_alignment() uma_get_cache_align_mask() +#define dma_get_cache_alignment() (uma_get_cache_align_mask() + 1) static inline int