LoongArch: SMP: Change prefix from loongson3 to loongson

chenhuacai · chenhuacai · commit c56ab8e85d6d · 2022-11-21T19:02:57.000+08:00
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: Huacai Chen &lt;chenhuacai@loongson.cn&gt;
diff --git a/arch/loongarch/include/asm/irq.h b/arch/loongarch/include/asm/irq.h
@@ -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>
 
diff --git a/arch/loongarch/include/asm/smp.h b/arch/loongarch/include/asm/smp.h
@@ -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);
diff --git a/arch/loongarch/kernel/irq.c b/arch/loongarch/kernel/irq.c
@@ -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
diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
@@ -136,20 +136,20 @@ 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;
 
 	for_each_cpu(i, mask)
 		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);
 }

Original file line number	Diff line number	Diff line change
`@@ -19,21 +19,21 @@ extern cpumask_t cpu_sibling_map[];`
`19`	`19`	`extern cpumask_t cpu_core_map[];`
`20`	`20`	`extern cpumask_t cpu_foreign_map[];`
`21`	`21`
`22`		`-void loongson3_smp_setup(void);`
`23`		`-void loongson3_prepare_cpus(unsigned int max_cpus);`
`24`		`-void loongson3_boot_secondary(int cpu, struct task_struct *idle);`
`25`		`-void loongson3_init_secondary(void);`
`26`		`-void loongson3_smp_finish(void);`
`27`		`-void loongson3_send_ipi_single(int cpu, unsigned int action);`
`28`		`-void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action);`
	`22`	`+void loongson_smp_setup(void);`
	`23`	`+void loongson_prepare_cpus(unsigned int max_cpus);`
	`24`	`+void loongson_boot_secondary(int cpu, struct task_struct *idle);`
	`25`	`+void loongson_init_secondary(void);`
	`26`	`+void loongson_smp_finish(void);`
	`27`	`+void loongson_send_ipi_single(int cpu, unsigned int action);`
	`28`	`+void loongson_send_ipi_mask(const struct cpumask *mask, unsigned int action);`
`29`	`29`	`#ifdef CONFIG_HOTPLUG_CPU`
`30`		`-int loongson3_cpu_disable(void);`
`31`		`-void loongson3_cpu_die(unsigned int cpu);`
	`30`	`+int loongson_cpu_disable(void);`
	`31`	`+void loongson_cpu_die(unsigned int cpu);`
`32`	`32`	`#endif`
`33`	`33`
`34`	`34`	`static inline void plat_smp_setup(void)`
`35`	`35`	`{`
`36`		`- loongson3_smp_setup();`
	`36`	`+ loongson_smp_setup();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`static inline int raw_smp_processor_id(void)`
`@@ -85,28 +85,28 @@ extern void show_ipi_list(struct seq_file *p, int prec);`
`85`	`85`	`*/`
`86`	`86`	`static inline void smp_send_reschedule(int cpu)`
`87`	`87`	`{`
`88`		`- loongson3_send_ipi_single(cpu, SMP_RESCHEDULE);`
	`88`	`+ loongson_send_ipi_single(cpu, SMP_RESCHEDULE);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`static inline void arch_send_call_function_single_ipi(int cpu)`
`92`	`92`	`{`
`93`		`- loongson3_send_ipi_single(cpu, SMP_CALL_FUNCTION);`
	`93`	`+ loongson_send_ipi_single(cpu, SMP_CALL_FUNCTION);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)`
`97`	`97`	`{`
`98`		`- loongson3_send_ipi_mask(mask, SMP_CALL_FUNCTION);`
	`98`	`+ loongson_send_ipi_mask(mask, SMP_CALL_FUNCTION);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`#ifdef CONFIG_HOTPLUG_CPU`
`102`	`102`	`static inline int __cpu_disable(void)`
`103`	`103`	`{`
`104`		`- return loongson3_cpu_disable();`
	`104`	`+ return loongson_cpu_disable();`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`static inline void __cpu_die(unsigned int cpu)`
`108`	`108`	`{`
`109`		`- loongson3_cpu_die(cpu);`
	`109`	`+ loongson_cpu_die(cpu);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`extern void play_dead(void);`
Original file line number	Diff line number	Diff line change
`@@ -136,20 +136,20 @@ static void ipi_write_action(int cpu, u32 action)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-void loongson3_send_ipi_single(int cpu, unsigned int action)`
	`139`	`+void loongson_send_ipi_single(int cpu, unsigned int action)`
`140`	`140`	`{`
`141`	`141`	`ipi_write_action(cpu_logical_map(cpu), (u32)action);`
`142`	`142`	`}`
`143`	`143`
`144`		`-void loongson3_send_ipi_mask(const struct cpumask *mask, unsigned int action)`
	`144`	`+void loongson_send_ipi_mask(const struct cpumask *mask, unsigned int action)`
`145`	`145`	`{`
`146`	`146`	`unsigned int i;`
`147`	`147`
`148`	`148`	`for_each_cpu(i, mask)`
`149`	`149`	`ipi_write_action(cpu_logical_map(i), (u32)action);`
`150`	`150`	`}`
`151`	`151`
`152`		`-irqreturn_t loongson3_ipi_interrupt(int irq, void *dev)`
	`152`	`+irqreturn_t loongson_ipi_interrupt(int irq, void *dev)`
`153`	`153`	`{`
`154`	`154`	`unsigned int action;`
`155`	`155`	`unsigned int cpu = smp_processor_id();`
`@@ -169,7 +169,7 @@ irqreturn_t loongson3_ipi_interrupt(int irq, void *dev)`
`169`	`169`	`return IRQ_HANDLED;`
`170`	`170`	`}`
`171`	`171`
`172`		`-void __init loongson3_smp_setup(void)`
	`172`	`+void __init loongson_smp_setup(void)`
`173`	`173`	`{`
`174`	`174`	`cpu_data[0].core = cpu_logical_map(0) % loongson_sysconf.cores_per_package;`
`175`	`175`	`cpu_data[0].package = cpu_logical_map(0) / loongson_sysconf.cores_per_package;`
`@@ -178,7 +178,7 @@ void __init loongson3_smp_setup(void)`
`178`	`178`	`pr_info("Detected %i available CPU(s)\n", loongson_sysconf.nr_cpus);`
`179`	`179`	`}`
`180`	`180`
`181`		`-void __init loongson3_prepare_cpus(unsigned int max_cpus)`
	`181`	`+void __init loongson_prepare_cpus(unsigned int max_cpus)`
`182`	`182`	`{`
`183`	`183`	`int i = 0;`
`184`	`184`
`@@ -193,7 +193,7 @@ void __init loongson3_prepare_cpus(unsigned int max_cpus)`
`193`	`193`	`/*`
`194`	`194`	`* Setup the PC, SP, and TP of a secondary processor and start it running!`
`195`	`195`	`*/`
`196`		`-void loongson3_boot_secondary(int cpu, struct task_struct *idle)`
	`196`	`+void loongson_boot_secondary(int cpu, struct task_struct *idle)`
`197`	`197`	`{`
`198`	`198`	`unsigned long entry;`
`199`	`199`
`@@ -205,13 +205,13 @@ void loongson3_boot_secondary(int cpu, struct task_struct *idle)`
`205`	`205`
`206`	`206`	`csr_mail_send(entry, cpu_logical_map(cpu), 0);`
`207`	`207`
`208`		`- loongson3_send_ipi_single(cpu, SMP_BOOT_CPU);`
	`208`	`+ loongson_send_ipi_single(cpu, SMP_BOOT_CPU);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/*`
`212`	`212`	`* SMP init and finish on secondary CPUs`
`213`	`213`	`*/`
`214`		`-void loongson3_init_secondary(void)`
	`214`	`+void loongson_init_secondary(void)`
`215`	`215`	`{`
`216`	`216`	`unsigned int cpu = smp_processor_id();`
`217`	`217`	`unsigned int imask = ECFGF_IP0 \| ECFGF_IP1 \| ECFGF_IP2 \|`
`@@ -231,7 +231,7 @@ void loongson3_init_secondary(void)`
`231`	`231`	`cpu_logical_map(cpu) / loongson_sysconf.cores_per_package;`
`232`	`232`	`}`
`233`	`233`
`234`		`-void loongson3_smp_finish(void)`
	`234`	`+void loongson_smp_finish(void)`
`235`	`235`	`{`
`236`	`236`	`local_irq_enable();`
`237`	`237`	`iocsr_write64(0, LOONGARCH_IOCSR_MBUF0);`
`@@ -240,7 +240,7 @@ void loongson3_smp_finish(void)`
`240`	`240`
`241`	`241`	`#ifdef CONFIG_HOTPLUG_CPU`
`242`	`242`
`243`		`-int loongson3_cpu_disable(void)`
	`243`	`+int loongson_cpu_disable(void)`
`244`	`244`	`{`
`245`	`245`	`unsigned long flags;`
`246`	`246`	`unsigned int cpu = smp_processor_id();`
`@@ -262,7 +262,7 @@ int loongson3_cpu_disable(void)`
`262`	`262`	`return 0;`
`263`	`263`	`}`
`264`	`264`
`265`		`-void loongson3_cpu_die(unsigned int cpu)`
	`265`	`+void loongson_cpu_die(unsigned int cpu)`
`266`	`266`	`{`
`267`	`267`	`while (per_cpu(cpu_state, cpu) != CPU_DEAD)`
`268`	`268`	`cpu_relax();`
`@@ -300,19 +300,19 @@ void play_dead(void)`
`300`	`300`	`*/`
`301`	`301`	`#ifdef CONFIG_PM`
`302`	`302`
`303`		`-static int loongson3_ipi_suspend(void)`
	`303`	`+static int loongson_ipi_suspend(void)`
`304`	`304`	`{`
`305`	`305`	`return 0;`
`306`	`306`	`}`
`307`	`307`
`308`		`-static void loongson3_ipi_resume(void)`
	`308`	`+static void loongson_ipi_resume(void)`
`309`	`309`	`{`
`310`	`310`	`iocsr_write32(0xffffffff, LOONGARCH_IOCSR_IPI_EN);`
`311`	`311`	`}`
`312`	`312`
`313`		`-static struct syscore_ops loongson3_ipi_syscore_ops = {`
`314`		`- .resume = loongson3_ipi_resume,`
`315`		`- .suspend = loongson3_ipi_suspend,`
	`313`	`+static struct syscore_ops loongson_ipi_syscore_ops = {`
	`314`	`+ .resume = loongson_ipi_resume,`
	`315`	`+ .suspend = loongson_ipi_suspend,`
`316`	`316`	`};`
`317`	`317`
`318`	`318`	`/*`
`@@ -321,7 +321,7 @@ static struct syscore_ops loongson3_ipi_syscore_ops = {`
`321`	`321`	`*/`
`322`	`322`	`static int __init ipi_pm_init(void)`
`323`	`323`	`{`
`324`		`- register_syscore_ops(&loongson3_ipi_syscore_ops);`
	`324`	`+ register_syscore_ops(&loongson_ipi_syscore_ops);`
`325`	`325`	`return 0;`
`326`	`326`	`}`
`327`	`327`
`@@ -425,7 +425,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)`
`425`	`425`	`{`
`426`	`426`	`init_new_context(current, &init_mm);`
`427`	`427`	`current_thread_info()->cpu = 0;`
`428`		`- loongson3_prepare_cpus(max_cpus);`
	`428`	`+ loongson_prepare_cpus(max_cpus);`
`429`	`429`	`set_cpu_sibling_map(0);`
`430`	`430`	`set_cpu_core_map(0);`
`431`	`431`	`calculate_cpu_foreign_map();`
`@@ -436,7 +436,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)`
`436`	`436`
`437`	`437`	`int __cpu_up(unsigned int cpu, struct task_struct *tidle)`
`438`	`438`	`{`
`439`		`- loongson3_boot_secondary(cpu, tidle);`
	`439`	`+ loongson_boot_secondary(cpu, tidle);`
`440`	`440`
`441`	`441`	`/* Wait for CPU to start and be ready to sync counters */`
`442`	`442`	`if (!wait_for_completion_timeout(&cpu_starting,`
`@@ -465,7 +465,7 @@ asmlinkage void start_secondary(void)`
`465`	`465`
`466`	`466`	`cpu_probe();`
`467`	`467`	`constant_clockevent_init();`
`468`		`- loongson3_init_secondary();`
	`468`	`+ loongson_init_secondary();`
`469`	`469`
`470`	`470`	`set_cpu_sibling_map(cpu);`
`471`	`471`	`set_cpu_core_map(cpu);`
`@@ -487,11 +487,11 @@ asmlinkage void start_secondary(void)`
`487`	`487`	`complete(&cpu_running);`
`488`	`488`
`489`	`489`	`/*`
`490`		`- * irq will be enabled in loongson3_smp_finish(), enabling it too`
	`490`	`+ * irq will be enabled in loongson_smp_finish(), enabling it too`
`491`	`491`	`* early is dangerous.`
`492`	`492`	`*/`
`493`	`493`	`WARN_ON_ONCE(!irqs_disabled());`
`494`		`- loongson3_smp_finish();`
	`494`	`+ loongson_smp_finish();`
`495`	`495`
`496`	`496`	`cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);`
`497`	`497`	`}`