--- v5
+++ v14
@@ -1,144 +1,110 @@
-Add the initialization function to create restricted DMA pools from
-matching reserved-memory nodes.
+Update is_swiotlb_active to add a struct device argument. This will be
+useful later to allow for different pools.
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>
---
- include/linux/device.h | 4 +++
- include/linux/swiotlb.h | 3 +-
- kernel/dma/swiotlb.c | 80 +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 86 insertions(+), 1 deletion(-)
+ 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(-)
-diff --git a/include/linux/device.h b/include/linux/device.h
-index 38a2071cf776..4987608ea4ff 100644
---- a/include/linux/device.h
-+++ b/include/linux/device.h
-@@ -416,6 +416,7 @@ struct dev_links_info {
- * @dma_pools: Dma pools (if dma'ble device).
- * @dma_mem: Internal for coherent mem override.
- * @cma_area: Contiguous memory area for dma allocations
-+ * @dma_io_tlb_mem: Internal for swiotlb io_tlb_mem override.
- * @archdata: For arch-specific additions.
- * @of_node: Associated device tree node.
- * @fwnode: Associated device node supplied by platform firmware.
-@@ -521,6 +522,9 @@ struct device {
- #ifdef CONFIG_DMA_CMA
- struct cma *cma_area; /* contiguous memory area for dma
- allocations */
-+#endif
-+#ifdef CONFIG_DMA_RESTRICTED_POOL
-+ struct io_tlb_mem *dma_io_tlb_mem;
+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)
+
+ 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
- /* arch specific additions */
- struct dev_archdata archdata;
+
+ 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 216854a5e513..03ad6e3b4056 100644
+index d1f3d95881cd..dd1c30a83058 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
-@@ -72,7 +72,8 @@ extern enum swiotlb_force swiotlb_force;
- * range check to see if the memory was in fact allocated by this
- * API.
- * @nslabs: The number of IO TLB blocks (in groups of 64) between @start and
-- * @end. This is command line adjustable via setup_io_tlb_npages.
-+ * @end. For default swiotlb, this is command line adjustable via
-+ * setup_io_tlb_npages.
- * @used: The number of used IO TLB block.
- * @list: The free list describing the number of free entries available
- * from each index.
+@@ -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 57a9adb920bf..ffbb8724e06c 100644
+index 72a4289faed1..8a120f42340b 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
-@@ -39,6 +39,13 @@
- #ifdef CONFIG_DEBUG_FS
- #include <linux/debugfs.h>
- #endif
-+#ifdef CONFIG_DMA_RESTRICTED_POOL
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_fdt.h>
-+#include <linux/of_reserved_mem.h>
-+#include <linux/slab.h>
-+#endif
+@@ -664,9 +664,9 @@ size_t swiotlb_max_mapping_size(struct device *dev)
+ return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE;
+ }
- #include <asm/io.h>
- #include <asm/dma.h>
-@@ -681,3 +688,76 @@ static int __init swiotlb_create_default_debugfs(void)
- late_initcall(swiotlb_create_default_debugfs);
+-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);
- #endif
-+
-+#ifdef CONFIG_DMA_RESTRICTED_POOL
-+static int rmem_swiotlb_device_init(struct reserved_mem *rmem,
-+ struct device *dev)
-+{
-+ struct io_tlb_mem *mem = rmem->priv;
-+ unsigned long nslabs = rmem->size >> IO_TLB_SHIFT;
-+
-+ if (dev->dma_io_tlb_mem)
-+ return 0;
-+
-+ /* Since multiple devices can share the same pool, the private data,
-+ * io_tlb_mem struct, will be initialized by the first device attached
-+ * to it.
-+ */
-+ if (!mem) {
-+ mem = kzalloc(struct_size(mem, slots, nslabs), GFP_KERNEL);
-+ if (!mem)
-+ return -ENOMEM;
-+#ifdef CONFIG_ARM
-+ if (!PageHighMem(pfn_to_page(PHYS_PFN(rmem->base)))) {
-+ kfree(mem);
-+ return -EINVAL;
-+ }
-+#endif /* CONFIG_ARM */
-+ swiotlb_init_io_tlb_mem(mem, rmem->base, nslabs, false);
-+
-+ rmem->priv = mem;
-+ }
-+
-+#ifdef CONFIG_DEBUG_FS
-+ if (!io_tlb_default_mem->debugfs)
-+ io_tlb_default_mem->debugfs =
-+ debugfs_create_dir("swiotlb", NULL);
-+
-+ swiotlb_create_debugfs(mem, rmem->name, io_tlb_default_mem->debugfs);
-+#endif /* CONFIG_DEBUG_FS */
-+
-+ dev->dma_io_tlb_mem = mem;
-+
-+ return 0;
-+}
-+
-+static void rmem_swiotlb_device_release(struct reserved_mem *rmem,
-+ struct device *dev)
-+{
-+ if (dev)
-+ dev->dma_io_tlb_mem = NULL;
-+}
-+
-+static const struct reserved_mem_ops rmem_swiotlb_ops = {
-+ .device_init = rmem_swiotlb_device_init,
-+ .device_release = rmem_swiotlb_device_release,
-+};
-+
-+static int __init rmem_swiotlb_setup(struct reserved_mem *rmem)
-+{
-+ unsigned long node = rmem->fdt_node;
-+
-+ if (of_get_flat_dt_prop(node, "reusable", NULL) ||
-+ of_get_flat_dt_prop(node, "linux,cma-default", NULL) ||
-+ of_get_flat_dt_prop(node, "linux,dma-default", NULL) ||
-+ of_get_flat_dt_prop(node, "no-map", NULL))
-+ return -EINVAL;
-+
-+ rmem->ops = &rmem_swiotlb_ops;
-+ pr_info("Reserved memory: created device swiotlb memory pool at %pa, size %ld MiB\n",
-+ &rmem->base, (unsigned long)rmem->size / SZ_1M);
-+ return 0;
-+}
-+
-+RESERVEDMEM_OF_DECLARE(dma, "restricted-dma-pool", rmem_swiotlb_setup);
-+#endif /* CONFIG_DMA_RESTRICTED_POOL */
--
-2.31.1.368.gbe11c130af-goog
+2.32.0.288.g62a8d224e6-goog