History

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

Olof Johansson committed 13 years ago

Commit 893db072 parents 836dc9e 63fc1374 files · +12 −5Browse files

Unified · Split

4 files
  1. arch/arm/include/asm/smp_scu.h +7 −1
  2. arch/arm/kernel/smp_scu.c +1 −1
  3. arch/arm/mach-highbank/highbank.c +2 −1
  4. arch/arm/mach-highbank/sysregs.h +2 −2
arch/arm/include/asm/smp_scu.h+7−1
@@ -7,8 +7,14 @@ · 6 unmodified lines
77
88 #ifndef __ASSEMBLER__
99 unsigned int scu_get_core_count(void __iomem *);
10−void scu_enable(void __iomem *);
1110 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+
1218 #endif
1319
1420 #endif
arch/arm/kernel/smp_scu.c+1−1
@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base) · 74 unmodified lines
7575 int scu_power_mode(void __iomem *scu_base, unsigned int mode)
7676 {
7777 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);
7979
8080 if (mode > 3 || mode == 1 || cpu > 3)
8181 return -EINVAL;
arch/arm/mach-highbank/highbank.c+2−1
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828
2929 #include <asm/arch_timer.h>
3030 #include <asm/cacheflush.h>
31+#include <asm/cputype.h>
3132 #include <asm/smp_plat.h>
3233 #include <asm/smp_twd.h>
3334 #include <asm/hardware/arm_timer.h>
@@ -59,7 +60,7 @@ static void __init highbank_scu_map_io(void) · 25 unmodified lines
5960
6061 void highbank_set_cpu_jump(int cpu, void *jump_addr)
6162 {
62− cpu = cpu_logical_map(cpu);
63+ cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(cpu), 0);
6364 writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));
6465 __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
6566 outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),
arch/arm/mach-highbank/sysregs.h+2−2
@@ -37,7 +37,7 @@ extern void __iomem *sregs_base; · 36 unmodified lines
3737
3838 static inline void highbank_set_core_pwr(void)
3939 {
40− int cpu = cpu_logical_map(smp_processor_id());
40+ int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);
4141 if (scu_base_addr)
4242 scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
4343 else
@@ -46,7 +46,7 @@ static inline void highbank_set_core_pwr(void) · 2 unmodified lines
4646
4747 static inline void highbank_clear_core_pwr(void)
4848 {
49− int cpu = cpu_logical_map(smp_processor_id());
49+ int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);
5050 if (scu_base_addr)
5151 scu_power_mode(scu_base_addr, SCU_PM_NORMAL);
5252 else

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t