Skip to content

L
linux
Commit 8848af93 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

ppc64: use fast version of mtmsrd when changing RI, from Milton Miller

parent ebd27d3a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
arch/ppc64/kernel/entry.S
View file @ 8848af93
...@@ -396,7 +396,7 @@ restore: ...@@ -396,7 +396,7 @@ restore:
mfmsr r0 mfmsr r0
li r2, MSR_RI li r2, MSR_RI
andc r0,r0,r2 andc r0,r0,r2
mtmsrd r0 mtmsrd r0,1
ld r0,_MSR(r1) ld r0,_MSR(r1)
mtspr SRR1,r0 mtspr SRR1,r0
......
arch/ppc64/kernel/head.S
View file @ 8848af93
...@@ -562,7 +562,7 @@ fast_exception_return: ...@@ -562,7 +562,7 @@ fast_exception_return:
mfmsr r20 mfmsr r20
li r21, MSR_RI li r21, MSR_RI
andc r20,r20,r21 andc r20,r20,r21
mtmsrd r20 mtmsrd r20,1
mtspr SRR1,r23 mtspr SRR1,r23
mtspr SRR0,r22 mtspr SRR0,r22
...@@ -989,7 +989,7 @@ _GLOBAL(do_stab_bolted) ...@@ -989,7 +989,7 @@ _GLOBAL(do_stab_bolted)
mfmsr r22 mfmsr r22
li r23, MSR_RI li r23, MSR_RI
andc r22,r22,r23 andc r22,r22,r23
mtmsrd r22 mtmsrd r22,1
ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */ ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */
ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */ ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */
...@@ -1094,7 +1094,7 @@ SLB_NUM_ENTRIES = 64 ...@@ -1094,7 +1094,7 @@ SLB_NUM_ENTRIES = 64
mfmsr r22 mfmsr r22
li r23, MSR_RI li r23, MSR_RI
andc r22,r22,r23 andc r22,r22,r23
mtmsrd r22 mtmsrd r22,1
ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */ ld r22,EX_SRR0(r21) /* Get SRR0 from exc. frame */
ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */ ld r23,EX_SRR1(r21) /* Get SRR1 from exc. frame */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7