aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_fsl_booke.S
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2013-12-24 02:12:03 -0500
committerScott Wood <scottwood@freescale.com>2014-01-09 18:52:14 -0500
commit7c732cba3d9312882e82d91d5948261dfd5c8fe6 (patch)
treea55df3b832bd8fcf505c8ef2fd2340d840e86be4 /arch/powerpc/kernel/head_fsl_booke.S
parentd2dc13b5339c657e526c405888df69d99322a016 (diff)
powerpc/fsl_booke: protect the access to MAS7
The e500v1 doesn't implement the MAS7, so we should avoid to access this register on that implementations. In the current kernel, the access to MAS7 are protected by either CONFIG_PHYS_64BIT or MMU_FTR_BIG_PHYS. Since some code are executed before the code patching, we have to use CONFIG_PHYS_64BIT in these cases. Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/kernel/head_fsl_booke.S')
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index f45726a1d963..09921a5197c6 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -82,7 +82,9 @@ _ENTRY(_start);
82 and r19,r3,r18 /* r19 = page offset */ 82 and r19,r3,r18 /* r19 = page offset */
83 andc r31,r20,r18 /* r31 = page base */ 83 andc r31,r20,r18 /* r31 = page base */
84 or r31,r31,r19 /* r31 = devtree phys addr */ 84 or r31,r31,r19 /* r31 = devtree phys addr */
85#ifdef CONFIG_PHYS_64BIT
85 mfspr r30,SPRN_MAS7 86 mfspr r30,SPRN_MAS7
87#endif
86 88
87 li r25,0 /* phys kernel start (low) */ 89 li r25,0 /* phys kernel start (low) */
88 li r24,0 /* CPU number */ 90 li r24,0 /* CPU number */