From: Jonathan Marek <jonathan@marek.ca> To: freedreno@lists.freedesktop.org, hch@lst.de Cc: Marek Szyprowski <m.szyprowski@samsung.com>, Robin Murphy <robin.murphy@arm.com>, iommu@lists.linux-foundation.org (open list:DMA MAPPING HELPERS), linux-kernel@vger.kernel.org (open list) Subject: [RESEND PATCH v2 2/5] dma-direct: add dma_direct_bypass() to force direct ops Date: Sat, 14 Nov 2020 10:17:10 -0500 [thread overview] Message-ID: <20201114151717.5369-3-jonathan@marek.ca> (raw) In-Reply-To: <20201114151717.5369-1-jonathan@marek.ca> Add a function to force direct ops and disable swiotlb for a deivce. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- include/linux/dma-direct.h | 9 +++++++++ kernel/dma/direct.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 18aade195884..41f57e1b7aa5 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -124,4 +124,13 @@ int dma_direct_supported(struct device *dev, u64 mask); dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir, unsigned long attrs); +#if IS_ENABLED(CONFIG_DMA_OPS_BYPASS) && !IS_ENABLED(CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED) +int dma_direct_bypass(struct device *dev); +#else +static inline int dma_direct_bypass(struct device *dev) +{ + return -EIO; +} +#endif + #endif /* _LINUX_DMA_DIRECT_H */ diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 06c111544f61..304a5a77cccb 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -548,3 +548,26 @@ int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start, return 0; } EXPORT_SYMBOL_GPL(dma_direct_set_offset); + +/** + * dma_direct_bypass - always use direct mapping path for device + * @dev: device pointer + * + * Note: this also bypasses swiotlb. Not available for arch with + * force_dma_unencrypted(), since this doesn't deal with that. + */ +#if IS_ENABLED(CONFIG_DMA_OPS_BYPASS) && !IS_ENABLED(CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED) +int dma_direct_bypass(struct device *dev) +{ + int ret; + + ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); + if (ret) + return ret; + + dev->bus_dma_limit = DMA_BIT_MASK(64); + dev->dma_ops_bypass = true; + return 0; +} +EXPORT_SYMBOL_GPL(dma_direct_bypass); +#endif -- 2.26.1
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Marek <jonathan@marek.ca> To: freedreno@lists.freedesktop.org, hch@lst.de Cc: "open list:DMA MAPPING HELPERS" <iommu@lists.linux-foundation.org>, Robin Murphy <robin.murphy@arm.com>, open list <linux-kernel@vger.kernel.org> Subject: [RESEND PATCH v2 2/5] dma-direct: add dma_direct_bypass() to force direct ops Date: Sat, 14 Nov 2020 10:17:10 -0500 [thread overview] Message-ID: <20201114151717.5369-3-jonathan@marek.ca> (raw) In-Reply-To: <20201114151717.5369-1-jonathan@marek.ca> Add a function to force direct ops and disable swiotlb for a deivce. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- include/linux/dma-direct.h | 9 +++++++++ kernel/dma/direct.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 18aade195884..41f57e1b7aa5 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -124,4 +124,13 @@ int dma_direct_supported(struct device *dev, u64 mask); dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir, unsigned long attrs); +#if IS_ENABLED(CONFIG_DMA_OPS_BYPASS) && !IS_ENABLED(CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED) +int dma_direct_bypass(struct device *dev); +#else +static inline int dma_direct_bypass(struct device *dev) +{ + return -EIO; +} +#endif + #endif /* _LINUX_DMA_DIRECT_H */ diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 06c111544f61..304a5a77cccb 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -548,3 +548,26 @@ int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start, return 0; } EXPORT_SYMBOL_GPL(dma_direct_set_offset); + +/** + * dma_direct_bypass - always use direct mapping path for device + * @dev: device pointer + * + * Note: this also bypasses swiotlb. Not available for arch with + * force_dma_unencrypted(), since this doesn't deal with that. + */ +#if IS_ENABLED(CONFIG_DMA_OPS_BYPASS) && !IS_ENABLED(CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED) +int dma_direct_bypass(struct device *dev) +{ + int ret; + + ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); + if (ret) + return ret; + + dev->bus_dma_limit = DMA_BIT_MASK(64); + dev->dma_ops_bypass = true; + return 0; +} +EXPORT_SYMBOL_GPL(dma_direct_bypass); +#endif -- 2.26.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-11-14 15:21 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-14 15:17 [RESEND PATCH v2 0/5] drm/msm: support for host-cached BOs Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek 2020-11-14 15:17 ` [RESEND PATCH v2 1/5] drm/msm: add MSM_BO_CACHED_COHERENT Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek [this message] 2020-11-14 15:17 ` [RESEND PATCH v2 2/5] dma-direct: add dma_direct_bypass() to force direct ops Jonathan Marek 2020-11-14 16:21 ` Christoph Hellwig 2020-11-14 16:21 ` Christoph Hellwig 2020-11-14 15:17 ` [RESEND PATCH v2 3/5] drm/msm: call dma_direct_bypass() Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek 2020-11-14 16:21 ` Christoph Hellwig 2020-11-14 15:17 ` [RESEND PATCH v2 4/5] drm/msm: add DRM_MSM_GEM_SYNC_CACHE for non-coherent cache maintenance Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek 2020-11-14 16:24 ` Christoph Hellwig 2020-11-14 18:46 ` Rob Clark 2020-11-14 18:46 ` Rob Clark 2020-11-14 18:54 ` Jonathan Marek 2020-11-14 18:54 ` Jonathan Marek 2020-11-14 19:39 ` Rob Clark 2020-11-14 19:39 ` Rob Clark 2020-11-14 20:07 ` Jonathan Marek 2020-11-14 20:07 ` Jonathan Marek 2020-11-14 20:48 ` Rob Clark 2020-11-14 20:48 ` Rob Clark 2020-11-16 17:33 ` Christoph Hellwig 2020-11-16 17:50 ` Rob Clark 2020-11-16 17:50 ` Rob Clark 2020-11-16 17:52 ` Jonathan Marek 2020-11-16 17:52 ` Jonathan Marek 2020-11-29 18:51 ` Rob Clark 2020-11-29 18:51 ` Rob Clark 2020-11-16 17:27 ` [Freedreno] " Jordan Crouse 2020-11-16 17:27 ` Jordan Crouse 2020-11-16 17:25 ` Jordan Crouse 2020-11-16 17:25 ` Jordan Crouse 2020-11-14 15:17 ` [RESEND PATCH v2 5/5] drm/msm: bump up the uapi version Jonathan Marek 2020-11-14 15:17 ` Jonathan Marek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201114151717.5369-3-jonathan@marek.ca \ --to=jonathan@marek.ca \ --cc=freedreno@lists.freedesktop.org \ --cc=hch@lst.de \ --cc=iommu@lists.linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=robin.murphy@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.