Skip to content

Commit

Permalink
powerpc: mtmsrd not defined
Browse files Browse the repository at this point in the history 
Replace the BOOK3S_64 specific mtmsrd with the generic MTMSRD macro.
Only enable ldstfp when CONFIG_PPC_FPU is set.

Signed-off-by: Sean MacLennan <smaclennan@pikatech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Sean MacLennan authored and Benjamin Herrenschmidt committed Sep 2, 2010
1 parent 025c018 commit cd64d16
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 16 deletions.
36 changes: 20 additions & 16 deletions arch/powerpc/lib/ldstfp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <asm/asm-offsets.h>
#include <linux/errno.h>

#ifdef CONFIG_PPC_FPU

#define STKFRM (PPC_MIN_STKFRM + 16)

.macro extab instr,handler
Expand Down Expand Up @@ -81,7 +83,7 @@ _GLOBAL(do_lfs)
mfmsr r6
ori r7,r6,MSR_FP
cmpwi cr7,r3,0
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stfd fr0,STKFRM-16(r1)
Expand All @@ -93,7 +95,7 @@ _GLOBAL(do_lfs)
lfd fr0,STKFRM-16(r1)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand All @@ -108,7 +110,7 @@ _GLOBAL(do_lfd)
mfmsr r6
ori r7,r6,MSR_FP
cmpwi cr7,r3,0
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stfd fr0,STKFRM-16(r1)
Expand All @@ -120,7 +122,7 @@ _GLOBAL(do_lfd)
lfd fr0,STKFRM-16(r1)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand All @@ -135,7 +137,7 @@ _GLOBAL(do_stfs)
mfmsr r6
ori r7,r6,MSR_FP
cmpwi cr7,r3,0
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stfd fr0,STKFRM-16(r1)
Expand All @@ -147,7 +149,7 @@ _GLOBAL(do_stfs)
lfd fr0,STKFRM-16(r1)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand All @@ -162,7 +164,7 @@ _GLOBAL(do_stfd)
mfmsr r6
ori r7,r6,MSR_FP
cmpwi cr7,r3,0
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stfd fr0,STKFRM-16(r1)
Expand All @@ -174,7 +176,7 @@ _GLOBAL(do_stfd)
lfd fr0,STKFRM-16(r1)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand Down Expand Up @@ -229,7 +231,7 @@ _GLOBAL(do_lvx)
oris r7,r6,MSR_VEC@h
cmpwi cr7,r3,0
li r8,STKFRM-16
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stvx vr0,r1,r8
Expand All @@ -241,7 +243,7 @@ _GLOBAL(do_lvx)
lvx vr0,r1,r8
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand All @@ -257,7 +259,7 @@ _GLOBAL(do_stvx)
oris r7,r6,MSR_VEC@h
cmpwi cr7,r3,0
li r8,STKFRM-16
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
stvx vr0,r1,r8
Expand All @@ -269,7 +271,7 @@ _GLOBAL(do_stvx)
lvx vr0,r1,r8
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand Down Expand Up @@ -325,7 +327,7 @@ _GLOBAL(do_lxvd2x)
oris r7,r6,MSR_VSX@h
cmpwi cr7,r3,0
li r8,STKFRM-16
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
STXVD2X(0,r1,r8)
Expand All @@ -337,7 +339,7 @@ _GLOBAL(do_lxvd2x)
LXVD2X(0,r1,r8)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
Expand All @@ -353,7 +355,7 @@ _GLOBAL(do_stxvd2x)
oris r7,r6,MSR_VSX@h
cmpwi cr7,r3,0
li r8,STKFRM-16
mtmsrd r7
MTMSRD(r7)
isync
beq cr7,1f
STXVD2X(0,r1,r8)
Expand All @@ -365,11 +367,13 @@ _GLOBAL(do_stxvd2x)
LXVD2X(0,r1,r8)
4: PPC_LL r0,STKFRM+PPC_LR_STKOFF(r1)
mtlr r0
mtmsrd r6
MTMSRD(r6)
isync
mr r3,r9
addi r1,r1,STKFRM
blr
extab 2b,3b

#endif /* CONFIG_VSX */

#endif /* CONFIG_PPC_FPU */
8 changes: 8 additions & 0 deletions arch/powerpc/lib/sstep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extern char system_call_common[];
#define XER_OV 0x40000000U
#define XER_CA 0x20000000U

#ifdef CONFIG_PPC_FPU
/*
* Functions in ldstfp.S
*/
Expand All @@ -41,6 +42,7 @@ extern int do_lvx(int rn, unsigned long ea);
extern int do_stvx(int rn, unsigned long ea);
extern int do_lxvd2x(int rn, unsigned long ea);
extern int do_stxvd2x(int rn, unsigned long ea);
#endif

/*
* Determine whether a conditional branch instruction would branch.
Expand Down Expand Up @@ -290,6 +292,7 @@ static int __kprobes write_mem(unsigned long val, unsigned long ea, int nb,
return write_mem_unaligned(val, ea, nb, regs);
}

#ifdef CONFIG_PPC_FPU
/*
* Check the address and alignment, and call func to do the actual
* load or store.
Expand Down Expand Up @@ -351,6 +354,7 @@ static int __kprobes do_fp_store(int rn, int (*func)(int, unsigned long),
}
return err;
}
#endif

#ifdef CONFIG_ALTIVEC
/* For Altivec/VMX, no need to worry about alignment */
Expand Down Expand Up @@ -1393,6 +1397,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
regs->gpr[rd] = byterev_4(val);
goto ldst_done;

#ifdef CONFIG_PPC_CPU
case 535: /* lfsx */
case 567: /* lfsux */
if (!(regs->msr & MSR_FP))
Expand Down Expand Up @@ -1424,6 +1429,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
ea = xform_ea(instr, regs, u);
err = do_fp_store(rd, do_stfd, ea, 8, regs);
goto ldst_done;
#endif

#ifdef __powerpc64__
case 660: /* stdbrx */
Expand Down Expand Up @@ -1534,6 +1540,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
} while (++rd < 32);
goto instr_done;

#ifdef CONFIG_PPC_FPU
case 48: /* lfs */
case 49: /* lfsu */
if (!(regs->msr & MSR_FP))
Expand Down Expand Up @@ -1565,6 +1572,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
ea = dform_ea(instr, regs);
err = do_fp_store(rd, do_stfd, ea, 8, regs);
goto ldst_done;
#endif

#ifdef __powerpc64__
case 58: /* ld[u], lwa */
Expand Down

0 comments on commit cd64d16

Please sign in to comment.