From nobody Mon Mar 9 11:03:45 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 4fTvJf1rRWz6VZGF for ; Mon, 09 Mar 2026 11:03:46 +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 4fTvJd65Ybz3lFN for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054225; 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=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=m3dTNNSSXIMt9XXqUI4D2HKfPupXACVI5cEkmh5LMkaY+W2TemUay7vxwPvP7P4AzpGpxJ +HHdNeovxCRDCvosqCknRSKGUwf5JLtSqU1etAdX99a9wwE3eGlI7Q6EV1aTisHI/fK4Ey 16JnzGX4dhy4Rlrr+ER42Eh33oJVqE2hlpoi/E7Adq6pGutt0JfD65dDG5OW3PUJRhDXed Zhhtj8rkEpqx2goLrXoNxGgbKOzkUmw9bDLm2nIPFdAvjA5UjcX9Hz62Xly/O+O7m/1/Bo HT8h/qn6imHejKdHmjLHdLMbsTkyEFcH75RPh1JbzDiuIWIWXXrvKGyc7fDaDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054225; a=rsa-sha256; cv=none; b=n0+kxk41pi4fmB02BdpcMUqFQEo08fg/h7GNoTGcml1F899Ut/0UKfNsrh/e95fpL+Yudr DYfb2vvm9H0oV6e+nw2dCc9eVm4zFH2mJrABGpcEaEKZN+7iOuQWuktoo+Pj3aGulPcRyF oaPXfC2f5oql/hKcaxI9WBmEiug3q3ZV5yNCCSssVa9Lj5AwWOCBFZsSzs50Hv81frlvXD m43qKJ+6YC4UK9C26e/DAR62+3HEA7Ho+YUuTHNqA9YYaQwxu6Z7cUr1RgnqPCo9apEYcR MQFNzu/9tmIUOWm4GyvNA7t5bp6CnMLDtITIR64BVtxCRbYS8KSH6jJFNqkwWQ== 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=1773054225; 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=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=HrocHMEkElEq4hGUktNTgokZVQMNQierosGpokl+C8fDXooTR0xvH+Awe+g3X8Z1YWEAs3 at9tk3/PW7gdGFb0dZA0G+fbUsU7FsHFYofzsBSV6kAbw8rqqOk16OqXyi9cFnO+yvJ/pk 4xZjf6Gn6ljauaim76dJW3aA/g3KceGmzdFQDQgFDI5N8nzEQVccAZ+sVFsUWFE1sXuOMX JKRb3Pl64EqzAGkgv9u5Ovtjo0TDK/iVnmiPJvwVa+P3LN/OZ+w1wazUMF5I9GB7Wogn6u mlBTajKdRhIEdiAhhRYs7Y8DI9+ozkJQ8Py6BA2yljkgSfkN2nd/6E7GqxqULQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJd5dP3z6Jk for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45652 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9e989af660a9 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e989af660a9ee4fb69953306b5583e16693888b Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:45 +0000 Message-Id: <69aea911.45652.109a9b6d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e989af660a9ee4fb69953306b5583e16693888b commit 9e989af660a9ee4fb69953306b5583e16693888b Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:17:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +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 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55391 (cherry picked from commit 31c3cba807839a1a16e6f4bca91d530d9342b61a) --- 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)