Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c83c2eed authored by Marcin Nowakowski's avatar Marcin Nowakowski Committed by Ralf Baechle
Browse files

MIPS: kexec: remove SMP_DUMP 



SMP_DUMP has been added as a new IPI signal when kexec support was added
for Cavium Octeon CPUs ('commit 7aa1c8f4 ("MIPS: kdump: Add support")'.
However, the new signal doesn't appear to ever have a proper handler
added (octeon_message_functions[] array has an empty handler for it),
and generic IPI handlers now trigger a BUG() on unhandled signal.

As the method is unused remove it completely and replace its only
invocation with a smp_call_function().

[ralf@linux-mips.org: Renumber SMP_ASK_C0COUNT to avoid numbering gaps.]

Signed-off-by: default avatarMarcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14630/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 109c32ff

arch/mips/include/asm/smp.h

+1 −7
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ extern int __cpu_logical_map[NR_CPUS]; 
#define SMP_CALL_FUNCTION	0x2

/* Octeon - Tell another core to flush its icache */

#define SMP_ICACHE_FLUSH	0x4

/* Used by kexec crashdump to save all cpu's state */

#define SMP_DUMP		0x8

#define SMP_ASK_C0COUNT		0x10

#define SMP_ASK_C0COUNT		0x8



/* Mask of CPUs which are currently definitely operating coherently */

extern cpumask_t cpu_coherent_mask;
@@ -111,8 +109,4 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) 
	mp_ops->send_ipi_mask(mask, SMP_CALL_FUNCTION);

}



#if defined(CONFIG_KEXEC)

extern void (*dump_ipi_function_ptr)(void *);

void dump_send_ipi(void (*dump_ipi_callback)(void *));

#endif

#endif /* __ASM_SMP_H */

arch/mips/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void crash_kexec_prepare_cpus(void) 


	ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */



	dump_send_ipi(crash_shutdown_secondary);

	smp_call_function(crash_shutdown_secondary, NULL, 0);

	smp_wmb();



	/*

arch/mips/kernel/smp.c

+0 −17
Original line number Diff line number Diff line
@@ -638,23 +638,6 @@ void flush_tlb_one(unsigned long vaddr) 
EXPORT_SYMBOL(flush_tlb_page);

EXPORT_SYMBOL(flush_tlb_one);



#if defined(CONFIG_KEXEC)

void (*dump_ipi_function_ptr)(void *) = NULL;

void dump_send_ipi(void (*dump_ipi_callback)(void *))

{

	int i;

	int cpu = smp_processor_id();



	dump_ipi_function_ptr = dump_ipi_callback;

	smp_mb();

	for_each_online_cpu(i)

		if (i != cpu)

			mp_ops->send_ipi_single(i, SMP_DUMP);



}

EXPORT_SYMBOL(dump_send_ipi);

#endif



#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST



static DEFINE_PER_CPU(atomic_t, tick_broadcast_count);