diff options
author | Matthew McClintock <msm@freescale.com> | 2010-06-29 05:42:26 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-08 21:28:27 -0400 |
commit | 66953ebef60ffe94650a735b445f1495d989c523 (patch) | |
tree | 705ea34685f8c378381f8f5926d7bbf757ac3333 /arch | |
parent | d10ac3734d07bee675384d22d06883b3c57b1524 (diff) |
powerpc/mpic: Add ability to reset a core via MPIC
We need the ability to reset cores for use with kexec/kdump for
SMP systems. Calling this function with the specific core you want
to reset will cause the CPU to spin in reset.
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/mpic.c | 18 | ||||
-rw-r--r-- | arch/powerpc/sysdev/mpic.h | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 20b73c025a45..7c1342618a30 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -1636,6 +1636,24 @@ void __devinit smp_mpic_setup_cpu(int cpu) | |||
1636 | { | 1636 | { |
1637 | mpic_setup_this_cpu(); | 1637 | mpic_setup_this_cpu(); |
1638 | } | 1638 | } |
1639 | |||
1640 | void mpic_reset_core(int cpu) | ||
1641 | { | ||
1642 | struct mpic *mpic = mpic_primary; | ||
1643 | u32 pir; | ||
1644 | int cpuid = get_hard_smp_processor_id(cpu); | ||
1645 | |||
1646 | /* Set target bit for core reset */ | ||
1647 | pir = mpic_read(mpic->gregs, MPIC_INFO(GREG_PROCESSOR_INIT)); | ||
1648 | pir |= (1 << cpuid); | ||
1649 | mpic_write(mpic->gregs, MPIC_INFO(GREG_PROCESSOR_INIT), pir); | ||
1650 | mpic_read(mpic->gregs, MPIC_INFO(GREG_PROCESSOR_INIT)); | ||
1651 | |||
1652 | /* Restore target bit after reset complete */ | ||
1653 | pir &= ~(1 << cpuid); | ||
1654 | mpic_write(mpic->gregs, MPIC_INFO(GREG_PROCESSOR_INIT), pir); | ||
1655 | mpic_read(mpic->gregs, MPIC_INFO(GREG_PROCESSOR_INIT)); | ||
1656 | } | ||
1639 | #endif /* CONFIG_SMP */ | 1657 | #endif /* CONFIG_SMP */ |
1640 | 1658 | ||
1641 | #ifdef CONFIG_PM | 1659 | #ifdef CONFIG_PM |
diff --git a/arch/powerpc/sysdev/mpic.h b/arch/powerpc/sysdev/mpic.h index eff433c322a0..e4a6df77b8d7 100644 --- a/arch/powerpc/sysdev/mpic.h +++ b/arch/powerpc/sysdev/mpic.h | |||
@@ -37,5 +37,6 @@ static inline int mpic_pasemi_msi_init(struct mpic *mpic) | |||
37 | extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type); | 37 | extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type); |
38 | extern void mpic_set_vector(unsigned int virq, unsigned int vector); | 38 | extern void mpic_set_vector(unsigned int virq, unsigned int vector); |
39 | extern int mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask); | 39 | extern int mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask); |
40 | extern void mpic_reset_core(int cpu); | ||
40 | 41 | ||
41 | #endif /* _POWERPC_SYSDEV_MPIC_H */ | 42 | #endif /* _POWERPC_SYSDEV_MPIC_H */ |