Commit 83850b04 authored Jun 12, 2014 by Geert Uytterhoeven Committed by Simon Horman Jun 17, 2014

ARM: shmobile: rcar-gen2: Update for of_get_flat_dt_prop() update



Commit 9d0c4dfe ("of/fdt: update
of_get_flat_dt_prop in prep for libfdt") changed the function prototypes
of of_get_flat_dt_prop():
  - The return type was made const,
  - The last parameter was changed from "unsigned long *" to "int *".
and dt_mem_next_cell():
  - The second parameter was made const.

This causes the following compiler warnings:

arch/arm/mach-shmobile/setup-rcar-gen2.c: In function 'rcar_gen2_scan_mem':
arch/arm/mach-shmobile/setup-rcar-gen2.c:125:15: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
arch/arm/mach-shmobile/setup-rcar-gen2.c:142:2: warning: passing argument 3 of 'of_get_flat_dt_prop' from incompatible pointer type [enabled by default]
include/linux/of_fdt.h:53:20: note: expected 'int *' but argument is of type 'long unsigned int *'
arch/arm/mach-shmobile/setup-rcar-gen2.c:142:6: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
arch/arm/mach-shmobile/setup-rcar-gen2.c:144:3: warning: passing argument 3 of 'of_get_flat_dt_prop' from incompatible pointer type [enabled by default]
include/linux/of_fdt.h:53:20: note: expected 'int *' but argument is of type 'long unsigned int *'
arch/arm/mach-shmobile/setup-rcar-gen2.c:144:7: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
arch/arm/mach-shmobile/setup-rcar-gen2.c:152:3: warning: passing argument 2 of 'dt_mem_next_cell' from incompatible pointer type [enabled by default]
include/linux/of_fdt.h:69:12: note: expected 'const __be32 **' but argument is of type '__be32 **'
arch/arm/mach-shmobile/setup-rcar-gen2.c:153:3: warning: passing argument 2 of 'dt_mem_next_cell' from incompatible pointer type [enabled by default]
include/linux/of_fdt.h:69:12: note: expected 'const __be32 **' but argument is of type '__be32 **'

Update the variable types in rcar_gen2_scan_mem() to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: rebased]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent f8e81935

arch/arm/mach-shmobile/setup-rcar-gen2.c

+76 −0

Original line number	Diff line number	Diff line
		@@ -113,3 +113,79 @@ void __init rcar_gen2_timer_init(void)
		#endif
		clocksource_of_init();
		}

		struct memory_reserve_config {
		u64 reserved;
		u64 base, size;
		};

		static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname,
		int depth, void *data)
		{
		const char *type = of_get_flat_dt_prop(node, "device_type", NULL);
		const __be32 reg, endp;
		int l;
		struct memory_reserve_config *mrc = data;
		u64 lpae_start = (u64)1 << 32;

		/* We are scanning "memory" nodes only */
		if (type == NULL) {
		/*
		* The longtrail doesn't have a device_type on the
		* /memory node, so look for the node called /memory@0.
		*/
		if (depth != 1 \|\| strcmp(uname, "memory@0") != 0)
		return 0;
		} else if (strcmp(type, "memory") != 0)
		return 0;

		reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);
		if (reg == NULL)
		reg = of_get_flat_dt_prop(node, "reg", &l);
		if (reg == NULL)
		return 0;

		endp = reg + (l / sizeof(__be32));
		while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
		u64 base, size;

		base = dt_mem_next_cell(dt_root_addr_cells, &reg);
		size = dt_mem_next_cell(dt_root_size_cells, &reg);

		if (base >= lpae_start)
		continue;

		if ((base + size) >= lpae_start)
		size = lpae_start - base;

		if (size < mrc->reserved)
		continue;

		if (base < mrc->base)
		continue;

		/* keep the area at top near the 32-bit legacy limit */
		mrc->base = base + size - mrc->reserved;
		mrc->size = mrc->reserved;
		}

		return 0;
		}

		struct cma *rcar_gen2_dma_contiguous;

		void __init rcar_gen2_reserve(void)
		{
		struct memory_reserve_config mrc;

		/* reserve 256 MiB at the top of the physical legacy 32-bit space */
		memset(&mrc, 0, sizeof(mrc));
		mrc.reserved = SZ_256M;

		of_scan_flat_dt(rcar_gen2_scan_mem, &mrc);
		#ifdef CONFIG_DMA_CMA
		if (mrc.size)
		dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
		&rcar_gen2_dma_contiguous);
		#endif
		}