Skip to content

Commit d986d6f

Browse files
cyrilbur-ibmmpe
authored andcommitted
powerpc: Remove do_load_up_transact_{fpu,altivec}
Previous rework of TM code leaves these functions unused Signed-off-by: Cyril Bur <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 000ec28 commit d986d6f

File tree

3 files changed

+0
-56
lines changed

3 files changed

+0
-56
lines changed

arch/powerpc/include/asm/tm.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99

1010
#ifndef __ASSEMBLY__
1111

12-
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
13-
extern void do_load_up_transact_fpu(struct thread_struct *thread);
14-
extern void do_load_up_transact_altivec(struct thread_struct *thread);
15-
#endif
16-
1712
extern void tm_enable(void);
1813
extern void tm_reclaim(struct thread_struct *thread,
1914
unsigned long orig_msr, uint8_t cause);

arch/powerpc/kernel/fpu.S

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,32 +50,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
5050
#define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
5151
#define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
5252

53-
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
54-
/* void do_load_up_transact_fpu(struct thread_struct *thread)
55-
*
56-
* This is similar to load_up_fpu but for the transactional version of the FP
57-
* register set. It doesn't mess with the task MSR or valid flags.
58-
* Furthermore, we don't do lazy FP with TM currently.
59-
*/
60-
_GLOBAL(do_load_up_transact_fpu)
61-
mfmsr r6
62-
ori r5,r6,MSR_FP
63-
#ifdef CONFIG_VSX
64-
BEGIN_FTR_SECTION
65-
oris r5,r5,MSR_VSX@h
66-
END_FTR_SECTION_IFSET(CPU_FTR_VSX)
67-
#endif
68-
SYNC
69-
MTMSRD(r5)
70-
71-
addi r7,r3,THREAD_CKFPSTATE
72-
lfd fr0,FPSTATE_FPSCR(r7)
73-
MTFSF_L(fr0)
74-
REST_32FPVSRS(0, R4, R7)
75-
76-
blr
77-
#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
78-
7953
/*
8054
* Load state from memory into FP registers including FPSCR.
8155
* Assumes the caller has enabled FP in the MSR.

arch/powerpc/kernel/vector.S

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,6 @@
77
#include <asm/page.h>
88
#include <asm/ptrace.h>
99

10-
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
11-
/* void do_load_up_transact_altivec(struct thread_struct *thread)
12-
*
13-
* This is similar to load_up_altivec but for the transactional version of the
14-
* vector regs. It doesn't mess with the task MSR or valid flags.
15-
* Furthermore, VEC laziness is not supported with TM currently.
16-
*/
17-
_GLOBAL(do_load_up_transact_altivec)
18-
mfmsr r6
19-
oris r5,r6,MSR_VEC@h
20-
MTMSRD(r5)
21-
isync
22-
23-
li r4,1
24-
stw r4,THREAD_USED_VR(r3)
25-
26-
li r10,THREAD_CKVRSTATE+VRSTATE_VSCR
27-
lvx v0,r10,r3
28-
mtvscr v0
29-
addi r10,r3,THREAD_CKVRSTATE
30-
REST_32VRS(0,r4,r10)
31-
32-
blr
33-
#endif
34-
3510
/*
3611
* Load state from memory into VMX registers including VSCR.
3712
* Assumes the caller has enabled VMX in the MSR.

0 commit comments

Comments
 (0)