From nobody Tue Jun 23 15:53:25 2026 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 4gl8jx3mQkz6hdNx for ; Tue, 23 Jun 2026 15:53:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8jx397Yz3H4T for ; Tue, 23 Jun 2026 15:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230005; 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=/f/d8yMB1HfwTga1DZywPHP5CBTstdwTASws36aSm0g=; b=Dw/mIF5DSzCU0PpG7kop6QsPAqPvR4GsVna66AkZ/tv0R4B9TNx56H16cCfQBrmn9zLnn/ hCbYEKZAxetFkqwAuBwFRmzICXzVrwhrzivuLLHJZVv2tYBGT6CC3V6Wtefq33naX6uA2f 3z7y1N69Bxmyv0TfMcdLXVMyWucBpC65YF2zhYmEUZhDNZJOeNNg03naxezU+CDzXzkL6c e/t9L2lX69dNm8YcH4V7g7vtVvGuyqt8Moj0mqKwf8Q2D7/YKYk9jQ8GLP4gg8UBCQl7Fo EJ1x/pl7QZacZwwedken4f+yYvo9s6/xKhHfSsBithbv9E82xRFNwwpk2ZSicw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230005; a=rsa-sha256; cv=none; b=GzzBZMu3KhIRI6RvWFOHiCnMOnxwyxuGrXsOYXsGNsdsr3g6L5sXFnwiZyIE6/yndEsJeh ZrjTwYCSCho8Z7K9/XmPvLiwcgr1gnciEGMAkz5ATdXIMZ4m3AIe237qkKo2mAzP9s/pZn MbWJ6GOMN1ukQexhzHRWHa6nULvP1vVIkh4wyLhSfFcgGfb3ejSOTCorg4elUSFqW/K9E7 dMjonWUO0AtKIf1msuySDegfl+ymtwYP0v6RmBXs9nWdlCYEOcdKeG6lfU8jX0RuFzONEj Bc2K/zCLEhos06/3HoKh47aA6/tgSQDwB+AtT/OWPYu5YjyHsI6aLo8t7xD40g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230005; 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=/f/d8yMB1HfwTga1DZywPHP5CBTstdwTASws36aSm0g=; b=oF0rwwO2D5DAzmXIT2n/T0GoSk8xL3PTHcHiqDNJi2hNUwIdrKtzrLhp7YDC1YKZK3VKO2 g2cG5ePIh1+2NbRw/+tf1AviarmM7rCuqLPuBJnL2EFXrmw7vcdwIZb3iFnZJCWD7XKtQP pLUJyhsEPDWcprXlssVxwC9a/IRGBeZ38FKUjDN2LY6yEFtzxCia78Lq0D7mayIwKeGBqs RvfgOtz8LyLrKl/80f2DtrasjugWARy1i5DQ1CoHBnFsBFAT6F8SwAwo26bB5Mjvv4u1U7 8J12J2xcbh9h0MQWgeKBdN8ibqXMds0GkWQ9GLiMY+fz4GY2gWx6TA04EfTwIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8jx2Bh4zgc0 for ; Tue, 23 Jun 2026 15:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:53:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0e0d46422657 - main - LinuxKPI: Retire 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0e0d46422657c5042fcb33729305d3fb60dd76b6 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:53:25 +0000 Message-Id: <6a3aabf5.23d7e.6e2bd5ee@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0d46422657c5042fcb33729305d3fb60dd76b6 commit 0e0d46422657c5042fcb33729305d3fb60dd76b6 Author: John Baldwin AuthorDate: 2026-06-23 15:52:57 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:52:57 +0000 LinuxKPI: Retire Move the attribute constants to to match upstream. Reviewed by: bz, emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D57749 --- .../linuxkpi/common/include/linux/dma-attrs.h | 54 ---------------------- .../linuxkpi/common/include/linux/dma-mapping.h | 12 ++++- 2 files changed, 11 insertions(+), 55 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h b/sys/compat/linuxkpi/common/include/linux/dma-attrs.h deleted file mode 100644 index c9cfa9b621d5..000000000000 --- a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * Copyright (c) 2010 Isilon Systems, Inc. - * Copyright (c) 2010 iX Systems, Inc. - * Copyright (c) 2010 Panasas, Inc. - * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice unmodified, this list of conditions, and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#ifndef _LINUXKPI_LINUX_DMA_ATTR_H_ -#define _LINUXKPI_LINUX_DMA_ATTR_H_ - -#define DMA_ATTR_WRITE_BARRIER (1 << 0) -#define DMA_ATTR_WEAK_ORDERING (1 << 1) -#define DMA_ATTR_WRITE_COMBINE (1 << 2) -#define DMA_ATTR_NON_CONSISTENT (1 << 3) -#define DMA_ATTR_NO_KERNEL_MAPPING (1 << 4) -#define DMA_ATTR_SKIP_CPU_SYNC (1 << 5) -#define DMA_ATTR_FORCE_CONTIGUOUS (1 << 6) -#define DMA_ATTR_ALLOC_SINGLE_PAGES (1 << 7) -#define DMA_ATTR_NO_WARN (1 << 8) -#define DMA_ATTR_PRIVILEGED (1 << 9) - -struct dma_attrs { - unsigned long flags; -}; -#define DEFINE_DMA_ATTRS(x) struct dma_attrs x = { } - -static inline void -init_dma_attrs(struct dma_attrs *attrs) -{ - attrs->flags = 0; -} - -#endif /* _LINUXKPI_LINUX_DMA_ATTR_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 45dfcf350fa2..d29006cb52d3 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -48,6 +47,17 @@ #include +#define DMA_ATTR_WRITE_BARRIER (1 << 0) +#define DMA_ATTR_WEAK_ORDERING (1 << 1) +#define DMA_ATTR_WRITE_COMBINE (1 << 2) +#define DMA_ATTR_NON_CONSISTENT (1 << 3) +#define DMA_ATTR_NO_KERNEL_MAPPING (1 << 4) +#define DMA_ATTR_SKIP_CPU_SYNC (1 << 5) +#define DMA_ATTR_FORCE_CONTIGUOUS (1 << 6) +#define DMA_ATTR_ALLOC_SINGLE_PAGES (1 << 7) +#define DMA_ATTR_NO_WARN (1 << 8) +#define DMA_ATTR_PRIVILEGED (1 << 9) + enum dma_data_direction { DMA_BIDIRECTIONAL = 0, DMA_TO_DEVICE = 1,