From nobody Mon Sep 14 19:48:11 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 4hkG0X5Xl5z6rcn2 for ; Mon, 14 Sep 2026 19:48:12 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hkG0W6lQLz4X30 for ; Mon, 14 Sep 2026 19:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789415291; 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=Hj/atbsBUEHgDLAH8pwQgGGQfEaVaWux+0OQh2TjLRM=; b=LBXxi++CWlQy95mvpb5X1Ud1GLIIKrAeL3DoJ3FaaZHeVAK6vy5pS7IJ6f+cVtnBZ3/R0V g0CgozG7RK2tQ6IgPdkT9XTqKhwFpUFXWhvctfg+opoAsf/+7Bkg2QXZtyIQ7NljXoveZG OYq6/tenEf8huMkIpCz4obCMXLwrgb7+eorR/NKCLPuSVQUHshCx3AmGD3nZ4WsH3iy4oF O1IUgOXveq5WtqN8vle3kjIYyiFGPttjuqESPAT7QeWOtO+426khZ1TZsqiymfC1uK9mvd Ac0DsKc5kZJdbVcS4ZMO36fi1MR9CMrdB8jSf161/92GXbQQMPR4TYJnj8NfyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789415292; b=k4JkV3NYRce0CGmFwDqzn9Jd41pcqFTgcXJ7epiUZSBTKFqMPn9yKuInieHOmafDqFHv6C eofER27vOYUF4UqFhTQftQ4cfU2Nlw2ThXh9WIHEiWu3FVcSiBSWeVuS3AWYIURjaUB27x Al90sMjd7SypLI7A4ZJs6huYDJst+J1J+xv+pqqwmjfeXhUli1kqvuHb0iUIBo1ixhw1Ca 6i3stqmM357plzcRIU+HqaiHllQ0ivf8Ndje5K/SXGj1rd2mVtSlGGpu1zJ7I/g82FV52w dnx6IvIhrJ8rvKvsrppm7y0MH2+lzP1iRa7KbuA4zxwNz/4YOlQ/fkXb31InkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789415292; 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=Hj/atbsBUEHgDLAH8pwQgGGQfEaVaWux+0OQh2TjLRM=; b=CthRYRVItBGQPIBYUOsRacbZVBgX7kY4dUZ+01blcoHQvQUbBZ+cAtsli1c7cpIRzAFs9e qTRxz187xOrSWkY8B9jzRhYDI8QELdwfKtkgXHqEGCwrGQ7yALbLa+qUVoO/whJYkCvt1E W3NiXGv+MvuypNifCbnC0uIzs/uofkOk5jqcesxTmtJ9DOzfQGTNDUkoOzKa+KoDLneeF5 Nj3d34xwdMkV8OOTyIRBQn/K71SrmJO3hZRuQAyWjqPRs2rL4d84+yirGGl3pUEPDKZ1Sn Z9Qj7K3VnJiHtPBWlb/AJeLvTZaiZ/wNwQbpC98zb1hV9c9BX7Rkg2rKMptmKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hkG0W5R58zRhM for ; Mon, 14 Sep 2026 19:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23262 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 19:48:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c3fa17a6a331 - main - LinuxKPI: implement dma_{alloc,free}_{noncoherent,attrs} 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 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3fa17a6a331db8aad03e9cb89ba97e1811ab381 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 19:48:11 +0000 Message-Id: <6aa84f7b.23262.58868011@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c3fa17a6a331db8aad03e9cb89ba97e1811ab381 commit c3fa17a6a331db8aad03e9cb89ba97e1811ab381 Author: Bjoern A. Zeeb AuthorDate: 2026-08-16 21:54:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-14 19:06:00 +0000 LinuxKPI: implement dma_{alloc,free}_{noncoherent,attrs} We use one to implement the other given direction stays unused. This is needed by an upcoming wifi driver. MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D58880 --- .../linuxkpi/common/include/linux/dma-mapping.h | 36 ++++++++++++++++ sys/compat/linuxkpi/common/src/linux_pci.c | 50 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 8caf88273846..a3ed2e1bd04f 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -108,6 +108,14 @@ void *linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag); void linuxkpi_dmam_free_coherent(struct device *dev, size_t size, void *addr, dma_addr_t dma_handle); +void *linuxkpi_dma_alloc_noncoherent(struct device *, size_t, dma_addr_t *, + enum dma_data_direction, gfp_t); +void linuxkpi_dma_free_noncoherent(struct device *, size_t, void *, + dma_addr_t, enum dma_data_direction); +void *linuxkpi_dma_alloc_attrs(struct device *, size_t, dma_addr_t *, + gfp_t, unsigned long); +void linuxkpi_dma_free_attrs(struct device *, size_t, void *, + dma_addr_t, unsigned long); dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len); /* backward compat */ dma_addr_t lkpi_dma_map_phys(struct device *, vm_paddr_t, size_t, enum dma_data_direction, unsigned long); @@ -201,6 +209,34 @@ dmam_free_coherent(struct device *dev, size_t size, void *addr, linuxkpi_dmam_free_coherent(dev, size, addr, dma_handle); } +static inline void * +dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle, + enum dma_data_direction direction, gfp_t gfp) +{ + return (linuxkpi_dma_alloc_noncoherent(dev, size, dma_handle, direction, gfp)); +} + +static inline void +dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_handle, enum dma_data_direction direction) +{ + linuxkpi_dma_free_noncoherent(dev, size, vaddr, dma_handle, direction); +} + +static inline void * +dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, + gfp_t gfp, unsigned long attrs) +{ + return (linuxkpi_dma_alloc_attrs(dev, size, dma_handle, gfp, attrs)); +} + +static inline void +dma_free_attrs(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_handle, unsigned long attrs) +{ + linuxkpi_dma_free_attrs(dev, size, vaddr, dma_handle, attrs); +} + static inline dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, size_t size, enum dma_data_direction direction, unsigned long attrs) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 4256692f5884..4b798c8f77de 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -2016,6 +2016,56 @@ linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_ha return (dr->mem); } +void * +linuxkpi_dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle, + enum dma_data_direction direction, gfp_t gfp) +{ + struct linux_dma_priv *priv; + size_t align; + void *mem; + + size = PAGE_ALIGN(size); + align = PAGE_SIZE << get_order(size); + mem = kmem_alloc_contig(size, gfp & GFP_NATIVE_MASK, 0, BUS_SPACE_MAXADDR, + align, 0, VM_MEMATTR_DEFAULT); + if (mem == NULL) { + *dma_handle = 0; + return (NULL); + } + + priv = dev->dma_priv; + *dma_handle = linux_dma_map_phys_common(dev, vtophys(mem), size, priv->dmat); + if (*dma_handle == 0) { + kmem_free(mem, size); + mem = NULL; + } + return (mem); +} + +void +linuxkpi_dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_handle, enum dma_data_direction direction) +{ + lkpi_dma_unmap(dev, dma_handle, size, direction, 0); + kmem_free(vaddr, size); +} + +void * +linuxkpi_dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, + gfp_t gfp, unsigned long attrs) +{ + return (linuxkpi_dma_alloc_noncoherent(dev, size, dma_handle, + DMA_BIDIRECTIONAL, gfp)); +} + +void +linuxkpi_dma_free_attrs(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_handle, unsigned long attrs) +{ + linuxkpi_dma_free_noncoherent(dev, size, vaddr, dma_handle, + DMA_BIDIRECTIONAL); +} + void linuxkpi_dma_sync(struct device *dev, dma_addr_t dma_addr, size_t size, bus_dmasync_op_t op)