Skip to content

xtesa: fix lost save & restore states caused by merge code #13662

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
xiaoxiang781216 merged 1 commit into from
Sep 27, 2024
Merged

xtesa: fix lost save & restore states caused by merge code #13662

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
19 changes: 18 additions & 1 deletion arch/xtensa/src/common/xtensa_switchcontext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,24 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Are we in an interrupt handler? */

if (!up_current_regs())
if (up_current_regs())
{
/* Yes, then we have to do things differently.
* Just copy the current_regs into the OLD rtcb.
*/

xtensa_savestate(rtcb->xcp.regs);

/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/

xtensa_restorestate(tcb->xcp.regs);
}

/* No, then we will need to perform the user context switch */

else
{
/* Switch context to the context of the task at the head of the
* ready to run list.
Expand Down