Commit c56ab8e8 authored by Huacai Chen's avatar Huacai Chen
Browse files

LoongArch: SMP: Change prefix from loongson3 to loongson 



SMP operations can be shared by Loongson-2 series and Loongson-3 series,
so we change the prefix from loongson3 to loongson for all functions and
data structures.

Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent 538eafc6

arch/loongarch/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ extern struct fwnode_handle *liointc_handle; 
extern struct fwnode_handle *pch_lpc_handle;

extern struct fwnode_handle *pch_pic_handle[MAX_IO_PICS];



extern irqreturn_t loongson3_ipi_interrupt(int irq, void *dev);

extern irqreturn_t loongson_ipi_interrupt(int irq, void *dev);



#include <asm-generic/irq.h>

arch/loongarch/include/asm/smp.h

+15 −15
Original line number Diff line number Diff line
@@ -19,21 +19,21 @@ extern cpumask_t cpu_sibling_map[]; 
extern cpumask_t cpu_core_map[];

extern cpumask_t cpu_foreign_map[];



void loongson3_smp_setup(void);

void loongson3_prepare_cpus(unsigned int max_cpus);

void loongson3_boot_secondary(int cpu, struct task_struct *idle);

void loongson3_init_secondary(void);

void loongson3_smp_finish(void);

void loongson3_send_ipi_single(int cpu, unsigned int action);

void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action);

void loongson_smp_setup(void);

void loongson_prepare_cpus(unsigned int max_cpus);

void loongson_boot_secondary(int cpu, struct task_struct *idle);

void loongson_init_secondary(void);

void loongson_smp_finish(void);

void loongson_send_ipi_single(int cpu, unsigned int action);

void loongson_send_ipi_mask(const struct cpumask *mask, unsigned int action);

#ifdef CONFIG_HOTPLUG_CPU

int loongson3_cpu_disable(void);

void loongson3_cpu_die(unsigned int cpu);

int loongson_cpu_disable(void);

void loongson_cpu_die(unsigned int cpu);

#endif



static inline void plat_smp_setup(void)

{

	loongson3_smp_setup();

	loongson_smp_setup();

}



static inline int raw_smp_processor_id(void)
@@ -85,28 +85,28 @@ extern void show_ipi_list(struct seq_file *p, int prec); 
 */

static inline void smp_send_reschedule(int cpu)

{

	loongson3_send_ipi_single(cpu, SMP_RESCHEDULE);

	loongson_send_ipi_single(cpu, SMP_RESCHEDULE);

}



static inline void arch_send_call_function_single_ipi(int cpu)

{

	loongson3_send_ipi_single(cpu, SMP_CALL_FUNCTION);

	loongson_send_ipi_single(cpu, SMP_CALL_FUNCTION);

}



static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)

{

	loongson3_send_ipi_mask(mask, SMP_CALL_FUNCTION);

	loongson_send_ipi_mask(mask, SMP_CALL_FUNCTION);

}



#ifdef CONFIG_HOTPLUG_CPU

static inline int __cpu_disable(void)

{

	return loongson3_cpu_disable();

	return loongson_cpu_disable();

}



static inline void __cpu_die(unsigned int cpu)

{

	loongson3_cpu_die(cpu);

	loongson_cpu_die(cpu);

}



extern void play_dead(void);

arch/loongarch/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void __init init_IRQ(void) 
	if (ipi_irq < 0)

		panic("IPI IRQ mapping failed\n");

	irq_set_percpu_devid(ipi_irq);

	r = request_percpu_irq(ipi_irq, loongson3_ipi_interrupt, "IPI", &ipi_dummy_dev);

	r = request_percpu_irq(ipi_irq, loongson_ipi_interrupt, "IPI", &ipi_dummy_dev);

	if (r < 0)

		panic("IPI IRQ request failed\n");

#endif

arch/loongarch/kernel/smp.c

+22 −22
Original line number Diff line number Diff line
@@ -136,12 +136,12 @@ static void ipi_write_action(int cpu, u32 action) 
	}

}



void loongson3_send_ipi_single(int cpu, unsigned int action)

void loongson_send_ipi_single(int cpu, unsigned int action)

{

	ipi_write_action(cpu_logical_map(cpu), (u32)action);

}



void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action)

void loongson_send_ipi_mask(const struct cpumask *mask, unsigned int action)

{

	unsigned int i;
@@ -149,7 +149,7 @@ void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action) 
		ipi_write_action(cpu_logical_map(i), (u32)action);

}



irqreturn_t loongson3_ipi_interrupt(int irq, void *dev)

irqreturn_t loongson_ipi_interrupt(int irq, void *dev)

{

	unsigned int action;

	unsigned int cpu = smp_processor_id();
@@ -169,7 +169,7 @@ irqreturn_t loongson3_ipi_interrupt(int irq, void *dev) 
	return IRQ_HANDLED;

}



void __init loongson3_smp_setup(void)

void __init loongson_smp_setup(void)

{

	cpu_data[0].core = cpu_logical_map(0) % loongson_sysconf.cores_per_package;

	cpu_data[0].package = cpu_logical_map(0) / loongson_sysconf.cores_per_package;
@@ -178,7 +178,7 @@ void __init loongson3_smp_setup(void) 
	pr_info("Detected %i available CPU(s)\n", loongson_sysconf.nr_cpus);

}



void __init loongson3_prepare_cpus(unsigned int max_cpus)

void __init loongson_prepare_cpus(unsigned int max_cpus)

{

	int i = 0;
@@ -193,7 +193,7 @@ void __init loongson3_prepare_cpus(unsigned int max_cpus) 
/*

 * Setup the PC, SP, and TP of a secondary processor and start it running!

 */

void loongson3_boot_secondary(int cpu, struct task_struct *idle)

void loongson_boot_secondary(int cpu, struct task_struct *idle)

{

	unsigned long entry;
@@ -205,13 +205,13 @@ void loongson3_boot_secondary(int cpu, struct task_struct *idle) 


	csr_mail_send(entry, cpu_logical_map(cpu), 0);



	loongson3_send_ipi_single(cpu, SMP_BOOT_CPU);

	loongson_send_ipi_single(cpu, SMP_BOOT_CPU);

}



/*

 * SMP init and finish on secondary CPUs

 */

void loongson3_init_secondary(void)

void loongson_init_secondary(void)

{

	unsigned int cpu = smp_processor_id();

	unsigned int imask = ECFGF_IP0 | ECFGF_IP1 | ECFGF_IP2 |
@@ -231,7 +231,7 @@ void loongson3_init_secondary(void) 
		     cpu_logical_map(cpu) / loongson_sysconf.cores_per_package;

}



void loongson3_smp_finish(void)

void loongson_smp_finish(void)

{

	local_irq_enable();

	iocsr_write64(0, LOONGARCH_IOCSR_MBUF0);
@@ -240,7 +240,7 @@ void loongson3_smp_finish(void) 


#ifdef CONFIG_HOTPLUG_CPU



int loongson3_cpu_disable(void)

int loongson_cpu_disable(void)

{

	unsigned long flags;

	unsigned int cpu = smp_processor_id();
@@ -262,7 +262,7 @@ int loongson3_cpu_disable(void) 
	return 0;

}



void loongson3_cpu_die(unsigned int cpu)

void loongson_cpu_die(unsigned int cpu)

{

	while (per_cpu(cpu_state, cpu) != CPU_DEAD)

		cpu_relax();
@@ -300,19 +300,19 @@ void play_dead(void) 
 */

#ifdef CONFIG_PM



static int loongson3_ipi_suspend(void)

static int loongson_ipi_suspend(void)

{

	return 0;

}



static void loongson3_ipi_resume(void)

static void loongson_ipi_resume(void)

{

	iocsr_write32(0xffffffff, LOONGARCH_IOCSR_IPI_EN);

}



static struct syscore_ops loongson3_ipi_syscore_ops = {

	.resume         = loongson3_ipi_resume,

	.suspend        = loongson3_ipi_suspend,

static struct syscore_ops loongson_ipi_syscore_ops = {

	.resume         = loongson_ipi_resume,

	.suspend        = loongson_ipi_suspend,

};



/*
@@ -321,7 +321,7 @@ static struct syscore_ops loongson3_ipi_syscore_ops = { 
 */

static int __init ipi_pm_init(void)

{

	register_syscore_ops(&loongson3_ipi_syscore_ops);

	register_syscore_ops(&loongson_ipi_syscore_ops);

	return 0;

}
@@ -425,7 +425,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
{

	init_new_context(current, &init_mm);

	current_thread_info()->cpu = 0;

	loongson3_prepare_cpus(max_cpus);

	loongson_prepare_cpus(max_cpus);

	set_cpu_sibling_map(0);

	set_cpu_core_map(0);

	calculate_cpu_foreign_map();
@@ -436,7 +436,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 


int __cpu_up(unsigned int cpu, struct task_struct *tidle)

{

	loongson3_boot_secondary(cpu, tidle);

	loongson_boot_secondary(cpu, tidle);



	/* Wait for CPU to start and be ready to sync counters */

	if (!wait_for_completion_timeout(&cpu_starting,
@@ -465,7 +465,7 @@ asmlinkage void start_secondary(void) 


	cpu_probe();

	constant_clockevent_init();

	loongson3_init_secondary();

	loongson_init_secondary();



	set_cpu_sibling_map(cpu);

	set_cpu_core_map(cpu);
@@ -487,11 +487,11 @@ asmlinkage void start_secondary(void) 
	complete(&cpu_running);



	/*

	 * irq will be enabled in loongson3_smp_finish(), enabling it too

	 * irq will be enabled in loongson_smp_finish(), enabling it too

	 * early is dangerous.

	 */

	WARN_ON_ONCE(!irqs_disabled());

	loongson3_smp_finish();

	loongson_smp_finish();



	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);

}