Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1306c08a authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Tony Lindgren
Browse files

ARM: OMAP4+: Remove static iotable mappings for SRAM 



In order to handle errata I688, a page of sram was reserved by doing a
static iotable map. Now that we use gen_pool to manage sram, we can
completely remove all of these static mappings and use gen_pool_alloc()
to get the one page of sram space needed to implement errata I688.
omap_bus_sync will be NOP until SRAM initialization happens.

Suggested-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarDave Gerlach <d-gerlach@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8b9a2810

Documentation/devicetree/bindings/arm/omap/mpu.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Required properties: 
	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"



Optional properties:

- sram:	Phandle to the ocmcram node



Examples:



- For an OMAP5 SMP system:

arch/arm/boot/dts/omap4.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
		mpu {

			compatible = "ti,omap4-mpu";

			ti,hwmods = "mpu";

			sram = <&ocmcram>;

		};



		dsp {

arch/arm/boot/dts/omap5.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -104,8 +104,9 @@ 
	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap5-mpu";

			compatible = "ti,omap4-mpu";

			ti,hwmods = "mpu";

			sram = <&ocmcram>;

		};

	};

arch/arm/mach-omap2/io.c

+0 −17
Original line number Diff line number Diff line
@@ -231,15 +231,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = { 
		.length		= L4_PER_44XX_SIZE,

		.type		= MT_DEVICE,

	},

#ifdef CONFIG_OMAP4_ERRATA_I688

	{

		.virtual	= OMAP4_SRAM_VA,

		.pfn		= __phys_to_pfn(OMAP4_SRAM_PA),

		.length		= PAGE_SIZE,

		.type		= MT_MEMORY_RW_SO,

	},

#endif



};

#endif
@@ -269,14 +260,6 @@ static struct map_desc omap54xx_io_desc[] __initdata = { 
		.length		= L4_PER_54XX_SIZE,

		.type		= MT_DEVICE,

	},

#ifdef CONFIG_OMAP4_ERRATA_I688

	{

		.virtual	= OMAP4_SRAM_VA,

		.pfn		= __phys_to_pfn(OMAP4_SRAM_PA),

		.length		= PAGE_SIZE,

		.type		= MT_MEMORY_RW_SO,

	},

#endif

};

#endif

arch/arm/mach-omap2/omap4-common.c

+21 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/irqchip/irq-crossbar.h>

#include <linux/of_address.h>

#include <linux/reboot.h>

#include <linux/genalloc.h>



#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/map.h>
@@ -71,6 +72,26 @@ void omap_bus_sync(void) 
}

EXPORT_SYMBOL(omap_bus_sync);



static int __init omap4_sram_init(void)

{

	struct device_node *np;

	struct gen_pool *sram_pool;



	np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu");

	if (!np)

		pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",

			__func__);

	sram_pool = of_get_named_gen_pool(np, "sram", 0);

	if (!sram_pool)

		pr_warn("%s:Unable to get sram pool needed to handle errata I688\n",

			__func__);

	else

		sram_sync = (void *)gen_pool_alloc(sram_pool, PAGE_SIZE);



	return 0;

}

omap_arch_initcall(omap4_sram_init);



/* Steal one page physical memory for barrier implementation */

int __init omap_barrier_reserve_memblock(void)

{
@@ -91,7 +112,6 @@ void __init omap_barriers_init(void) 
	dram_io_desc[0].type = MT_MEMORY_RW_SO;

	iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));

	dram_sync = (void __iomem *) dram_io_desc[0].virtual;

	sram_sync = (void __iomem *) OMAP4_SRAM_VA;



	pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",

		(long long) paddr, dram_io_desc[0].virtual);