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
Unified · Split
| @@ -7,8 +7,14 @@ · 6 unmodified lines | ||
| 7 | 7 | |
| 8 | 8 | #ifndef __ASSEMBLER__ |
| 9 | 9 | unsigned int scu_get_core_count(void __iomem *); |
| 10 | −void scu_enable(void __iomem *); | |
| 11 | 10 | int scu_power_mode(void __iomem *, unsigned int); |
| 11 | + | |
| 12 | +#ifdef CONFIG_SMP | |
| 13 | +void scu_enable(void __iomem *scu_base); | |
| 14 | +#else | |
| 15 | +static inline void scu_enable(void __iomem *scu_base) {} | |
| 16 | +#endif | |
| 17 | + | |
| 12 | 18 | #endif |
| 13 | 19 | |
| 14 | 20 | #endif |
| @@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base) · 74 unmodified lines | ||
| 75 | 75 | int scu_power_mode(void __iomem *scu_base, unsigned int mode) |
| 76 | 76 | { |
| 77 | 77 | unsigned int val; |
| 78 | − int cpu = cpu_logical_map(smp_processor_id()); | |
| 78 | + int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0); | |
| 79 | 79 | |
| 80 | 80 | if (mode > 3 || mode == 1 || cpu > 3) |
| 81 | 81 | return -EINVAL; |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | #include <asm/arch_timer.h> |
| 30 | 30 | #include <asm/cacheflush.h> |
| 31 | +#include <asm/cputype.h> | |
| 31 | 32 | #include <asm/smp_plat.h> |
| 32 | 33 | #include <asm/smp_twd.h> |
| 33 | 34 | #include <asm/hardware/arm_timer.h> |
| @@ -59,7 +60,7 @@ static void __init highbank_scu_map_io(void) · 25 unmodified lines | ||
| 59 | 60 | |
| 60 | 61 | void highbank_set_cpu_jump(int cpu, void *jump_addr) |
| 61 | 62 | { |
| 62 | − cpu = cpu_logical_map(cpu); | |
| 63 | + cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(cpu), 0); | |
| 63 | 64 | writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu)); |
| 64 | 65 | __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16); |
| 65 | 66 | outer_clean_range(HB_JUMP_TABLE_PHYS(cpu), |
| @@ -37,7 +37,7 @@ extern void __iomem *sregs_base; · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | static inline void highbank_set_core_pwr(void) |
| 39 | 39 | { |
| 40 | − int cpu = cpu_logical_map(smp_processor_id()); | |
| 40 | + int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0); | |
| 41 | 41 | if (scu_base_addr) |
| 42 | 42 | scu_power_mode(scu_base_addr, SCU_PM_POWEROFF); |
| 43 | 43 | else |
| @@ -46,7 +46,7 @@ static inline void highbank_set_core_pwr(void) · 2 unmodified lines | ||
| 46 | 46 | |
| 47 | 47 | static inline void highbank_clear_core_pwr(void) |
| 48 | 48 | { |
| 49 | − int cpu = cpu_logical_map(smp_processor_id()); | |
| 49 | + int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0); | |
| 50 | 50 | if (scu_base_addr) |
| 51 | 51 | scu_power_mode(scu_base_addr, SCU_PM_NORMAL); |
| 52 | 52 | else |