Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: soc/fsl: Update reserved memory binding for QBMan

Updates the QMan and BMan device tree bindings for reserved memory
nodes. This makes the reserved memory allocation compatible with
the shared-dma-pool usage.

Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Li Yang <leoyang.li@nxp.com>

authored by

Roy Pledge and committed by
Li Yang
d2101078 07f86917

+26 -12
+7 -5
Documentation/devicetree/bindings/soc/fsl/bman.txt
··· 65 65 BMan Private Memory Node 66 66 67 67 BMan requires a contiguous range of physical memory used for the backing store 68 - for BMan Free Buffer Proxy Records (FBPR). This memory is reserved/allocated as a 69 - node under the /reserved-memory node 68 + for BMan Free Buffer Proxy Records (FBPR). This memory is reserved/allocated as 69 + a node under the /reserved-memory node. 70 70 71 71 The BMan FBPR memory node must be named "bman-fbpr" 72 72 ··· 75 75 - compatible 76 76 Usage: required 77 77 Value type: <stringlist> 78 - Definition: Must inclide "fsl,bman-fbpr" 78 + Definition: PPC platforms: Must include "fsl,bman-fbpr" 79 + ARM platforms: Must include "shared-dma-pool" 80 + as well as the "no-map" property 79 81 80 82 The following constraints are relevant to the FBPR private memory: 81 83 - The size must be 2^(size + 1), with size = 11..33. That is 4 KiB to ··· 102 100 ranges; 103 101 104 102 bman_fbpr: bman-fbpr { 105 - compatible = "fsl,bman-fbpr"; 106 - alloc-ranges = <0 0 0x10 0>; 103 + compatible = "shared-mem-pool"; 107 104 size = <0 0x1000000>; 108 105 alignment = <0 0x1000000>; 106 + no-map; 109 107 }; 110 108 }; 111 109
+19 -7
Documentation/devicetree/bindings/soc/fsl/qman.txt
··· 60 60 Value type: <prop-encoded-array> 61 61 Definition: Reference input clock. Its frequency is half of the 62 62 platform clock 63 + - memory-regions 64 + Usage: Required for ARM 65 + Value type: <phandle array> 66 + Definition: List of phandles referencing the QMan private memory 67 + nodes (described below). The qman-fqd node must be 68 + first followed by qman-pfdr node. Only used on ARM 63 69 64 70 Devices connected to a QMan instance via Direct Connect Portals (DCP) must link 65 71 to the respective QMan instance ··· 80 74 81 75 QMan requires two contiguous range of physical memory used for the backing store 82 76 for QMan Frame Queue Descriptor (FQD) and Packed Frame Descriptor Record (PFDR). 83 - This memory is reserved/allocated as a nodes under the /reserved-memory node 77 + This memory is reserved/allocated as a node under the /reserved-memory node. 78 + 79 + For additional details about reserved memory regions see reserved-memory.txt 84 80 85 81 The QMan FQD memory node must be named "qman-fqd" 86 82 ··· 91 83 - compatible 92 84 Usage: required 93 85 Value type: <stringlist> 94 - Definition: Must inclide "fsl,qman-fqd" 86 + Definition: PPC platforms: Must include "fsl,qman-fqd" 87 + ARM platforms: Must include "shared-dma-pool" 88 + as well as the "no-map" property 95 89 96 90 The QMan PFDR memory node must be named "qman-pfdr" 97 91 ··· 102 92 - compatible 103 93 Usage: required 104 94 Value type: <stringlist> 105 - Definition: Must inclide "fsl,qman-pfdr" 95 + Definition: PPC platforms: Must include "fsl,qman-pfdr" 96 + ARM platforms: Must include "shared-dma-pool" 97 + as well as the "no-map" property 106 98 107 99 The following constraints are relevant to the FQD and PFDR private memory: 108 100 - The size must be 2^(size + 1), with size = 11..29. That is 4 KiB to ··· 129 117 ranges; 130 118 131 119 qman_fqd: qman-fqd { 132 - compatible = "fsl,qman-fqd"; 133 - alloc-ranges = <0 0 0x10 0>; 120 + compatible = "shared-dma-pool"; 134 121 size = <0 0x400000>; 135 122 alignment = <0 0x400000>; 123 + no-map; 136 124 }; 137 125 qman_pfdr: qman-pfdr { 138 - compatible = "fsl,qman-pfdr"; 139 - alloc-ranges = <0 0 0x10 0>; 126 + compatible = "shared-dma-pool"; 140 127 size = <0 0x2000000>; 141 128 alignment = <0 0x2000000>; 129 + no-map; 142 130 }; 143 131 }; 144 132