From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v2 4/6] powerpc/32: Rearrange _switch to prepare for 32/64 merge
Date: Mon, 15 May 2023 14:45:41 +1000 [thread overview]
Message-ID: <20230515044543.78903-5-npiggin@gmail.com> (raw)
In-Reply-To: <20230515044543.78903-1-npiggin@gmail.com>
Change the order of some operations and change some register numbers in
preparation to merge 32-bit and 64-bit switch.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/entry_32.S | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 089432128571..2d17b14bb9e5 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -236,12 +236,12 @@ _GLOBAL(_switch)
stwu r1,-SWITCH_FRAME_SIZE(r1)
mflr r0
stw r0,SWITCH_FRAME_SIZE+4(r1)
+ stw r1,KSP(r3) /* Set old stack pointer */
/* r3-r12 are caller saved -- Cort */
SAVE_NVGPRS(r1)
stw r0,_NIP(r1) /* Return to switch caller */
- mfcr r10
- stw r10,_CCR(r1)
- stw r1,KSP(r3) /* Set old stack pointer */
+ mfcr r0
+ stw r0,_CCR(r1)
/* The sync for SMP migration is taken care of, see entry_64.S */
@@ -258,8 +258,8 @@ _GLOBAL(_switch)
/* r3-r12 are destroyed -- Cort */
REST_NVGPRS(r1)
- lwz r4,_NIP(r1) /* Return to _switch caller in new task */
- mtlr r4
+ lwz r0,_NIP(r1) /* Return to _switch caller in new task */
+ mtlr r0
addi r1,r1,SWITCH_FRAME_SIZE
blr
--
2.40.1
next prev parent reply other threads:[~2023-05-15 4:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 4:45 [PATCH v2 0/6] powerpc: merge _switch in 32/64 Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 1/6] powerpc/64s: move stack SLB pinning out of line from _switch Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 2/6] powerpc/64: Rearrange 64-bit _switch to prepare for 32/64 merge Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 3/6] powerpc/32: Remove sync from _switch Nicholas Piggin
2023-05-15 4:45 ` Nicholas Piggin [this message]
2023-05-15 4:45 ` [PATCH v2 5/6] powerpc: merge 32-bit and 64-bit _switch implementation Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 6/6] powerpc/64: Rename entry_64.S to prom_entry_64.S Nicholas Piggin
2023-05-15 13:17 ` Nicholas Piggin
2023-05-15 14:19 ` Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230515044543.78903-5-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).