From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: Konrad Rzeszutek Wilk <konrad@darnok.org>,
linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org,
Michal Simek <monstr@monstr.eu>,
linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, Guan Xuetao <gxt@mprc.pku.edu.cn>,
x86@kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 22/34] dma-mapping: add an arch_dma_supported hook
Date: Fri, 12 Jan 2018 09:42:20 +0100 [thread overview]
Message-ID: <20180112084232.2857-23-hch__27599.6109623977$1515746843$gmane$org@lst.de> (raw)
In-Reply-To: <20180112084232.2857-1-hch@lst.de>
To implement the x86 forbid_dac and iommu_sac_force we want an arch hook
so that it can apply the global options across all dma_map_ops
implementations.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/x86/include/asm/dma-mapping.h | 3 +++
arch/x86/kernel/pci-dma.c | 19 ++++++++++++-------
include/linux/dma-mapping.h | 11 +++++++++++
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index dfdc9357a349..6277c83c0eb1 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -30,6 +30,9 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
return dma_ops;
}
+int arch_dma_supported(struct device *dev, u64 mask);
+#define arch_dma_supported arch_dma_supported
+
bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);
#define arch_dma_alloc_attrs arch_dma_alloc_attrs
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 61a8f1cb3829..df7ab02f959f 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -215,7 +215,7 @@ static __init int iommu_setup(char *p)
}
early_param("iommu", iommu_setup);
-int x86_dma_supported(struct device *dev, u64 mask)
+int arch_dma_supported(struct device *dev, u64 mask)
{
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
@@ -224,12 +224,6 @@ int x86_dma_supported(struct device *dev, u64 mask)
}
#endif
- /* Copied from i386. Doesn't make much sense, because it will
- only work for pci_alloc_coherent.
- The caller just has to use GFP_DMA in this case. */
- if (mask < DMA_BIT_MASK(24))
- return 0;
-
/* Tell the device to use SAC when IOMMU force is on. This
allows the driver to use cheaper accesses in some cases.
@@ -249,6 +243,17 @@ int x86_dma_supported(struct device *dev, u64 mask)
return 1;
}
+EXPORT_SYMBOL(arch_dma_supported);
+
+int x86_dma_supported(struct device *dev, u64 mask)
+{
+ /* Copied from i386. Doesn't make much sense, because it will
+ only work for pci_alloc_coherent.
+ The caller just has to use GFP_DMA in this case. */
+ if (mask < DMA_BIT_MASK(24))
+ return 0;
+ return 1;
+}
static int __init pci_iommu_init(void)
{
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 88bcb1a8211d..d67742dad904 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -576,6 +576,14 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
return 0;
}
+/*
+ * This is a hack for the legacy x86 forbid_dac and iommu_sac_force. Please
+ * don't use this is new code.
+ */
+#ifndef arch_dma_supported
+#define arch_dma_supported(dev, mask) (1)
+#endif
+
static inline void dma_check_mask(struct device *dev, u64 mask)
{
if (sme_active() && (mask < (((u64)sme_get_me_mask() << 1) - 1)))
@@ -588,6 +596,9 @@ static inline int dma_supported(struct device *dev, u64 mask)
if (!ops)
return 0;
+ if (!arch_dma_supported(dev, mask))
+ return 0;
+
if (!ops->dma_supported)
return 1;
return ops->dma_supported(dev, mask);
--
2.14.2
next prev parent reply other threads:[~2018-01-12 8:42 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180112084232.2857-1-hch@lst.de>
2018-01-12 8:41 ` [PATCH 01/34] alpha: mark jensen as broken Christoph Hellwig
2018-01-12 8:42 ` [PATCH 02/34] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-12 8:42 ` [PATCH 03/34] m32r: " Christoph Hellwig
2018-01-12 8:42 ` [PATCH 04/34] powerpc: " Christoph Hellwig
2018-01-12 8:42 ` [PATCH 05/34] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-12 8:42 ` [PATCH 06/34] m32r: remove the unused dma_capable helper Christoph Hellwig
2018-01-12 8:42 ` [PATCH 07/34] riscv: " Christoph Hellwig
2018-01-12 8:42 ` [PATCH 08/34] s390: " Christoph Hellwig
2018-01-12 8:42 ` [PATCH 09/34] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2018-01-12 8:42 ` [PATCH 10/34] arm64: don't override dma_max_pfn Christoph Hellwig
2018-01-12 8:42 ` [PATCH 11/34] mips: fix an off-by-one in dma_capable Christoph Hellwig
2018-01-12 8:42 ` [PATCH 12/34] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2018-01-12 8:42 ` [PATCH 13/34] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2018-01-12 8:42 ` [PATCH 14/34] hexagon: use the generic dma_capable helper Christoph Hellwig
2018-01-12 8:42 ` [PATCH 15/34] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-12 8:42 ` [PATCH 16/34] microblaze: rename dma_direct to dma_nommu Christoph Hellwig
2018-01-12 8:42 ` [PATCH 17/34] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2018-01-12 8:42 ` [PATCH 18/34] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2018-01-12 8:42 ` [PATCH 19/34] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2018-01-12 8:42 ` [PATCH 20/34] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
2018-01-12 8:42 ` [PATCH 21/34] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
2018-01-12 8:42 ` Christoph Hellwig [this message]
2018-01-12 8:42 ` [PATCH 23/34] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2018-01-12 8:42 ` [PATCH 24/34] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-12 8:42 ` [PATCH 25/34] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-12 8:42 ` [PATCH 26/34] dma-direct: add dma address sanity checks Christoph Hellwig
2018-01-12 8:42 ` [PATCH 27/34] dma-direct: add support for CMA allocation Christoph Hellwig
2018-01-12 8:42 ` [PATCH 28/34] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-12 8:42 ` [PATCH 29/34] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2018-01-12 8:42 ` [PATCH 30/34] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-12 8:42 ` [PATCH 31/34] dma-direct: make dma_direct_{alloc,free} available to other implementations Christoph Hellwig
2018-01-12 8:42 ` [PATCH 32/34] dma-direct: reject too small dma masks Christoph Hellwig
2018-01-12 8:42 ` [PATCH 33/34] cris: use dma-direct Christoph Hellwig
2018-01-12 8:42 ` [PATCH 34/34] h8300: " Christoph Hellwig
2018-01-16 7:52 ` consolidate direct dma mapping V4 Christoph Hellwig
[not found] ` <20180112084232.2857-23-hch@lst.de>
2018-02-02 17:47 ` [PATCH 22/34] dma-mapping: add an arch_dma_supported hook Randy Dunlap
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='20180112084232.2857-23-hch__27599.6109623977$1515746843$gmane$org@lst.de' \
--to=hch@lst.de \
--cc=gxt@mprc.pku.edu.cn \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad@darnok.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=patches@groups.riscv.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).