Skip to content

Commit

Permalink
powerpc/8xx: Use SPRG2 instead of DAR for saving r3
Browse files Browse the repository at this point in the history
We now have SPRG2 available as in it not used anymore for saving CR, so we don't
need to crash DAR anymore for saving r3 for CPU6 ERRATA handling.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <scottwood@freescale.com>
  • Loading branch information
LEROY Christophe authored and Scott Wood committed Jun 3, 2015
1 parent 2eb2fd9 commit b821c5f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions arch/powerpc/kernel/head_8xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ SystemCall:

InstructionTLBMiss:
#ifdef CONFIG_8xx_CPU6
mtspr SPRN_DAR, r3
mtspr SPRN_SPRG_SCRATCH2, r3
#endif
EXCEPTION_PROLOG_0

Expand Down Expand Up @@ -362,16 +362,15 @@ InstructionTLBMiss:

/* Restore registers */
#ifdef CONFIG_8xx_CPU6
mfspr r3, SPRN_DAR
mtspr SPRN_DAR, r11 /* Tag DAR */
mfspr r3, SPRN_SPRG_SCRATCH2
#endif
EXCEPTION_EPILOG_0
rfi

. = 0x1200
DataStoreTLBMiss:
#ifdef CONFIG_8xx_CPU6
mtspr SPRN_DAR, r3
mtspr SPRN_SPRG_SCRATCH2, r3
#endif
EXCEPTION_PROLOG_0
mfcr r10
Expand Down Expand Up @@ -438,7 +437,7 @@ DataStoreTLBMiss:

/* Restore registers */
#ifdef CONFIG_8xx_CPU6
mfspr r3, SPRN_DAR
mfspr r3, SPRN_SPRG_SCRATCH2
#endif
mtspr SPRN_DAR, r11 /* Tag DAR */
EXCEPTION_EPILOG_0
Expand Down

0 comments on commit b821c5f

Please sign in to comment.