Commit bb689266 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for-arnd' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes

parents 33e1e10a eaa142ca

arch/arm/mach-highbank/highbank.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/smp.h>





#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/unified.h>

#include <asm/unified.h>
@@ -72,6 +73,9 @@ static void __init highbank_map_io(void) 




void highbank_set_cpu_jump(int cpu, void *jump_addr)

void highbank_set_cpu_jump(int cpu, void *jump_addr)

{

{

#ifdef CONFIG_SMP

	cpu = cpu_logical_map(cpu);

#endif

	writel(BSYM(virt_to_phys(jump_addr)), HB_JUMP_TABLE_VIRT(cpu));

	writel(BSYM(virt_to_phys(jump_addr)), HB_JUMP_TABLE_VIRT(cpu));

	__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);

	__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);

	outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),

	outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),

arch/arm/mach-imx/src.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <asm/unified.h>

#include <asm/unified.h>





#define SRC_SCR				0x000

#define SRC_SCR				0x000
@@ -23,10 +24,15 @@ 




static void __iomem *src_base;

static void __iomem *src_base;





#ifndef CONFIG_SMP

#define cpu_logical_map(cpu)		0

#endif



void imx_enable_cpu(int cpu, bool enable)

void imx_enable_cpu(int cpu, bool enable)

{

{

	u32 mask, val;

	u32 mask, val;





	cpu = cpu_logical_map(cpu);

	mask = 1 << (BP_SRC_SCR_CORE1_ENABLE + cpu - 1);

	mask = 1 << (BP_SRC_SCR_CORE1_ENABLE + cpu - 1);

	val = readl_relaxed(src_base + SRC_SCR);

	val = readl_relaxed(src_base + SRC_SCR);

	val = enable ? val | mask : val & ~mask;

	val = enable ? val | mask : val & ~mask;
@@ -35,6 +41,7 @@ void imx_enable_cpu(int cpu, bool enable) 




void imx_set_cpu_jump(int cpu, void *jump_addr)

void imx_set_cpu_jump(int cpu, void *jump_addr)

{

{

	cpu = cpu_logical_map(cpu);

	writel_relaxed(BSYM(virt_to_phys(jump_addr)),

	writel_relaxed(BSYM(virt_to_phys(jump_addr)),

		       src_base + SRC_GPR1 + cpu * 8);

		       src_base + SRC_GPR1 + cpu * 8);

}

}