From nobody Wed Mar 4 11:13:27 2026 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 4fQqm82bvsz6TMM8 for ; Wed, 04 Mar 2026 11:13:28 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQqm8003rz4LD6 for ; Wed, 04 Mar 2026 11:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772622808; 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=aIi6EJ/dhUK4/AwyTRh8I4q21yUGI3wb9TseZYA7VKs=; b=ZwfJE1nRoFb+2qd6kqAQNsOo9HxhhcAO1QU5BM4EyUcOqHkkEg0VoiQl5YLw9pncVqQLiy DwO0vOydiUa3xprxr5lINJji9ZQgXTurTjdYMviOxDarzs2F6xK8s6PVdWinZjZnSWVLrk kh21Q03l6xy8l5D7tU/wUdr+gPhD8vuO4dNk0cMX3h2O8/EdxxtzSRh7kR3zB66ur2cutU RglS3Exw842Gg7M7ivr7iEA5gDi0iCEB1GmEPxVWwRpANFt71ITsGrYBoCVW+7kT+rGyOS iGyYAIef6LqW5k/IIwf66x0jfFFcmgmx9yNpRg+pkkx7t8Gfi31npreem8S3nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772622808; a=rsa-sha256; cv=none; b=jsXNt8EqVL5ZGNZVsY99YLpF32in0I1afksiHWa2ay/c5RCUVZngPfOZIi8vg++JHJVGfn KzJ9A0bbdbcPoAg4L9nY+la0odc1Ts8VaZ7q1ucNpRHmxZ/BspZnomQDBjix+0EWk6Y8Pr wZrwOTkH9rsAKO6mKPntmoR4Mzn8WlG2XNa/gudOyqgdNzebvFQ8FQWPuPfkHwS+FwQhJU sBRxWbspUmujj3gINJ+dHHqKzNZJo+1b406qdTvgn3JJguRnBwAk3rzvugzA5mb4KBIC5b X9WMRawTMWgHQmew+LRGX794s1z3SZxfJddt2wq6GmXhM63aoo7YoRyAJBPXQg== 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=1772622808; 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=aIi6EJ/dhUK4/AwyTRh8I4q21yUGI3wb9TseZYA7VKs=; b=KHKv2P7MflNumnCyj8ez1F+mtbe3z8haVNEmcs5dNu5DJtC4/EwXZBfhsfLjCHt+qbFgip w46TAPyNExnHutI8AQqtJuWFLTjw4SME4cdIZnfUZpa7QC2ELpI6tsuBwWK1elbrNGvzOb FAXuJ4aPvzXpw/TM5QRRgBOF7UmO0+0HgLVSZ9BkaQzQ87i5BWoqH2rYBDnC0fL/Fih/Ye xxzwgLjd9DYu5HDTl3Ir11rfMPZ/JHEwAFxW8n8qskMn2HZ/g2YLRVijzfvObqGzkP/PiA 4qPBKP+wSLcYPY4piHJk+wbggJJSwciyVnXYDiMbHXJ36NO3iiav0yODrz+mIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQqm76fbGzpMv for ; Wed, 04 Mar 2026 11:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40a2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 11:13:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 31c3cba80783 - main - LinuxKPI: pass attrs in more places in dma-mapping.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31c3cba807839a1a16e6f4bca91d530d9342b61a Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 11:13:27 +0000 Message-Id: <69a813d7.40a2f.16767a3c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=31c3cba807839a1a16e6f4bca91d530d9342b61a commit 31c3cba807839a1a16e6f4bca91d530d9342b61a Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:17:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-04 08:23:22 +0000 LinuxKPI: pass attrs in more places in dma-mapping.h Various macros (dma_map_sg_attrs, dma_unmap_sg_attrs, dma_map_single_attrs, and dma_unmap_single_attrs) currently supress passing on the attrs argument. Their implementation (even though at times still marked the argument __unused; we remove that) have long gained support for handling the argument. With ofed fixed (5edf24aac1d09), pass the argument through so that other drivers using these functions may hopefully work just a bit better as well. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55391 --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 76efbfd51074..5e5d40ef8339 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -106,10 +106,10 @@ void lkpi_dma_unmap(struct device *, dma_addr_t, size_t, enum dma_data_direction, unsigned long); int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, int nents __unused, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linuxkpi_dma_sync(struct device *, dma_addr_t, size_t, bus_dmasync_op_t); static inline int @@ -201,10 +201,10 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, /* linux_dma_(un)map_sg_attrs does not support attrs yet */ #define dma_map_sg_attrs(dev, sgl, nents, dir, attrs) \ - linux_dma_map_sg_attrs(dev, sgl, nents, dir, 0) + linux_dma_map_sg_attrs(dev, sgl, nents, dir, attrs) #define dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) \ - linux_dma_unmap_sg_attrs(dev, sg, nents, dir, 0) + linux_dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, @@ -361,10 +361,10 @@ dma_max_mapping_size(struct device *dev) } #define dma_map_single_attrs(dev, ptr, size, dir, attrs) \ - _dma_map_single_attrs(dev, ptr, size, dir, 0) + _dma_map_single_attrs(dev, ptr, size, dir, attrs) #define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \ - _dma_unmap_single_attrs(dev, dma_addr, size, dir, 0) + _dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)