--- v15
+++ v4
@@ -1,110 +1,35 @@
-Update is_swiotlb_active to add a struct device argument. This will be
-useful later to allow for different pools.
+Add a new kconfig symbol, DMA_RESTRICTED_POOL, for restricted DMA pool.
Signed-off-by: Claire Chang <tientzu@chromium.org>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Tested-by: Stefano Stabellini <sstabellini@kernel.org>
-Tested-by: Will Deacon <will@kernel.org>
-Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---
- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +-
- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +-
- drivers/pci/xen-pcifront.c | 2 +-
- include/linux/swiotlb.h | 4 ++--
- kernel/dma/direct.c | 2 +-
- kernel/dma/swiotlb.c | 4 ++--
- 6 files changed, 8 insertions(+), 8 deletions(-)
+ kernel/dma/Kconfig | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
-diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.c b/drivers/gpu/drm/i915/gem/i915_gem_internal.c
-index a9d65fc8aa0e..4b7afa0fc85d 100644
---- a/drivers/gpu/drm/i915/gem/i915_gem_internal.c
-+++ b/drivers/gpu/drm/i915/gem/i915_gem_internal.c
-@@ -42,7 +42,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj)
+diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
+index 479fc145acfc..97ff9f8dd3c8 100644
+--- a/kernel/dma/Kconfig
++++ b/kernel/dma/Kconfig
+@@ -83,6 +83,20 @@ config SWIOTLB
+ bool
+ select NEED_DMA_MAP_STATE
- max_order = MAX_ORDER;
- #ifdef CONFIG_SWIOTLB
-- if (is_swiotlb_active()) {
-+ if (is_swiotlb_active(obj->base.dev->dev)) {
- unsigned int max_segment;
-
- max_segment = swiotlb_max_segment();
-diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-index 9662522aa066..be15bfd9e0ee 100644
---- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-@@ -321,7 +321,7 @@ nouveau_ttm_init(struct nouveau_drm *drm)
- }
-
- #if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)
-- need_swiotlb = is_swiotlb_active();
-+ need_swiotlb = is_swiotlb_active(dev->dev);
- #endif
-
- ret = ttm_bo_device_init(&drm->ttm.bdev, &nouveau_bo_driver,
-diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
-index b7a8f3a1921f..0d56985bfe81 100644
---- a/drivers/pci/xen-pcifront.c
-+++ b/drivers/pci/xen-pcifront.c
-@@ -693,7 +693,7 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev)
-
- spin_unlock(&pcifront_dev_lock);
-
-- if (!err && !is_swiotlb_active()) {
-+ if (!err && !is_swiotlb_active(&pdev->xdev->dev)) {
- err = pci_xen_swiotlb_init_late();
- if (err)
- dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n");
-diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
-index d1f3d95881cd..dd1c30a83058 100644
---- a/include/linux/swiotlb.h
-+++ b/include/linux/swiotlb.h
-@@ -112,7 +112,7 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
- void __init swiotlb_exit(void);
- unsigned int swiotlb_max_segment(void);
- size_t swiotlb_max_mapping_size(struct device *dev);
--bool is_swiotlb_active(void);
-+bool is_swiotlb_active(struct device *dev);
- void __init swiotlb_adjust_size(unsigned long size);
- #else
- #define swiotlb_force SWIOTLB_NO_FORCE
-@@ -132,7 +132,7 @@ static inline size_t swiotlb_max_mapping_size(struct device *dev)
- return SIZE_MAX;
- }
-
--static inline bool is_swiotlb_active(void)
-+static inline bool is_swiotlb_active(struct device *dev)
- {
- return false;
- }
-diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
-index 84c9feb5474a..7a88c34d0867 100644
---- a/kernel/dma/direct.c
-+++ b/kernel/dma/direct.c
-@@ -495,7 +495,7 @@ int dma_direct_supported(struct device *dev, u64 mask)
- size_t dma_direct_max_mapping_size(struct device *dev)
- {
- /* If SWIOTLB is active, use its maximum mapping size */
-- if (is_swiotlb_active() &&
-+ if (is_swiotlb_active(dev) &&
- (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE))
- return swiotlb_max_mapping_size(dev);
- return SIZE_MAX;
-diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
-index 72a4289faed1..8a120f42340b 100644
---- a/kernel/dma/swiotlb.c
-+++ b/kernel/dma/swiotlb.c
-@@ -664,9 +664,9 @@ size_t swiotlb_max_mapping_size(struct device *dev)
- return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE;
- }
-
--bool is_swiotlb_active(void)
-+bool is_swiotlb_active(struct device *dev)
- {
-- return io_tlb_default_mem != NULL;
-+ return dev->dma_io_tlb_mem != NULL;
- }
- EXPORT_SYMBOL_GPL(is_swiotlb_active);
-
++config DMA_RESTRICTED_POOL
++ bool "DMA Restricted Pool"
++ depends on OF && OF_RESERVED_MEM
++ select SWIOTLB
++ help
++ This enables support for restricted DMA pools which provide a level of
++ DMA memory protection on systems with limited hardware protection
++ capabilities, such as those lacking an IOMMU.
++
++ For more information see
++ <Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt>
++ and <kernel/dma/swiotlb.c>.
++ If unsure, say "n".
++
+ #
+ # Should be selected if we can mmap non-coherent mappings to userspace.
+ # The only thing that is really required is a way to set an uncached bit
--
-2.32.0.288.g62a8d224e6-goog
+2.30.0.478.g8a0d178c01-goog