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

Commit 2ec1fc4e authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback 



arm_memblock_steal() is not suppose to be used outside ->reserve callback.
OMAP barrier errata code was using it outside reserve callback and hence
it was broken.

Move the allocation as part of ->reserve callback to fix the it.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1e056ddd

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ config OMAP3_SDRC_AC_TIMING 
	  going on could result in system crashes;



config OMAP4_ERRATA_I688

	bool "OMAP4 errata: Async Bridge Corruption (BROKEN)"

	depends on ARCH_OMAP4 && BROKEN

	bool "OMAP4 errata: Async Bridge Corruption"

	depends on ARCH_OMAP4

	select ARCH_HAS_BARRIERS

	help

	  If a data is stalled inside asynchronous bridge because of back

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ void omap3_map_io(void); 
void am33xx_map_io(void);

void omap4_map_io(void);

void ti81xx_map_io(void);

void omap_barriers_init(void);



/**

 * omap_test_timeout - busy-loop, testing a condition

arch/arm/mach-omap2/io.c

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ void __init omapam33xx_map_common_io(void) 
void __init omap44xx_map_common_io(void)

{

	iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc));

	omap_barriers_init();

}

#endif

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

+16 −9
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <plat/irqs.h>

#include <plat/sram.h>

#include <plat/omap-secure.h>



#include <mach/hardware.h>

#include <mach/omap-wakeupgen.h>
@@ -43,6 +44,9 @@ static void __iomem *sar_ram_base; 


void __iomem *dram_sync, *sram_sync;



static phys_addr_t paddr;

static u32 size;



void omap_bus_sync(void)

{

	if (dram_sync && sram_sync) {
@@ -52,18 +56,20 @@ void omap_bus_sync(void) 
	}

}



static int __init omap_barriers_init(void)

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

int __init omap_barrier_reserve_memblock(void)

{

	struct map_desc dram_io_desc[1];

	phys_addr_t paddr;

	u32 size;



	if (!cpu_is_omap44xx())

		return -ENODEV;



	size = ALIGN(PAGE_SIZE, SZ_1M);

	paddr = arm_memblock_steal(size, SZ_1M);



	return 0;

}



void __init omap_barriers_init(void)

{

	struct map_desc dram_io_desc[1];



	dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;

	dram_io_desc[0].pfn = __phys_to_pfn(paddr);

	dram_io_desc[0].length = size;
@@ -75,9 +81,10 @@ static int __init omap_barriers_init(void) 
	pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",

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



	return 0;

}

core_initcall(omap_barriers_init);

#else

void __init omap_barriers_init(void)

{}

#endif



void __init gic_init_irq(void)

arch/arm/plat-omap/common.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void __init omap_reserve(void) 
	omap_vram_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

	omap_secure_ram_reserve_memblock();

	omap_barrier_reserve_memblock();

}



void __init omap_init_consistent_dma_size(void)