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

Commit 34178c58 authored Feb 05, 2013 by Olof Johansson

Merge tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux into fixes

From Rob Herring:
highbank fixes for 3.8

-Compile fix for !SMP
-More cpu cluster id related fixes

* tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux:
  ARM: highbank: mask cluster id from cpu_logical_map
  ARM: scu: mask cluster id from cpu_logical_map
  ARM: scu: add empty scu_enable for !CONFIG_SMP

parents 825bf91e 63fc1370

arch/arm/include/asm/smp_scu.h

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,14 @@

	#ifndef __ASSEMBLER__		#ifndef __ASSEMBLER__
	unsigned int scu_get_core_count(void __iomem *);		unsigned int scu_get_core_count(void __iomem *);
	void scu_enable(void __iomem *);
	int scu_power_mode(void __iomem *, unsigned int);		int scu_power_mode(void __iomem *, unsigned int);

			#ifdef CONFIG_SMP
			void scu_enable(void __iomem *scu_base);
			#else
			static inline void scu_enable(void __iomem *scu_base) {}
			#endif

	#endif		#endif

	#endif		#endif

arch/arm/kernel/smp_scu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base)
	int scu_power_mode(void __iomem *scu_base, unsigned int mode)		int scu_power_mode(void __iomem *scu_base, unsigned int mode)
	{		{
	unsigned int val;		unsigned int val;
	int cpu = cpu_logical_map(smp_processor_id());		int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);

	if (mode > 3 \|\| mode == 1 \|\| cpu > 3)		if (mode > 3 \|\| mode == 1 \|\| cpu > 3)
	return -EINVAL;		return -EINVAL;

arch/arm/mach-highbank/highbank.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@

	#include <asm/arch_timer.h>		#include <asm/arch_timer.h>
	#include <asm/cacheflush.h>		#include <asm/cacheflush.h>
			#include <asm/cputype.h>
	#include <asm/smp_plat.h>		#include <asm/smp_plat.h>
	#include <asm/smp_twd.h>		#include <asm/smp_twd.h>
	#include <asm/hardware/arm_timer.h>		#include <asm/hardware/arm_timer.h>
	@@ -59,7 +60,7 @@ static void __init highbank_scu_map_io(void)

	void highbank_set_cpu_jump(int cpu, void *jump_addr)		void highbank_set_cpu_jump(int cpu, void *jump_addr)
	{		{
	cpu = cpu_logical_map(cpu);		cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(cpu), 0);
	writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));		writel(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-highbank/sysregs.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@ extern void __iomem *sregs_base;

	static inline void highbank_set_core_pwr(void)		static inline void highbank_set_core_pwr(void)
	{		{
	int cpu = cpu_logical_map(smp_processor_id());		int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);
	if (scu_base_addr)		if (scu_base_addr)
	scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);		scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
	else		else
	@@ -46,7 +46,7 @@ static inline void highbank_set_core_pwr(void)

	static inline void highbank_clear_core_pwr(void)		static inline void highbank_clear_core_pwr(void)
	{		{
	int cpu = cpu_logical_map(smp_processor_id());		int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);
	if (scu_base_addr)		if (scu_base_addr)
	scu_power_mode(scu_base_addr, SCU_PM_NORMAL);		scu_power_mode(scu_base_addr, SCU_PM_NORMAL);
	else		else