Skip to content

[kservice.c] handle rt_hw_cpu_reset & rt_hw_cpu_shutdown #7928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 2 commits into from
Aug 9, 2023
Merged

[kservice.c] handle rt_hw_cpu_reset & rt_hw_cpu_shutdown #7928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e01e391
rt_hw_cpu_reset: remove all other rt_weak
mysterywolf Aug 7, 2023
1d54b57
rt_hw_cpu_shutdown: implement default weak function
mysterywolf Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/allwinner_tina/libcpu/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void rt_hw_cpu_reset()
* shutdown CPU
*
*/
void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");
Expand Down
13 changes: 0 additions & 13 deletions bsp/bluetrum/libcpu/cpu/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,3 @@ rt_uint8_t *rt_hw_stack_init(void *tentry,
/* return task's current stack address */
return (rt_uint8_t *)stk;
}

/** shutdown CPU */
void rt_hw_cpu_shutdown(void)
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");

level = rt_hw_interrupt_disable();
while (level)
{
RT_ASSERT(0);
}
}
11 changes: 0 additions & 11 deletions bsp/imx6sx/cortex-a9/cpu/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
*/
/*@{*/

/** shutdown CPU */
void rt_hw_cpu_shutdown()
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");

level = rt_hw_interrupt_disable();
while (level)
{
RT_ASSERT(0);
}
}

/*@}*/
22 changes: 0 additions & 22 deletions bsp/mipssim/drivers/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@

extern unsigned char __bss_end;

/**
* this function will reset CPU
*
*/
void rt_hw_cpu_reset(void)
{
rt_kprintf("reboot system...\n");
while (1);
}

/**
* this function will shutdown CPU
*
*/
void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");

while (1);
}


/**
* This is the timer interrupt service routine.
*/
Expand Down
11 changes: 0 additions & 11 deletions bsp/raspberry-pi/raspi2/cpu/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
*/
/*@{*/

/** shutdown CPU */
void rt_hw_cpu_shutdown()
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");

level = rt_hw_interrupt_disable();
while (level)
{
RT_ASSERT(0);
}
}

/*@}*/
12 changes: 0 additions & 12 deletions bsp/raspberry-pi/raspi3-32/cpu/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,5 @@ void rt_hw_spin_unlock(rt_hw_spinlock_t *lock)
*/
/*@{*/

/** shutdown CPU */
void rt_hw_cpu_shutdown()
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");

level = rt_hw_interrupt_disable();
while (level)
{
RT_ASSERT(0);
}
}

/*@}*/
2 changes: 1 addition & 1 deletion bsp/raspberry-pico/libcpu/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex)
/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk);
}
2 changes: 1 addition & 1 deletion bsp/rockchip/rk3568/driver/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ void start_cpu(int argc, char *argv[])
MSH_CMD_EXPORT(start_cpu, start_cpu);

#ifdef RT_AMP_SLAVE
void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
if (psci_ops.cpu_off)
{
Expand Down
10 changes: 0 additions & 10 deletions documentation/doxygen/hardware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,4 @@ void rt_hw_interrupt_umask(int vector);
void rt_hw_interrupt_install(int vector, rt_isr_handler_t new_handler,
rt_isr_handler_t *old_handler);

/**
* This function will reset whole platform.
*/
void rt_hw_cpu_reset(void);

/**
* This function will halt whole platform.
*/
void rt_hw_cpu_shutdown(void);

/**@}*/
2 changes: 1 addition & 1 deletion libcpu/aarch64/common/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ const char *rt_hw_cpu_arch(void)
}

/** shutdown CPU */
rt_weak void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");
Expand Down
2 changes: 0 additions & 2 deletions libcpu/aarch64/common/cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ extern struct cpu_ops_t cpu_ops_spin_tbl;

#endif /* RT_USING_SMP */

extern void rt_hw_cpu_shutdown(void);

extern void (*system_off)(void);

#endif /* __RT_HW_CPU_H__ */
8 changes: 0 additions & 8 deletions libcpu/arc/em/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ struct init_stack_frame {
rt_uint32_t r0;
};

/**
* shutdown CPU
*/
rt_weak void rt_hw_cpu_shutdown(void)
{

}

rt_uint8_t *rt_hw_stack_init(void *tentry,
void *parameter,
rt_uint8_t *stack_addr,
Expand Down
19 changes: 0 additions & 19 deletions libcpu/arm/AT91SAM7S/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,4 @@
*/
/*@{*/

/**
* this function will reset CPU
*
*/
rt_weak void rt_hw_cpu_reset()
{
}

/**
* this function will shutdown CPU
*
*/
rt_weak void rt_hw_cpu_shutdown()
{
rt_kprintf("shutdown...\n");

while (1);
}

/*@}*/
18 changes: 0 additions & 18 deletions libcpu/arm/AT91SAM7X/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,5 @@
*/
/*@{*/

/**
* this function will reset CPU
*
*/
rt_weak void rt_hw_cpu_reset()
{
}

/**
* this function will shutdown CPU
*
*/
rt_weak void rt_hw_cpu_shutdown()
{
rt_kprintf("shutdown...\n");

while (1);
}

/*@}*/
2 changes: 1 addition & 1 deletion libcpu/arm/am335x/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ rt_base_t rt_hw_cpu_dcache_status()
* shutdown CPU
*
*/
rt_weak void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_base_t level;
rt_kprintf("shutdown...\n");
Expand Down
4 changes: 2 additions & 2 deletions libcpu/arm/arm926/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ rt_base_t rt_hw_cpu_dcache_status()
* reset cpu by dog's time-out
*
*/
rt_weak void rt_hw_cpu_reset()
void rt_hw_cpu_reset()
{

rt_kprintf("Restarting system...\n");
Expand All @@ -161,7 +161,7 @@ rt_weak void rt_hw_cpu_reset()
* shutdown CPU
*
*/
rt_weak void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_base_t level;
rt_kprintf("shutdown...\n");
Expand Down
4 changes: 2 additions & 2 deletions libcpu/arm/armv6/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ rt_base_t rt_hw_cpu_dcache_status()
* reset cpu by dog's time-out
*
*/
rt_weak void rt_hw_cpu_reset()
void rt_hw_cpu_reset()
{

rt_kprintf("Restarting system...\n");
Expand All @@ -162,7 +162,7 @@ rt_weak void rt_hw_cpu_reset()
* shutdown CPU
*
*/
rt_weak void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_base_t level;
rt_kprintf("shutdown...\n");
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/cortex-a/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void rt_hw_spin_unlock(rt_hw_spinlock_t *lock)
/*@{*/

/** shutdown CPU */
rt_weak void rt_hw_cpu_shutdown()
void rt_hw_cpu_shutdown(void)
{
rt_base_t level;
rt_kprintf("shutdown...\n");
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/cortex-m0/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex)
/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk);
}
2 changes: 1 addition & 1 deletion libcpu/arm/cortex-m23/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex)
/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk);
}
12 changes: 1 addition & 11 deletions libcpu/arm/cortex-m3/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,20 +343,10 @@ void rt_hw_hard_fault_exception(struct exception_info * exception_info)
while (1);
}

/**
* shutdown CPU
*/
rt_weak void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");

RT_ASSERT(0);
}

/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;
}
Expand Down
12 changes: 1 addition & 11 deletions libcpu/arm/cortex-m33/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,20 +485,10 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
while (1);
}

/**
* shutdown CPU
*/
rt_weak void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");

RT_ASSERT(0);
}

/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;
}
Expand Down
12 changes: 1 addition & 11 deletions libcpu/arm/cortex-m4/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,20 +428,10 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
while (1);
}

/**
* shutdown CPU
*/
rt_weak void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");

RT_ASSERT(0);
}

/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;
}
Expand Down
12 changes: 1 addition & 11 deletions libcpu/arm/cortex-m7/cpuport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,20 +427,10 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
while (1);
}

/**
* shutdown CPU
*/
rt_weak void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");

RT_ASSERT(0);
}

/**
* reset CPU
*/
rt_weak void rt_hw_cpu_reset(void)
void rt_hw_cpu_reset(void)
{
SCB_AIRCR = SCB_RESET_VALUE;
}
Expand Down
Loading