Skip to contentSkip to conversation

Support non-default CMA regions to the dmabuf heaps interface

RFC PATCH In review John Stultz 3 participants 7 messages Oct 25, 2019 – Oct 30, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover Support non-default CMA regions to the dmabuf heaps interface

Now that the dmabuf heaps core code has been queued, I wanted to submit for initial review some of the changes I have pending.

In previous versions, the dmabuf CMA heap added all CMA areas to the dmabuf heaps interface. However, Andrew noted this may not be desirable, so I've come up with a DT binding and code to allow specified CMA regions to be added to the dmabuf heaps interface.

This allows additional CMA regions for things like cameras, etc to be allocated from separately from the default region.

Review and feedback would be greatly appreciated!

thanks
-john

Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hridya Valsaraju <[email protected]>

John Stultz (3):
dt-bindings: dma-buf: heaps: Describe CMA regions to be added to
dmabuf heaps interface.
dma-buf: heaps: Allow adding specified non-default CMA heaps
example: dts: hi3660-hikey960: Add dts entries to test cma heap
binding

 .../bindings/dma/dmabuf-heap-cma.txt          | 31 +++++++++++++++
 .../boot/dts/hisilicon/hi3660-hikey960.dts    | 13 ++++++-
 drivers/dma-buf/heaps/cma_heap.c              | 38 +++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

RFC PATCH 1/3 dt-bindings: dma-buf: heaps: Describe CMA regions to be added to dmabuf heaps interface.

This binding specifies which CMA regions should be added to the dmabuf heaps interface.

Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hridya Valsaraju <[email protected]>
---
 .../bindings/dma/dmabuf-heap-cma.txt          | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +31 -0
new file mode 100644
index 000000000000..bde7b1f1c269
@@ -0,0 +1,31 @@
+* DMA-BUF CMA Heap
+
+Specifies a CMA region that should be added to the dma-buf heaps
+interface.
+
+Required properties:
+- compatible: Must be "dmabuf-heap-cma"
+- memory-region: phandle to a CMA reserved memory node
+
+Example:
+This example has a camera CMA node in reserved memory, which is then
+referenced by the dmabuf-heap-cma node.
+
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		...
+		cma_camera: cma-camera {
+			compatible = "shared-dma-pool";
+			reg = <0x0 0x24C00000 0x0 0x4000000>;
+			reusable;
+		};
+		...
+	};
+
+       cma_heap {
+               compatible = "dmabuf-heap-cma";
+               memory-region = <&cma_camera>;
+        };
Signature · 1 line
2.17.1
#2 lore raw

Re: [RFC][PATCH 1/3] dt-bindings: dma-buf: heaps: Describe CMA regions to be added to dmabuf heaps interface.

Quoted 3 lines · John Stultz

This binding specifies which CMA regions should be added to the dmabuf heaps interface.

Is this an ION DT binding in disguise? I thought I killed that. ;)

Quoted 48 lines
Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hridya Valsaraju <[email protected]>
---
 .../bindings/dma/dmabuf-heap-cma.txt          | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +20 -0
new file mode 100644
index 000000000000..bde7b1f1c269
@@ -0,0 +1,31 @@
+* DMA-BUF CMA Heap
+
+Specifies a CMA region that should be added to the dma-buf heaps
+interface.
+
+Required properties:
+- compatible: Must be "dmabuf-heap-cma"
+- memory-region: phandle to a CMA reserved memory node
+
+Example:
+This example has a camera CMA node in reserved memory, which is then
+referenced by the dmabuf-heap-cma node.
+
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               ...
+               cma_camera: cma-camera {

Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt line 30

Quoted 10 lines
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +10 -0
+                       compatible = "shared-dma-pool";
+                       reg = <0x0 0x24C00000 0x0 0x4000000>;
+                       reusable;
+               };
+               ...
+       };
+
+       cma_heap {
+               compatible = "dmabuf-heap-cma";
+               memory-region = <&cma_camera>;

Why the indirection here? Can't you just add a flag property to reserved-memory nodes like we do to flag CMA nodes?

As I suspected, it's because in patch 2 you're just abusing DT to instantiate platform devices. We already support binding drivers to reserved-memory nodes directly.

Rob

#3 lore raw

Re: [RFC][PATCH 1/3] dt-bindings: dma-buf: heaps: Describe CMA regions to be added to dmabuf heaps interface.

Quoted 7 lines · Rob Herring
Quoted 3 lines · John Stultz

This binding specifies which CMA regions should be added to the dmabuf heaps interface.

Is this an ION DT binding in disguise? I thought I killed that. ;)

Maybe? I may not have been paying attention back then. :)

Quoted 16 lines
Quoted 16 lines
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +16 -0
+Example:
+This example has a camera CMA node in reserved memory, which is then
+referenced by the dmabuf-heap-cma node.
+
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               ...
+               cma_camera: cma-camera {
+                       compatible = "shared-dma-pool";
+                       reg = <0x0 0x24C00000 0x0 0x4000000>;
+                       reusable;
+               };
+               ...
Quoted 8 lines

Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt line 30

Quoted 5 lines
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +5 -0
+       };
+
+       cma_heap {
+               compatible = "dmabuf-heap-cma";
+               memory-region = <&cma_camera>;

Why the indirection here? Can't you just add a flag property to reserved-memory nodes like we do to flag CMA nodes?

Happy to try. Do you mean like with the "reuasable" tag? Or more like the "linux,cma-default" tag?

Do you have a preference for the flag name here?

Quoted 3 lines

As I suspected, it's because in patch 2 you're just abusing DT to instantiate platform devices. We already support binding drivers to reserved-memory nodes directly.

Sorry, one of those "when all you know how to do is hammer, everything looks like a nail" issues.
Is there a specific example for binding drivers to reserved-memory nodes I can try to follow?

Appreciate the review and feedback!

thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#4 lore raw

Re: [RFC][PATCH 1/3] dt-bindings: dma-buf: heaps: Describe CMA regions to be added to dmabuf heaps interface.

Quoted 36 lines · John Stultz
Quoted 7 lines · Rob Herring
Quoted 3 lines · John Stultz

This binding specifies which CMA regions should be added to the dmabuf heaps interface.

Is this an ION DT binding in disguise? I thought I killed that. ;)

Maybe? I may not have been paying attention back then. :)

Quoted 16 lines
Quoted 16 lines
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +16 -0
+Example:
+This example has a camera CMA node in reserved memory, which is then
+referenced by the dmabuf-heap-cma node.
+
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               ...
+               cma_camera: cma-camera {
+                       compatible = "shared-dma-pool";
+                       reg = <0x0 0x24C00000 0x0 0x4000000>;
+                       reusable;
+               };
+               ...
Quoted 8 lines

Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt line 30

Quoted 5 lines
Documentation/devicetree/bindings/dma/dmabuf-heap-cma.txt new file +5 -0
+       };
+
+       cma_heap {
+               compatible = "dmabuf-heap-cma";
+               memory-region = <&cma_camera>;

Why the indirection here? Can't you just add a flag property to reserved-memory nodes like we do to flag CMA nodes?

Quoted 2 lines

Happy to try. Do you mean like with the "reuasable" tag? Or more like the "linux,cma-default" tag?

Probably like "linux,cma-default" as it is a hint for who to manage it rather than a characteristic of the region.

Quoted 1 line

Do you have a preference for the flag name here?

Not really.

Quoted 8 lines
Quoted 3 lines

As I suspected, it's because in patch 2 you're just abusing DT to instantiate platform devices. We already support binding drivers to reserved-memory nodes directly.

Sorry, one of those "when all you know how to do is hammer, everything looks like a nail" issues.
Is there a specific example for binding drivers to reserved-memory nodes I can try to follow?

ramoops and I think there's a QCom driver.

Rob

#5 lore raw

RFC PATCH 2/3 dma-buf: heaps: Allow adding specified non-default CMA heaps

In reply to John Stultz

In earlier versions of the dmabuf CMA heap, we added all CMA areas as CMA heaps. Andrew noted this might not be desired, and so we changed the code to only add the default CMA area.

This patch extends the earlier effort so that devices can specifiy which CMA areas they want to add as dmabuf heaps via DT, and we'll only add those.

This allows multiple CMA areas to be exported via the dmabuf heaps interface.

Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hridya Valsaraju <[email protected]>
---
 drivers/dma-buf/heaps/cma_heap.c | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
drivers/dma-buf/heaps/cma_heap.c +38 -0
index 064926b5d735..0d5231a1e561 100644
@@ -15,6 +15,9 @@
 #include <linux/errno.h>
 #include <linux/highmem.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <linux/sched/signal.h>
@@ -174,5 +177,40 @@ static int add_default_cma_heap(void)
 	return ret;
 }
 module_init(add_default_cma_heap);
+
+static int cma_heaps_probe(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct cma *cma_area;
+	int ret;
+
+	ret = of_reserved_mem_device_init_by_idx(&pdev->dev, np, 0);
+	if (ret) {
+		pr_err("Error %s(): of_reserved_mem_device_init_by_idx failed!\n", __func__);
+		return ret;
+	}
+
+	cma_area = dev_get_cma_area(&pdev->dev);
+	if (cma_area)
+		ret = __add_cma_heap(cma_area, NULL);
+
+	return ret;
+}
+
+static const struct of_device_id cma_heap_dt_ids[] = {
+	{ .compatible = "dmabuf-heap-cma" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, cma_heap_dt_ids);
+
+static struct platform_driver cma_heaps_driver = {
+	.driver	= {
+		.name		= "CMA Heaps",
+		.of_match_table	= cma_heap_dt_ids,
+	},
+	.probe	= cma_heaps_probe,
+};
+
+module_platform_driver(cma_heaps_driver);
 MODULE_DESCRIPTION("DMA-BUF CMA Heap");
 MODULE_LICENSE("GPL v2");
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#6 lore raw

RFC PATCH 3/3 example: dts: hi3660-hikey960: Add dts entries to test cma heap binding

In reply to John Stultz

Adds example test entry to create and expose a camera cma region via the dmabuf heaps interface

This isn't a patch I'm submitting to merge, but just an example of how this functionality can be used, which I've used for testing.

Cc Rob Herring <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hridya Valsaraju <[email protected]>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +12 -1
index 190ac29b9e2f..783c5b2abd2d 100644
@@ -75,12 +75,23 @@
 		};
 
 		/* global autoconfigured region for contiguous allocations */
-		linux,cma {
+		cma_default: linux,cma {
 			compatible = "shared-dma-pool";
 			reg = <0x0 0x20C00000 0x0 0x4000000>;
 			reusable;
 			linux,cma-default;
 		};
+
+		cma_camera: cma-camera {
+			compatible = "shared-dma-pool";
+			reg = <0x0 0x24C00000 0x0 0x4000000>;
+			reusable;
+		};
+	};
+
+	cma_heap {
+		compatible = "dmabuf-heap-cma";
+		memory-region = <&cma_camera>;
 	};
 
 	reboot-mode-syscon@32100000 {
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel