Skip to content
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

feat: arm64: update thread self on sp-switch #9466

Merged
merged 1 commit into from
Oct 11, 2024
Merged

feat: arm64: update thread self on sp-switch #9466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions libcpu/aarch64/common/include/armv8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
#ifndef __ARMV8_H__
#define __ARMV8_H__

#include <rtconfig.h>

#ifdef ARCH_USING_HW_THREAD_SELF
#define ARM64_THREAD_REG tpidr_el1
#endif /* ARCH_USING_HW_THREAD_SELF */

#ifdef __ASSEMBLY__

/*********************
Expand Down
4 changes: 2 additions & 2 deletions libcpu/aarch64/common/include/cpuport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ void _thread_start(void);
rt_inline struct rt_thread *rt_hw_thread_self(void)
{
struct rt_thread *thread;
__asm__ volatile ("mrs %0, tpidr_el1":"=r"(thread));
__asm__ volatile ("mrs %0, " RT_STRINGIFY(ARM64_THREAD_REG) :"=r"(thread));

return thread;
}

rt_inline void rt_hw_thread_set_self(struct rt_thread *thread)
{
__asm__ volatile ("msr tpidr_el1, %0"::"r"(thread));
__asm__ volatile ("msr " RT_STRINGIFY(ARM64_THREAD_REG) ", %0"::"r"(thread));
}

#endif /* ARCH_USING_HW_THREAD_SELF */
Expand Down
9 changes: 9 additions & 0 deletions libcpu/aarch64/common/mp/context_gcc.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@

.globl rt_hw_context_switch_to

.macro update_tidr, srcx
#ifdef ARCH_USING_HW_THREAD_SELF
msr ARM64_THREAD_REG, \srcx
#endif /* ARCH_USING_HW_THREAD_SELF */
.endm

/*
* void rt_hw_context_switch_to(rt_uint3 to, struct rt_thread *to_thread);
* X0 --> to (thread stack)
Expand All @@ -35,6 +41,7 @@
rt_hw_context_switch_to:
ldr x0, [x0]
mov sp, x0
update_tidr x1

/* reserved to_thread */
mov x19, x1
Expand Down Expand Up @@ -62,6 +69,7 @@ rt_hw_context_switch:
str x3, [x0] // store sp in preempted tasks TCB
ldr x0, [x1] // get new task stack pointer
mov sp, x0
update_tidr x2

/* backup thread self */
mov x19, x2
Expand Down Expand Up @@ -119,6 +127,7 @@ rt_hw_context_switch_interrupt:
/* setup SP to to-thread's */
ldr x0, [TO_SPP]
mov sp, x0
update_tidr TO_TCB

mov x0, TO_TCB
bl rt_cpus_lock_status_restore
Expand Down
3 changes: 0 additions & 3 deletions src/scheduler_mp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,9 +1069,6 @@ void rt_sched_post_ctx_switch(struct rt_thread *thread)
}
/* safe to access since irq is masked out */
pcpu->current_thread = thread;
#ifdef ARCH_USING_HW_THREAD_SELF
rt_hw_thread_set_self(thread);
#endif /* ARCH_USING_HW_THREAD_SELF */
}

#ifdef RT_DEBUGING_CRITICAL
Expand Down
Loading