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
7 7
8#ifndef __ASSEMBLER__8#ifndef __ASSEMBLER__
9unsigned int scu_get_core_count(void __iomem *);9unsigned int scu_get_core_count(void __iomem *);
10void scu_enable(void __iomem *);
11int scu_power_mode(void __iomem *, unsigned int);10int scu_power_mode(void __iomem *, unsigned int);
11
12#ifdef CONFIG_SMP
13void scu_enable(void __iomem *scu_base);
14#else
15static inline void scu_enable(void __iomem *scu_base) {}
16#endif
17
12#endif18#endif
13 19
14#endif20#endif
arch/arm/kernel/smp_scu.c+1−1
@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base) · 74 unmodified lines
75int scu_power_mode(void __iomem *scu_base, unsigned int mode)75int scu_power_mode(void __iomem *scu_base, unsigned int mode)
76{76{
77 unsigned int val;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 if (mode > 3 || mode == 1 || cpu > 3)80 if (mode > 3 || mode == 1 || cpu > 3)
81 return -EINVAL;81 return -EINVAL;
arch/arm/mach-highbank/highbank.c+2−1
@@ -28,6 +28,7 @@ · 27 unmodified lines
28 28
29#include <asm/arch_timer.h>29#include <asm/arch_timer.h>
30#include <asm/cacheflush.h>30#include <asm/cacheflush.h>
31#include <asm/cputype.h>
31#include <asm/smp_plat.h>32#include <asm/smp_plat.h>
32#include <asm/smp_twd.h>33#include <asm/smp_twd.h>
33#include <asm/hardware/arm_timer.h>34#include <asm/hardware/arm_timer.h>
@@ -59,7 +60,7 @@ static void __init highbank_scu_map_io(void) · 25 unmodified lines
59 60
60void highbank_set_cpu_jump(int cpu, void *jump_addr)61void 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 writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));64 writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));
64 __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);65 __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
65 outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),66 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
37 37
38static inline void highbank_set_core_pwr(void)38static 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 if (scu_base_addr)41 if (scu_base_addr)
42 scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);42 scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
43 else43 else
@@ -46,7 +46,7 @@ static inline void highbank_set_core_pwr(void) · 2 unmodified lines
46 46
47static inline void highbank_clear_core_pwr(void)47static 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 if (scu_base_addr)50 if (scu_base_addr)
51 scu_power_mode(scu_base_addr, SCU_PM_NORMAL);51 scu_power_mode(scu_base_addr, SCU_PM_NORMAL);
52 else52 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