From nobody Thu Sep 22 16:16:28 2022 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 4MYL4s1SVHz4chxn; Thu, 22 Sep 2022 16:16:29 +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 4MYL4r59nmz3Nvr; Thu, 22 Sep 2022 16:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863388; 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=cWBeg35s5Z0ISaeesTNZO0hI4FPx9RjPtzq5+ncXV1U=; b=P4DreaS6apytiPNNPiCRPCcfPDfqq1Q/tijFHWXAAi7fdQ90vJeElP93OCukuGZWkt9BsT nguJuPV/805FgdTc/Yr/47FNesZaR4tH0P2JtpJxB+fhBYB9/5CYyMqSllJrxaE1lVhHvq HlNM5nPx7S9Pi9vLeSId2WCUtA51/HlLIi64Se9HSpH0DqDyGr3YN/S/s4HOpFtg8pQkIR 3ylQO30xKjPMKxseCn5pXzUdIc7tOnidiGYMpkpG1KHBGvncNFpooWe4NF5ftcRI5JIpT1 sMCvyl5dROc5+P8xGVDWtTTrQCge3emKo7hUhjNIMAsF3u9YN39n9V6/DjqhMQ== 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 4MYL4r3NtGzRwt; Thu, 22 Sep 2022 16:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28MGGSBW050389; Thu, 22 Sep 2022 16:16:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MGGSTU050388; Thu, 22 Sep 2022 16:16:28 GMT (envelope-from git) Date: Thu, 22 Sep 2022 16:16:28 GMT Message-Id: <202209221616.28MGGSTU050388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7105f0d96753 - main - LinuxKPI: dma-mapping: add dmam_alloc_coherent() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7105f0d967530852b907375687575a8c2ba62fd2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863388; 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=cWBeg35s5Z0ISaeesTNZO0hI4FPx9RjPtzq5+ncXV1U=; b=bvQc1wLa4LX8DzM/l1Wove9j3MuvM3RD0FuGbpP4Se+HNNxuki1JCh5DmsvYY6gBdSU9NY hA3ZL9kVapg2S/5zpwO1XZSuxyPbHaia8zKnUcqo8Yz/Za/vGQFdN3uRtv5bCe0jPwlKLN oQ14AHvm/X4yDslRUwB8nLVwgPHXHk/TpCYCoSlaJkfghcUjPMh9tRNcFrlvgMRK93JlN4 zLH5cgtv0qDHcRTN6K8I8L0hpTDhMXPQwgGXMxI1YsPsfQMQM+ansKFauGQL0lusxuQF9V m/uvzIj4yQ5zr9bGpoTb2CfcCY6mEXoJx+9uq5v61ogVt04OJOCD0KQXCnYJDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663863388; a=rsa-sha256; cv=none; b=RjVo9JmpmNLclLQmcwvCk9qilfU54ENCgR87+EU/4l17AhiaT1vqnynUVg+RlfgxGZSi1B 1NCyELzKcH49x/Dp70A2vtGafpUl/JR8cyLcsrcSzh3CH6IyeWQRkR0aeVwkjq3p0NQmYP ymPsn9CyrLOVl2+BHSRAClRi37SNCV0kNx/xmLq9AH456dytpcoEyuAh4u/CFR5MA1GWkz v3pRP261ddQ2bVAc97gUsyGzKK4SNWZNu6jHzEcERXiUskHR3sSM6zIgcf+/UTkF/F4w9a N48REOkxovztoJoXdksM6Z8rTuN5EeQm+3wByGCOdlgBqKNSufzJEkqv/xVSeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7105f0d967530852b907375687575a8c2ba62fd2 commit 7105f0d967530852b907375687575a8c2ba62fd2 Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 20:58:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-22 15:10:03 +0000 LinuxKPI: dma-mapping: add dmam_alloc_coherent() Add the devres version dmam_alloc_coherent() of dma_alloc_coherent() along with the ancillary free function. Sponsored by: The FreeBSD Foundation MFC after: 7 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36661 --- .../linuxkpi/common/include/linux/dma-mapping.h | 10 ++++++ sys/compat/linuxkpi/common/src/linux_pci.c | 39 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 94adb0c64431..ef3570ef7639 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -95,6 +95,8 @@ int linux_dma_tag_init(struct device *, u64); int linux_dma_tag_init_coherent(struct device *, u64); void *linux_dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag); +void *linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, gfp_t flag); dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len); void linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t size); int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, @@ -159,6 +161,14 @@ dma_zalloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, return (dma_alloc_coherent(dev, size, dma_handle, flag | __GFP_ZERO)); } +static inline void * +dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, + gfp_t flag) +{ + + return (linuxkpi_dmam_alloc_coherent(dev, size, dma_handle, flag)); +} + static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 8a2667ae33c5..732da9b36261 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1139,6 +1139,45 @@ linux_dma_alloc_coherent(struct device *dev, size_t size, return (mem); } +struct lkpi_devres_dmam_coherent { + size_t size; + dma_addr_t *handle; + void *mem; +}; + +static void +lkpi_dmam_free_coherent(struct device *dev, void *p) +{ + struct lkpi_devres_dmam_coherent *dr; + + dr = p; + dma_free_coherent(dev, dr->size, dr->mem, *dr->handle); +} + +void * +linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, + gfp_t flag) +{ + struct lkpi_devres_dmam_coherent *dr; + + dr = lkpi_devres_alloc(lkpi_dmam_free_coherent, + sizeof(*dr), GFP_KERNEL | __GFP_ZERO); + + if (dr == NULL) + return (NULL); + + dr->size = size; + dr->mem = linux_dma_alloc_coherent(dev, size, dma_handle, flag); + dr->handle = dma_handle; + if (dr->mem == NULL) { + lkpi_devres_free(dr); + return (NULL); + } + + lkpi_devres_add(dev, dr); + return (dr->mem); +} + void linuxkpi_dma_sync(struct device *dev, dma_addr_t dma_addr, size_t size, bus_dmasync_op_t op)