renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

ARC: [SMP] ISS SMP extension bitrot

Browse Source 
* Move extension specific code out of common SMP code
* Don't enable it by default for SMP

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
Vineet Gupta 2014-02-28 16:13:44 +08:00
parent 89ca3b8819
commit 9a091d9e84
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arc/include/asm/irq.h
View File

@ -19,8 +19,6 @@
#include <asm-generic/irq.h> #include <asm-generic/irq.h>
extern void arc_init_IRQ(void); extern void arc_init_IRQ(void);
extern int get_hw_config_num_irq(void);
void arc_local_timer_setup(unsigned int cpu); void arc_local_timer_setup(unsigned int cpu);
#endif #endif

18
arch/arc/kernel/irq.c
View File

@ -150,24 +150,6 @@ void arch_do_IRQ(unsigned int irq, struct pt_regs *regs)
set_irq_regs(old_regs); set_irq_regs(old_regs);
} }
int get_hw_config_num_irq(void)
{
uint32_t val = read_aux_reg(ARC_REG_VECBASE_BCR);
switch (val & 0x03) {
case 0:
return 16;
case 1:
return 32;
case 2:
return 8;
default:
return 0;
}
return 0;
}
/* /*
* arch_local_irq_enable - Enable interrupts. * arch_local_irq_enable - Enable interrupts.
* *

2
arch/arc/plat-arcfpga/Makefile
View File

@ -9,4 +9,4 @@
KBUILD_CFLAGS += -Iarch/arc/plat-arcfpga/include KBUILD_CFLAGS += -Iarch/arc/plat-arcfpga/include
obj-y := platform.o irq.o obj-y := platform.o irq.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_ISS_SMP_EXTN) += smp.o

4
arch/arc/plat-arcfpga/platform.c
View File

@ -169,7 +169,7 @@ static void __init plat_fpga_early_init(void)
arc_fpga_serial_init(); arc_fpga_serial_init();
#ifdef CONFIG_SMP #ifdef CONFIG_ISS_SMP_EXTN
iss_model_init_early_smp(); iss_model_init_early_smp();
#endif #endif
} }
@ -211,7 +211,7 @@ MACHINE_START(ANGEL4, "angel4")
.init_early = plat_fpga_early_init, .init_early = plat_fpga_early_init,
.init_machine = plat_fpga_populate_dev, .init_machine = plat_fpga_populate_dev,
.init_irq = plat_fpga_init_IRQ, .init_irq = plat_fpga_init_IRQ,
#ifdef CONFIG_SMP #ifdef CONFIG_ISS_SMP_EXTN
.init_smp = iss_model_init_smp, .init_smp = iss_model_init_smp,
#endif #endif
MACHINE_END MACHINE_END

18
arch/arc/plat-arcfpga/smp.c
View File

@ -42,6 +42,24 @@ static void iss_model_smp_wakeup_cpu(int cpu, unsigned long pc)
} }
static inline int get_hw_config_num_irq(void)
{
uint32_t val = read_aux_reg(ARC_REG_VECBASE_BCR);
switch (val & 0x03) {
case 0:
return 16;
case 1:
return 32;
case 2:
return 8;
default:
return 0;
}
return 0;
}
/* /*
* Any SMP specific init any CPU does when it comes up. * Any SMP specific init any CPU does when it comes up.
* Here we setup the CPU to enable Inter-Processor-Interrupts * Here we setup the CPU to enable Inter-Processor-Interrupts