From 84361a5f795e152be4a3c72f411bfc536ec68269 Mon Sep 17 00:00:00 2001 From: Laura Abbott <lauraa@codeaurora.org> Date: Thu, 14 Nov 2013 11:29:38 -0800 Subject: [PATCH] cma: Change to reserve-contiguous-region Currently, devices are associated with CMA regions via phandle to the CMA region. The phandle name 'linux,contiguous-region' is the same as that which is used to designate a CMA region. This can lead to issues of trying to treat a device only using a CMA region as an actual CMA region. Rather than continuing to rely on this handle and the depth to differentiate CMA regions, just create separate DT binding linux,reserve-contiguous-region to indicate that the node is an actual CMA node for reserving rather than a client referencing via phandle. Change-Id: I88b2d86054525b0569efc424da87974509ce9b25 Signed-off-by: Laura Abbott <lauraa@codeaurora.org> --- Documentation/devicetree/bindings/memory.txt | 8 ++++---- arch/arm/boot/dts/qcom/apq8084.dtsi | 6 +++--- arch/arm/boot/dts/qcom/mdm9630.dtsi | 2 +- arch/arm/boot/dts/qcom/mpq8092.dtsi | 6 +++--- arch/arm/boot/dts/qcom/msm8226.dtsi | 10 +++++----- arch/arm/boot/dts/qcom/msm8610.dtsi | 2 +- arch/arm/boot/dts/qcom/msm8974.dtsi | 10 +++++----- arch/arm/boot/dts/qcom/msmsamarium.dtsi | 2 +- drivers/base/dma-contiguous.c | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Documentation/devicetree/bindings/memory.txt b/Documentation/devicetree/bindings/memory.txt index 3ee245ee8efa..699177d31710 100644 --- a/Documentation/devicetree/bindings/memory.txt +++ b/Documentation/devicetree/bindings/memory.txt @@ -34,7 +34,7 @@ wit the following convention: (name): region@(base-address) { reg = <(baseaddr) (size)>; - (linux,contiguous-region); + (linux,reserve-contiguous-region); (linux,default-contiguous-region); (linux,reserve-region); (linux,memory-limit); @@ -44,7 +44,7 @@ wit the following convention: name: an name given to the defined region. base-address: the base address of the defined region. size: the size of the memory region. -linux,contiguous-region: property indicating that the defined memory +linux,reserve-contiguous-region: property indicating that the defined memory region is used for contiguous memory allocations, Linux specific (optional) linux,default-contiguous-region: property indicating that the region @@ -98,13 +98,13 @@ logo appears. 0x70000000 0x10000000>; contig_mem: region@72000000 { - linux,contiguous-region; + linux,reserve-contiguous-region; linux,default-contiguous-region; reg = <0x72000000 0x4000000>; }; display_mem: region@78000000 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0x78000000 0x1000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi index dabdb3a4eb61..197a46c310e9 100644 --- a/arch/arm/boot/dts/qcom/apq8084.dtsi +++ b/arch/arm/boot/dts/qcom/apq8084.dtsi @@ -31,20 +31,20 @@ #size-cells = <2>; qsecom_mem: qsecom_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0 0 0x1100000>; label = "qseecom_mem"; }; fb_mem: fb_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0 0 0x1000000>; label = "fb_mem"; linux,memory-limit = <0xffffffff>; }; secure_mem: secure_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0 0 0xfc00000>; label = "secure_mem"; }; diff --git a/arch/arm/boot/dts/qcom/mdm9630.dtsi b/arch/arm/boot/dts/qcom/mdm9630.dtsi index 23bf9878c2ea..0ffd3e101f3f 100644 --- a/arch/arm/boot/dts/qcom/mdm9630.dtsi +++ b/arch/arm/boot/dts/qcom/mdm9630.dtsi @@ -26,7 +26,7 @@ memory { audio_mem: audio_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; linux,reserve-region; reg = <0 0xAF000>; label = "audio_mem"; diff --git a/arch/arm/boot/dts/qcom/mpq8092.dtsi b/arch/arm/boot/dts/qcom/mpq8092.dtsi index 1c3ef7bad749..b69b393cf368 100644 --- a/arch/arm/boot/dts/qcom/mpq8092.dtsi +++ b/arch/arm/boot/dts/qcom/mpq8092.dtsi @@ -31,20 +31,20 @@ memory { audio_mem: audio_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; linux,reserve-region; reg = <0 0x614000>; label = "audio_mem"; }; qseecom_mem: qseecom_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x1100000>; label = "qseecom_mem"; }; secure_mem: secure_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0xfc00000>; label = "secure_mem"; }; diff --git a/arch/arm/boot/dts/qcom/msm8226.dtsi b/arch/arm/boot/dts/qcom/msm8226.dtsi index 971a960be3d5..82c5de187e5a 100644 --- a/arch/arm/boot/dts/qcom/msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/msm8226.dtsi @@ -26,31 +26,31 @@ memory { secure_mem: secure_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x6D00000>; label = "secure_mem"; }; adsp_mem: adsp_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x2a00000>; label = "adsp_mem"; }; qsecom_mem: qsecom_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0xd00000>; label = "qsecom_mem"; }; fb_mem: fb_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x800000>; label = "fb_mem"; }; audio_mem: audio_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; linux,reserve-region; reg = <0 0x314000>; label = "audio_mem"; diff --git a/arch/arm/boot/dts/qcom/msm8610.dtsi b/arch/arm/boot/dts/qcom/msm8610.dtsi index e48188bd0d09..3750b8d69749 100644 --- a/arch/arm/boot/dts/qcom/msm8610.dtsi +++ b/arch/arm/boot/dts/qcom/msm8610.dtsi @@ -27,7 +27,7 @@ memory { qsecom_mem: qsecom_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x100000>; label = "qsecom_mem"; }; diff --git a/arch/arm/boot/dts/qcom/msm8974.dtsi b/arch/arm/boot/dts/qcom/msm8974.dtsi index 3b9d3d84b367..7e416745e71c 100644 --- a/arch/arm/boot/dts/qcom/msm8974.dtsi +++ b/arch/arm/boot/dts/qcom/msm8974.dtsi @@ -71,31 +71,31 @@ memory { secure_mem: secure_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0xFC00000>; label = "secure_mem"; }; adsp_mem: adsp_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x3F00000>; label = "adsp_mem"; }; qsecom_mem: qsecom_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x1100000>; label = "qseecom_mem"; }; fb_mem: fb_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x800000>; label = "fb_mem"; }; audio_mem: audio_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; linux,reserve-region; reg = <0 0x614000>; lable = "audio_mem"; diff --git a/arch/arm/boot/dts/qcom/msmsamarium.dtsi b/arch/arm/boot/dts/qcom/msmsamarium.dtsi index 0f706b33f535..51ea3abd7c13 100644 --- a/arch/arm/boot/dts/qcom/msmsamarium.dtsi +++ b/arch/arm/boot/dts/qcom/msmsamarium.dtsi @@ -27,7 +27,7 @@ memory { fb_mem: fb_region@0 { - linux,contiguous-region; + linux,reserve-contiguous-region; reg = <0 0x1400000>; label = "fb_mem"; }; diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 0321a12d6fc5..1eeb5ce1b14b 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -224,7 +224,7 @@ int __init cma_fdt_scan(unsigned long node, const char *uname, unsigned long addr_cells = dt_root_addr_cells; phys_addr_t limit = MEMBLOCK_ALLOC_ANYWHERE; - if (!of_get_flat_dt_prop(node, "linux,contiguous-region", NULL)) + if (!of_get_flat_dt_prop(node, "linux,reserve-contiguous-region", NULL)) return 0; prop = of_get_flat_dt_prop(node, "#size-cells", NULL); -- GitLab