Merge branch 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 65d84b6..e270cb7 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -424,6 +424,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: Pointer to the swiotlb pool used.  Not for driver use.
  * @archdata:  For arch-specific additions.
  * @of_node:   Associated device tree node.
  * @fwnode:    Associated device node supplied by platform firmware.
@@ -534,6 +535,9 @@ struct device {
        struct cma *cma_area;           /* contiguous memory area for dma
                                           allocations */
 #endif
+#ifdef CONFIG_SWIOTLB
+       struct io_tlb_mem *dma_io_tlb_mem;
+#endif
        /* arch specific additions */
        struct dev_archdata     archdata;