Merge tag 'dma-mapping-6.6-2023-08-29' of git://git.infradead.org/users/hch/dma-mapping

[platform/kernel/linux-rpi.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index e5d71ba..93f646e 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -696,7 +696,7 @@
                        kernel/dma/contiguous.c
 
        cma_pernuma=nn[MG]
-                       [ARM64,KNL,CMA]
+                       [KNL,CMA]
                        Sets the size of kernel per-numa memory area for
                        contiguous memory allocations. A value of 0 disables
                        per-numa CMA altogether. And If this option is not
@@ -706,6 +706,17 @@
                        which is located in node nid, if the allocation fails,
                        they will fallback to the global default memory area.
 
+       numa_cma=<node>:nn[MG][,<node>:nn[MG]]
+                       [KNL,CMA]
+                       Sets the size of kernel numa memory area for
+                       contiguous memory allocations. It will reserve CMA
+                       area for the specified node.
+
+                       With numa CMA enabled, DMA users on node nid will
+                       first try to allocate buffer from the numa area
+                       which is located in node nid, if the allocation fails,
+                       they will fallback to the global default memory area.
+
        cmo_free_hint=  [PPC] Format: { yes | no }
                        Specify whether pages are marked as being inactive
                        when they are freed.  This is used in CMO environments