Merge branch 'deepin-community:linux-6.6.y' into linux-6.6.y

Author: chench246

Documentation/devicetree/bindings/staging/phytium-npu.yaml

@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/staging/phytium-npu.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+title: Phytium NPU controller
+maintainers:
+  - Cheng Quan <chengquan@phytium.com.cn>
+properties:
+  compatible:
+    const: phytium,npu
+
+  reg:
+    items: 2
+      - description: NPU registers and PM registers
+
+  interrupts:
+    maxItems: 1
+
+  dma-mask:
+    maxItems: 1
+      - description: NPU dma capability
+
+required:
+  - compatible
+  - reg
+  - interrupts
+
+examples:
+  - |
+    npu@26d00000 {
+        compatible = "phytium,npu";
+		reg = <0x0 0x26d00000 0x0 0x80000
+               0x0 0x26fcc060 0x0 0x20>;
+        interrupts = <0 74 4>;
+        dma-mask=<0xff 0xffffffff>;
+    };

MAINTAINERS

@@ -6170,9 +6170,11 @@ S:	Maintained
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 F:	Documentation/driver-api/dma-buf.rst
 F:	drivers/dma-buf/
+F:	drivers/dma-buf/heaps/phytium_npu_heap.c
 F:	include/linux/*fence.h
 F:	include/linux/dma-buf.h
 F:	include/linux/dma-resv.h
+F:	include/linux/phytium_npu_dma_buf_heap.h
 K:	\bdma_(?:buf|fence|resv)\b
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

drivers/dma-buf/heaps/Kconfig

@@ -12,3 +12,11 @@ config DMABUF_HEAPS_CMA
 	  Choose this option to enable dma-buf CMA heap. This heap is backed
 	  by the Contiguous Memory Allocator (CMA). If your system has these
 	  regions, you should say Y here.
+
+config DMABUF_HEAPS_NPU_SYSTEM
+	bool "DMA-BUF for Phytium NPU system Heap"
+	depends on DMABUF_HEAPS && ARCH_PHYTIUM
+	help
+	  Choose this option to enable a new dma-buf system heap for the
+	  Phytium's NPU. The npu system heap is backed by pages from the buddy
+	  allocator. If your system has NPU driver, you should say Y here.

drivers/dma-buf/heaps/Makefile

@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
 obj-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_NPU_SYSTEM)		+= phytium_npu_heap.o