android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Add struct smp_ops_t.cause_nmi_ipi operation

Browse Source 
Have the NMI IPI code use this op when the platform defines it.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2016-12-20 04:30:09 +10:00 committed by Michael Ellerman
parent ddd703ca06
commit c64af6458e
8 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/smp.h
View File

@ -42,6 +42,7 @@ struct smp_ops_t {
#ifdef CONFIG_PPC_SMP_MUXED_IPI #ifdef CONFIG_PPC_SMP_MUXED_IPI
void (*cause_ipi)(int cpu); void (*cause_ipi)(int cpu);
#endif #endif
int (*cause_nmi_ipi)(int cpu);
void (*probe)(void); void (*probe)(void);
int (*kick_cpu)(int nr); int (*kick_cpu)(int nr);
int (*prepare_cpu)(int nr); int (*prepare_cpu)(int nr);

3
arch/powerpc/kernel/smp.c
View File

@ -417,6 +417,9 @@ int smp_handle_nmi_ipi(struct pt_regs *regs)
static void do_smp_send_nmi_ipi(int cpu) static void do_smp_send_nmi_ipi(int cpu)
{ {
if (smp_ops->cause_nmi_ipi && smp_ops->cause_nmi_ipi(cpu))
return;
if (cpu >= 0) { if (cpu >= 0) {
do_message_pass(cpu, PPC_MSG_NMI_IPI); do_message_pass(cpu, PPC_MSG_NMI_IPI);
} else { } else {

1
arch/powerpc/platforms/85xx/smp.c
View File

@ -344,6 +344,7 @@ static int smp_85xx_kick_cpu(int nr)
} }
struct smp_ops_t smp_85xx_ops = { struct smp_ops_t smp_85xx_ops = {
.cause_nmi_ipi = NULL,
.kick_cpu = smp_85xx_kick_cpu, .kick_cpu = smp_85xx_kick_cpu,
.cpu_bootable = smp_generic_cpu_bootable, .cpu_bootable = smp_generic_cpu_bootable,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU

1
arch/powerpc/platforms/86xx/mpc86xx_smp.c
View File

@ -105,6 +105,7 @@ smp_86xx_setup_cpu(int cpu_nr)
struct smp_ops_t smp_86xx_ops = { struct smp_ops_t smp_86xx_ops = {
.cause_nmi_ipi = NULL,
.message_pass = smp_mpic_message_pass, .message_pass = smp_mpic_message_pass,
.probe = smp_mpic_probe, .probe = smp_mpic_probe,
.kick_cpu = smp_86xx_kick_cpu, .kick_cpu = smp_86xx_kick_cpu,

1
arch/powerpc/platforms/chrp/smp.c
View File

@ -44,6 +44,7 @@ static void smp_chrp_setup_cpu(int cpu_nr)
/* CHRP with openpic */ /* CHRP with openpic */
struct smp_ops_t chrp_smp_ops = { struct smp_ops_t chrp_smp_ops = {
.cause_nmi_ipi = NULL,
.message_pass = smp_mpic_message_pass, .message_pass = smp_mpic_message_pass,
.probe = smp_mpic_probe, .probe = smp_mpic_probe,
.kick_cpu = smp_chrp_kick_cpu, .kick_cpu = smp_chrp_kick_cpu,

1
arch/powerpc/platforms/powermac/smp.c
View File

@ -447,6 +447,7 @@ void __init smp_psurge_give_timebase(void)
struct smp_ops_t psurge_smp_ops = { struct smp_ops_t psurge_smp_ops = {
.message_pass = NULL, /* Use smp_muxed_ipi_message_pass */ .message_pass = NULL, /* Use smp_muxed_ipi_message_pass */
.cause_ipi = smp_psurge_cause_ipi, .cause_ipi = smp_psurge_cause_ipi,
.cause_nmi_ipi = NULL,
.probe = smp_psurge_probe, .probe = smp_psurge_probe,
.kick_cpu = smp_psurge_kick_cpu, .kick_cpu = smp_psurge_kick_cpu,
.setup_cpu = smp_psurge_setup_cpu, .setup_cpu = smp_psurge_setup_cpu,

1
arch/powerpc/platforms/powernv/smp.c
View File

@ -302,6 +302,7 @@ static void __init pnv_smp_probe(void)
static struct smp_ops_t pnv_smp_ops = { static struct smp_ops_t pnv_smp_ops = {
.message_pass = NULL, /* Use smp_muxed_ipi_message_pass */ .message_pass = NULL, /* Use smp_muxed_ipi_message_pass */
.cause_ipi = NULL, /* Filled at runtime by pnv_smp_probe() */ .cause_ipi = NULL, /* Filled at runtime by pnv_smp_probe() */
.cause_nmi_ipi = NULL,
.probe = pnv_smp_probe, .probe = pnv_smp_probe,
.prepare_cpu = pnv_smp_prepare_cpu, .prepare_cpu = pnv_smp_prepare_cpu,
.kick_cpu = pnv_smp_kick_cpu, .kick_cpu = pnv_smp_kick_cpu,

1
arch/powerpc/platforms/pseries/smp.c
View File

@ -202,6 +202,7 @@ static __init void pSeries_smp_probe(void)
static struct smp_ops_t pseries_smp_ops = { static struct smp_ops_t pseries_smp_ops = {
.message_pass = NULL, /* Use smp_muxed_ipi_message_pass */ .message_pass = NULL, /* Use smp_muxed_ipi_message_pass */
.cause_ipi = NULL, /* Filled at runtime by pSeries_smp_probe() */ .cause_ipi = NULL, /* Filled at runtime by pSeries_smp_probe() */
.cause_nmi_ipi = NULL,
.probe = pSeries_smp_probe, .probe = pSeries_smp_probe,
.kick_cpu = smp_pSeries_kick_cpu, .kick_cpu = smp_pSeries_kick_cpu,
.setup_cpu = smp_setup_cpu, .setup_cpu = smp_setup_cpu,