Unverified Commit f800f22b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2884 LoongArch: fix two cpu hotplug problem 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hongchen Zhang <zhanghongchen@loongson.cn>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NIOXHNFJOB24OJ6FAWWWWJTBQEH7CTEW/ 
 
https://gitee.com/openeuler/kernel/issues/I8H1QC 
 
Link:https://gitee.com/openeuler/kernel/pulls/2884

 

Reviewed-by: default avatarMao Bibo <maobibo@loongson.cn>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 589871dc bd1ee06e

arch/loongarch/kernel/smp.c

+15 −2
Original line number Diff line number Diff line
@@ -310,6 +310,10 @@ void play_dead(void) 
	register void (*init_fn)(void);



	idle_task_exit();

	/*

	 * vcpu can be woken up from idle emulation in vm if irq is disabled

	 */

	if (!cpu_has_hypervisor)

		local_irq_enable();

	set_csr_ecfg(ECFGF_IPI);

	__this_cpu_write(cpu_state, CPU_DEAD);
@@ -317,9 +321,18 @@ void play_dead(void) 
	__smp_mb();

	do {

		__asm__ __volatile__("idle 0\n\t");

		addr = iocsr_read64(LOONGARCH_IOCSR_MBUF0);

		/*

		 * mailbox info is wroten from other CPU with IPI send method

		 * in function csr_mail_send, only 4 bytes can be wroten with

		 * IPI send method in one time.

		 *

		 * High 4 bytes is sent and then low 4 bytes for 8 bytes mail

		 * sending method. Here low 4 bytes is read by the first.

		 */

		addr = iocsr_read32(LOONGARCH_IOCSR_MBUF0);

	} while (addr == 0);



	addr = iocsr_read64(LOONGARCH_IOCSR_MBUF0);

	init_fn = (void *)TO_CACHE(addr);

	iocsr_write32(0xffffffff, LOONGARCH_IOCSR_IPI_CLEAR);

arch/loongarch/kernel/time.c

+9 −16
Original line number Diff line number Diff line
@@ -59,21 +59,6 @@ static int constant_set_state_oneshot(struct clock_event_device *evt) 
	return 0;

}



static int constant_set_state_oneshot_stopped(struct clock_event_device *evt)

{

	unsigned long timer_config;



	raw_spin_lock(&state_lock);



	timer_config = csr_read64(LOONGARCH_CSR_TCFG);

	timer_config &= ~CSR_TCFG_EN;

	csr_write64(timer_config, LOONGARCH_CSR_TCFG);



	raw_spin_unlock(&state_lock);



	return 0;

}



static int constant_set_state_periodic(struct clock_event_device *evt)

{

	unsigned long period;
@@ -93,6 +78,14 @@ static int constant_set_state_periodic(struct clock_event_device *evt) 


static int constant_set_state_shutdown(struct clock_event_device *evt)

{

	unsigned long timer_config;



	raw_spin_lock(&state_lock);

	timer_config = csr_read64(LOONGARCH_CSR_TCFG);

	timer_config &= ~CSR_TCFG_EN;

	csr_write64(timer_config, LOONGARCH_CSR_TCFG);

	raw_spin_unlock(&state_lock);



	return 0;

}
@@ -161,7 +154,7 @@ int constant_clockevent_init(void) 
	cd->rating = 320;

	cd->cpumask = cpumask_of(cpu);

	cd->set_state_oneshot = constant_set_state_oneshot;

	cd->set_state_oneshot_stopped = constant_set_state_oneshot_stopped;

	cd->set_state_oneshot_stopped = constant_set_state_shutdown;

	cd->set_state_periodic = constant_set_state_periodic;

	cd->set_state_shutdown = constant_set_state_shutdown;

	cd->set_next_event = constant_timer_next_event;