renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code

powerpc: Use SPRN_xxx rather than xxx for SPR numbers

Browse Source 
This changes symbols like HID0, SPRG3, SRR0, SRR1 etc. that refer to
special purpose registers to SPRN_HID0, SPRN_SPRG3, etc.  Using the
SPRN_ symbols clutters the namespace less, and the forthcoming merge
of asm/processor.h and asm/reg.h is going to remove the non-SPRN_
versions.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2005-10-10 14:01:07 +10:00
parent 05f62a5c04
commit b5bbeb2373
2 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
arch/powerpc/kernel/head_64.S
View File

@ -25,7 +25,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <asm/processor.h> #include <asm/reg.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
@ -201,22 +201,22 @@ exception_marker:
#define EX_CCR 60 #define EX_CCR 60
#define EXCEPTION_PROLOG_PSERIES(area, label) \ #define EXCEPTION_PROLOG_PSERIES(area, label) \
mfspr r13,SPRG3; /* get paca address into r13 */ \ mfspr r13,SPRN_SPRG3; /* get paca address into r13 */ \
std r9,area+EX_R9(r13); /* save r9 - r12 */ \ std r9,area+EX_R9(r13); /* save r9 - r12 */ \
std r10,area+EX_R10(r13); \ std r10,area+EX_R10(r13); \
std r11,area+EX_R11(r13); \ std r11,area+EX_R11(r13); \
std r12,area+EX_R12(r13); \ std r12,area+EX_R12(r13); \
mfspr r9,SPRG1; \ mfspr r9,SPRN_SPRG1; \
std r9,area+EX_R13(r13); \ std r9,area+EX_R13(r13); \
mfcr r9; \ mfcr r9; \
clrrdi r12,r13,32; /* get high part of &label */ \ clrrdi r12,r13,32; /* get high part of &label */ \
mfmsr r10; \ mfmsr r10; \
mfspr r11,SRR0; /* save SRR0 */ \ mfspr r11,SPRN_SRR0; /* save SRR0 */ \
ori r12,r12,(label)@l; /* virt addr of handler */ \ ori r12,r12,(label)@l; /* virt addr of handler */ \
ori r10,r10,MSR_IR|MSR_DR|MSR_RI; \ ori r10,r10,MSR_IR|MSR_DR|MSR_RI; \
mtspr SRR0,r12; \ mtspr SPRN_SRR0,r12; \
mfspr r12,SRR1; /* and SRR1 */ \ mfspr r12,SPRN_SRR1; /* and SRR1 */ \
mtspr SRR1,r10; \ mtspr SPRN_SRR1,r10; \
rfid; \ rfid; \
b . /* prevent speculative execution */ b . /* prevent speculative execution */
@ -225,12 +225,12 @@ exception_marker:
* This code runs with relocation on. * This code runs with relocation on.
*/ */
#define EXCEPTION_PROLOG_ISERIES_1(area) \ #define EXCEPTION_PROLOG_ISERIES_1(area) \
mfspr r13,SPRG3; /* get paca address into r13 */ \ mfspr r13,SPRN_SPRG3; /* get paca address into r13 */ \
std r9,area+EX_R9(r13); /* save r9 - r12 */ \ std r9,area+EX_R9(r13); /* save r9 - r12 */ \
std r10,area+EX_R10(r13); \ std r10,area+EX_R10(r13); \
std r11,area+EX_R11(r13); \ std r11,area+EX_R11(r13); \
std r12,area+EX_R12(r13); \ std r12,area+EX_R12(r13); \
mfspr r9,SPRG1; \ mfspr r9,SPRN_SPRG1; \
std r9,area+EX_R13(r13); \ std r9,area+EX_R13(r13); \
mfcr r9 mfcr r9
@ -283,7 +283,7 @@ exception_marker:
std r9,_LINK(r1); \ std r9,_LINK(r1); \
mfctr r10; /* save CTR in stackframe */ \ mfctr r10; /* save CTR in stackframe */ \
std r10,_CTR(r1); \ std r10,_CTR(r1); \
mfspr r11,XER; /* save XER in stackframe */ \ mfspr r11,SPRN_XER; /* save XER in stackframe */ \
std r11,_XER(r1); \ std r11,_XER(r1); \
li r9,(n)+1; \ li r9,(n)+1; \
std r9,_TRAP(r1); /* set trap number */ \ std r9,_TRAP(r1); /* set trap number */ \
@ -300,7 +300,7 @@ exception_marker:
.globl label##_pSeries; \ .globl label##_pSeries; \
label##_pSeries: \ label##_pSeries: \
HMT_MEDIUM; \ HMT_MEDIUM; \
mtspr SPRG1,r13; /* save r13 */ \ mtspr SPRN_SPRG1,r13; /* save r13 */ \
RUNLATCH_ON(r13); \ RUNLATCH_ON(r13); \
EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common) EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
@ -308,7 +308,7 @@ label##_pSeries: \
.globl label##_iSeries; \ .globl label##_iSeries; \
label##_iSeries: \ label##_iSeries: \
HMT_MEDIUM; \ HMT_MEDIUM; \
mtspr SPRG1,r13; /* save r13 */ \ mtspr SPRN_SPRG1,r13; /* save r13 */ \
RUNLATCH_ON(r13); \ RUNLATCH_ON(r13); \
EXCEPTION_PROLOG_ISERIES_1(area); \ EXCEPTION_PROLOG_ISERIES_1(area); \
EXCEPTION_PROLOG_ISERIES_2; \ EXCEPTION_PROLOG_ISERIES_2; \
@ -318,7 +318,7 @@ label##_iSeries: \
.globl label##_iSeries; \ .globl label##_iSeries; \
label##_iSeries: \ label##_iSeries: \
HMT_MEDIUM; \ HMT_MEDIUM; \
mtspr SPRG1,r13; /* save r13 */ \ mtspr SPRN_SPRG1,r13; /* save r13 */ \
RUNLATCH_ON(r13); \ RUNLATCH_ON(r13); \
EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN); \ EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN); \
lbz r10,PACAPROCENABLED(r13); \ lbz r10,PACAPROCENABLED(r13); \
@ -388,7 +388,7 @@ __start_interrupts:
. = 0x200 . = 0x200
_machine_check_pSeries: _machine_check_pSeries:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13) RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
@ -396,18 +396,18 @@ _machine_check_pSeries:
.globl data_access_pSeries .globl data_access_pSeries
data_access_pSeries: data_access_pSeries:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 mtspr SPRN_SPRG1,r13
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
mtspr SPRG2,r12 mtspr SPRN_SPRG2,r12
mfspr r13,DAR mfspr r13,SPRN_DAR
mfspr r12,DSISR mfspr r12,SPRN_DSISR
srdi r13,r13,60 srdi r13,r13,60
rlwimi r13,r12,16,0x20 rlwimi r13,r12,16,0x20
mfcr r12 mfcr r12
cmpwi r13,0x2c cmpwi r13,0x2c
beq .do_stab_bolted_pSeries beq .do_stab_bolted_pSeries
mtcrf 0x80,r12 mtcrf 0x80,r12
mfspr r12,SPRG2 mfspr r12,SPRN_SPRG2
END_FTR_SECTION_IFCLR(CPU_FTR_SLB) END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common) EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common)
@ -415,19 +415,19 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
.globl data_access_slb_pSeries .globl data_access_slb_pSeries
data_access_slb_pSeries: data_access_slb_pSeries:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 mtspr SPRN_SPRG1,r13
RUNLATCH_ON(r13) RUNLATCH_ON(r13)
mfspr r13,SPRG3 /* get paca address into r13 */ mfspr r13,SPRN_SPRG3 /* get paca address into r13 */
std r9,PACA_EXSLB+EX_R9(r13) /* save r9 - r12 */ std r9,PACA_EXSLB+EX_R9(r13) /* save r9 - r12 */
std r10,PACA_EXSLB+EX_R10(r13) std r10,PACA_EXSLB+EX_R10(r13)
std r11,PACA_EXSLB+EX_R11(r13) std r11,PACA_EXSLB+EX_R11(r13)
std r12,PACA_EXSLB+EX_R12(r13) std r12,PACA_EXSLB+EX_R12(r13)
std r3,PACA_EXSLB+EX_R3(r13) std r3,PACA_EXSLB+EX_R3(r13)
mfspr r9,SPRG1 mfspr r9,SPRN_SPRG1
std r9,PACA_EXSLB+EX_R13(r13) std r9,PACA_EXSLB+EX_R13(r13)
mfcr r9 mfcr r9
mfspr r12,SRR1 /* and SRR1 */ mfspr r12,SPRN_SRR1 /* and SRR1 */
mfspr r3,DAR mfspr r3,SPRN_DAR
b .do_slb_miss /* Rel. branch works in real mode */ b .do_slb_miss /* Rel. branch works in real mode */
STD_EXCEPTION_PSERIES(0x400, instruction_access) STD_EXCEPTION_PSERIES(0x400, instruction_access)
@ -436,19 +436,19 @@ data_access_slb_pSeries:
.globl instruction_access_slb_pSeries .globl instruction_access_slb_pSeries
instruction_access_slb_pSeries: instruction_access_slb_pSeries:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 mtspr SPRN_SPRG1,r13
RUNLATCH_ON(r13) RUNLATCH_ON(r13)
mfspr r13,SPRG3 /* get paca address into r13 */ mfspr r13,SPRN_SPRG3 /* get paca address into r13 */
std r9,PACA_EXSLB+EX_R9(r13) /* save r9 - r12 */ std r9,PACA_EXSLB+EX_R9(r13) /* save r9 - r12 */
std r10,PACA_EXSLB+EX_R10(r13) std r10,PACA_EXSLB+EX_R10(r13)
std r11,PACA_EXSLB+EX_R11(r13) std r11,PACA_EXSLB+EX_R11(r13)
std r12,PACA_EXSLB+EX_R12(r13) std r12,PACA_EXSLB+EX_R12(r13)
std r3,PACA_EXSLB+EX_R3(r13) std r3,PACA_EXSLB+EX_R3(r13)
mfspr r9,SPRG1 mfspr r9,SPRN_SPRG1
std r9,PACA_EXSLB+EX_R13(r13) std r9,PACA_EXSLB+EX_R13(r13)
mfcr r9 mfcr r9
mfspr r12,SRR1 /* and SRR1 */ mfspr r12,SPRN_SRR1 /* and SRR1 */
mfspr r3,SRR0 /* SRR0 is faulting address */ mfspr r3,SPRN_SRR0 /* SRR0 is faulting address */
b .do_slb_miss /* Rel. branch works in real mode */ b .do_slb_miss /* Rel. branch works in real mode */
STD_EXCEPTION_PSERIES(0x500, hardware_interrupt) STD_EXCEPTION_PSERIES(0x500, hardware_interrupt)
@ -466,15 +466,15 @@ system_call_pSeries:
RUNLATCH_ON(r9) RUNLATCH_ON(r9)
mr r9,r13 mr r9,r13
mfmsr r10 mfmsr r10
mfspr r13,SPRG3 mfspr r13,SPRN_SPRG3
mfspr r11,SRR0 mfspr r11,SPRN_SRR0
clrrdi r12,r13,32 clrrdi r12,r13,32
oris r12,r12,system_call_common@h oris r12,r12,system_call_common@h
ori r12,r12,system_call_common@l ori r12,r12,system_call_common@l
mtspr SRR0,r12 mtspr SPRN_SRR0,r12
ori r10,r10,MSR_IR|MSR_DR|MSR_RI ori r10,r10,MSR_IR|MSR_DR|MSR_RI
mfspr r12,SRR1 mfspr r12,SPRN_SRR1
mtspr SRR1,r10 mtspr SPRN_SRR1,r10
rfid rfid
b . /* prevent speculative execution */ b . /* prevent speculative execution */
@ -504,7 +504,7 @@ system_call_pSeries:
.align 7 .align 7
_GLOBAL(do_stab_bolted_pSeries) _GLOBAL(do_stab_bolted_pSeries)
mtcrf 0x80,r12 mtcrf 0x80,r12
mfspr r12,SPRG2 mfspr r12,SPRN_SPRG2
EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted) EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)
/* /*
@ -513,14 +513,14 @@ _GLOBAL(do_stab_bolted_pSeries)
.globl system_reset_fwnmi .globl system_reset_fwnmi
system_reset_fwnmi: system_reset_fwnmi:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13) RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common) EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
.globl machine_check_fwnmi .globl machine_check_fwnmi
machine_check_fwnmi: machine_check_fwnmi:
HMT_MEDIUM HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13) RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
@ -531,18 +531,18 @@ machine_check_fwnmi:
.globl data_access_iSeries .globl data_access_iSeries
data_access_iSeries: data_access_iSeries:
mtspr SPRG1,r13 mtspr SPRN_SPRG1,r13
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
mtspr SPRG2,r12 mtspr SPRN_SPRG2,r12
mfspr r13,DAR mfspr r13,SPRN_DAR
mfspr r12,DSISR mfspr r12,SPRN_DSISR
srdi r13,r13,60 srdi r13,r13,60
rlwimi r13,r12,16,0x20 rlwimi r13,r12,16,0x20
mfcr r12 mfcr r12
cmpwi r13,0x2c cmpwi r13,0x2c
beq .do_stab_bolted_iSeries beq .do_stab_bolted_iSeries
mtcrf 0x80,r12 mtcrf 0x80,r12
mfspr r12,SPRG2 mfspr r12,SPRN_SPRG2
END_FTR_SECTION_IFCLR(CPU_FTR_SLB) END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN) EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN)
EXCEPTION_PROLOG_ISERIES_2 EXCEPTION_PROLOG_ISERIES_2
@ -550,25 +550,25 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
.do_stab_bolted_iSeries: .do_stab_bolted_iSeries:
mtcrf 0x80,r12 mtcrf 0x80,r12
mfspr r12,SPRG2 mfspr r12,SPRN_SPRG2
EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB) EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB)
EXCEPTION_PROLOG_ISERIES_2 EXCEPTION_PROLOG_ISERIES_2
b .do_stab_bolted b .do_stab_bolted
.globl data_access_slb_iSeries .globl data_access_slb_iSeries
data_access_slb_iSeries: data_access_slb_iSeries:
mtspr SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB) EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB)
std r3,PACA_EXSLB+EX_R3(r13) std r3,PACA_EXSLB+EX_R3(r13)
ld r12,PACALPPACA+LPPACASRR1(r13) ld r12,PACALPPACA+LPPACASRR1(r13)
mfspr r3,DAR mfspr r3,SPRN_DAR
b .do_slb_miss b .do_slb_miss
STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN) STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN)
.globl instruction_access_slb_iSeries .globl instruction_access_slb_iSeries
instruction_access_slb_iSeries: instruction_access_slb_iSeries:
mtspr SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB) EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB)
std r3,PACA_EXSLB+EX_R3(r13) std r3,PACA_EXSLB+EX_R3(r13)
ld r12,PACALPPACA+LPPACASRR1(r13) ld r12,PACALPPACA+LPPACASRR1(r13)
@ -586,7 +586,7 @@ instruction_access_slb_iSeries:
.globl system_call_iSeries .globl system_call_iSeries
system_call_iSeries: system_call_iSeries:
mr r9,r13 mr r9,r13
mfspr r13,SPRG3 mfspr r13,SPRN_SPRG3
EXCEPTION_PROLOG_ISERIES_2 EXCEPTION_PROLOG_ISERIES_2
b system_call_common b system_call_common
@ -596,7 +596,7 @@ system_call_iSeries:
.globl system_reset_iSeries .globl system_reset_iSeries
system_reset_iSeries: system_reset_iSeries:
mfspr r13,SPRG3 /* Get paca address */ mfspr r13,SPRN_SPRG3 /* Get paca address */
mfmsr r24 mfmsr r24
ori r24,r24,MSR_RI ori r24,r24,MSR_RI
mtmsrd r24 /* RI on */ mtmsrd r24 /* RI on */
@ -639,7 +639,7 @@ iSeries_secondary_smp_loop:
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
li r0,-1 /* r0=-1 indicates a Hypervisor call */ li r0,-1 /* r0=-1 indicates a Hypervisor call */
sc /* Invoke the hypervisor via a system call */ sc /* Invoke the hypervisor via a system call */
mfspr r13,SPRG3 /* Put r13 back ???? */ mfspr r13,SPRN_SPRG3 /* Put r13 back ???? */
b 1b /* If SMP not configured, secondaries b 1b /* If SMP not configured, secondaries
* loop forever */ * loop forever */
@ -656,8 +656,8 @@ hardware_interrupt_iSeries_masked:
mtcrf 0x80,r9 /* Restore regs */ mtcrf 0x80,r9 /* Restore regs */
ld r11,PACALPPACA+LPPACASRR0(r13) ld r11,PACALPPACA+LPPACASRR0(r13)
ld r12,PACALPPACA+LPPACASRR1(r13) ld r12,PACALPPACA+LPPACASRR1(r13)
mtspr SRR0,r11 mtspr SPRN_SRR0,r11
mtspr SRR1,r12 mtspr SPRN_SRR1,r12
ld r9,PACA_EXGEN+EX_R9(r13) ld r9,PACA_EXGEN+EX_R9(r13)
ld r10,PACA_EXGEN+EX_R10(r13) ld r10,PACA_EXGEN+EX_R10(r13)
ld r11,PACA_EXGEN+EX_R11(r13) ld r11,PACA_EXGEN+EX_R11(r13)
@ -713,8 +713,8 @@ bad_stack:
std r10,GPR1(r1) std r10,GPR1(r1)
std r11,_NIP(r1) std r11,_NIP(r1)
std r12,_MSR(r1) std r12,_MSR(r1)
mfspr r11,DAR mfspr r11,SPRN_DAR
mfspr r12,DSISR mfspr r12,SPRN_DSISR
std r11,_DAR(r1) std r11,_DAR(r1)
std r12,_DSISR(r1) std r12,_DSISR(r1)
mflr r10 mflr r10
@ -766,8 +766,8 @@ fast_exception_return:
clrrdi r10,r10,2 /* clear RI (LE is 0 already) */ clrrdi r10,r10,2 /* clear RI (LE is 0 already) */
mtmsrd r10,1 mtmsrd r10,1
mtspr SRR1,r12 mtspr SPRN_SRR1,r12
mtspr SRR0,r11 mtspr SPRN_SRR0,r11
REST_4GPRS(10, r1) REST_4GPRS(10, r1)
ld r1,GPR1(r1) ld r1,GPR1(r1)
rfid rfid
@ -788,9 +788,9 @@ unrecov_fer:
.globl data_access_common .globl data_access_common
data_access_common: data_access_common:
RUNLATCH_ON(r10) /* It wont fit in the 0x300 handler */ RUNLATCH_ON(r10) /* It wont fit in the 0x300 handler */
mfspr r10,DAR mfspr r10,SPRN_DAR
std r10,PACA_EXGEN+EX_DAR(r13) std r10,PACA_EXGEN+EX_DAR(r13)
mfspr r10,DSISR mfspr r10,SPRN_DSISR
stw r10,PACA_EXGEN+EX_DSISR(r13) stw r10,PACA_EXGEN+EX_DSISR(r13)
EXCEPTION_PROLOG_COMMON(0x300, PACA_EXGEN) EXCEPTION_PROLOG_COMMON(0x300, PACA_EXGEN)
ld r3,PACA_EXGEN+EX_DAR(r13) ld r3,PACA_EXGEN+EX_DAR(r13)
@ -821,9 +821,9 @@ hardware_interrupt_entry:
.align 7 .align 7
.globl alignment_common .globl alignment_common
alignment_common: alignment_common:
mfspr r10,DAR mfspr r10,SPRN_DAR
std r10,PACA_EXGEN+EX_DAR(r13) std r10,PACA_EXGEN+EX_DAR(r13)
mfspr r10,DSISR mfspr r10,SPRN_DSISR
stw r10,PACA_EXGEN+EX_DSISR(r13) stw r10,PACA_EXGEN+EX_DSISR(r13)
EXCEPTION_PROLOG_COMMON(0x600, PACA_EXGEN) EXCEPTION_PROLOG_COMMON(0x600, PACA_EXGEN)
ld r3,PACA_EXGEN+EX_DAR(r13) ld r3,PACA_EXGEN+EX_DAR(r13)
@ -1064,7 +1064,7 @@ _GLOBAL(do_stab_bolted)
/* Hash to the primary group */ /* Hash to the primary group */
ld r10,PACASTABVIRT(r13) ld r10,PACASTABVIRT(r13)
mfspr r11,DAR mfspr r11,SPRN_DAR
srdi r11,r11,28 srdi r11,r11,28
rldimi r10,r11,7,52 /* r10 = first ste of the group */ rldimi r10,r11,7,52 /* r10 = first ste of the group */
@ -1106,7 +1106,7 @@ _GLOBAL(do_stab_bolted)
2: std r9,8(r10) /* Store the vsid part of the ste */ 2: std r9,8(r10) /* Store the vsid part of the ste */
eieio eieio
mfspr r11,DAR /* Get the new esid */ mfspr r11,SPRN_DAR /* Get the new esid */
clrrdi r11,r11,28 /* Permits a full 32b of ESID */ clrrdi r11,r11,28 /* Permits a full 32b of ESID */
ori r11,r11,0x90 /* Turn on valid and kp */ ori r11,r11,0x90 /* Turn on valid and kp */
std r11,0(r10) /* Put new entry back into the stab */ std r11,0(r10) /* Put new entry back into the stab */
@ -1126,8 +1126,8 @@ _GLOBAL(do_stab_bolted)
clrrdi r10,r10,2 clrrdi r10,r10,2
mtmsrd r10,1 mtmsrd r10,1
mtspr SRR0,r11 mtspr SPRN_SRR0,r11
mtspr SRR1,r12 mtspr SPRN_SRR1,r12
ld r9,PACA_EXSLB+EX_R9(r13) ld r9,PACA_EXSLB+EX_R9(r13)
ld r10,PACA_EXSLB+EX_R10(r13) ld r10,PACA_EXSLB+EX_R10(r13)
ld r11,PACA_EXSLB+EX_R11(r13) ld r11,PACA_EXSLB+EX_R11(r13)
@ -1173,8 +1173,8 @@ _GLOBAL(do_slb_miss)
.machine pop .machine pop
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
mtspr SRR0,r11 mtspr SPRN_SRR0,r11
mtspr SRR1,r12 mtspr SPRN_SRR1,r12
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
ld r9,PACA_EXSLB+EX_R9(r13) ld r9,PACA_EXSLB+EX_R9(r13)
ld r10,PACA_EXSLB+EX_R10(r13) ld r10,PACA_EXSLB+EX_R10(r13)
@ -1260,7 +1260,7 @@ _GLOBAL(pSeries_secondary_smp_init)
mr r3,r24 /* not found, copy phys to r3 */ mr r3,r24 /* not found, copy phys to r3 */
b .kexec_wait /* next kernel might do better */ b .kexec_wait /* next kernel might do better */
2: mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */ 2: mtspr SPRN_SPRG3,r13 /* Save vaddr of paca in SPRG3 */
/* From now on, r24 is expected to be logical cpuid */ /* From now on, r24 is expected to be logical cpuid */
mr r24,r5 mr r24,r5
3: HMT_LOW 3: HMT_LOW
@ -1531,7 +1531,7 @@ _GLOBAL(pmac_secondary_start)
LOADADDR(r4, paca) /* Get base vaddr of paca array */ LOADADDR(r4, paca) /* Get base vaddr of paca array */
mulli r13,r24,PACA_SIZE /* Calculate vaddr of right paca */ mulli r13,r24,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r4 /* for this processor. */ add r13,r13,r4 /* for this processor. */
mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */ mtspr SPRN_SPRG3,r13 /* Save vaddr of paca in SPRG3 */
/* Create a temp kernel stack for use before relocation is on. */ /* Create a temp kernel stack for use before relocation is on. */
ld r1,PACAEMERGSP(r13) ld r1,PACAEMERGSP(r13)
@ -1566,7 +1566,7 @@ _GLOBAL(__secondary_start)
/* Initialize the page table pointer register. */ /* Initialize the page table pointer register. */
LOADADDR(r6,_SDR1) LOADADDR(r6,_SDR1)
ld r6,0(r6) /* get the value of _SDR1 */ ld r6,0(r6) /* get the value of _SDR1 */
mtspr SDR1,r6 /* set the htab location */ mtspr SPRN_SDR1,r6 /* set the htab location */
#endif #endif
/* Initialize the first segment table (or SLB) entry */ /* Initialize the first segment table (or SLB) entry */
ld r3,PACASTABVIRT(r13) /* get addr of segment table */ ld r3,PACASTABVIRT(r13) /* get addr of segment table */
@ -1595,7 +1595,7 @@ _GLOBAL(__secondary_start)
lwz r3,PLATFORM(r3) /* r3 = platform flags */ lwz r3,PLATFORM(r3) /* r3 = platform flags */
andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */ andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */
beq 98f /* branch if result is 0 */ beq 98f /* branch if result is 0 */
mfspr r3,PVR mfspr r3,SPRN_PVR
srwi r3,r3,16 srwi r3,r3,16
cmpwi r3,0x37 /* SStar */ cmpwi r3,0x37 /* SStar */
beq 97f beq 97f
@ -1619,8 +1619,8 @@ _GLOBAL(__secondary_start)
#ifdef DO_SOFT_DISABLE #ifdef DO_SOFT_DISABLE
ori r4,r4,MSR_EE ori r4,r4,MSR_EE
#endif #endif
mtspr SRR0,r3 mtspr SPRN_SRR0,r3
mtspr SRR1,r4 mtspr SPRN_SRR1,r4
rfid rfid
b . /* prevent speculative execution */ b . /* prevent speculative execution */
@ -1682,7 +1682,7 @@ _STATIC(start_here_multiplatform)
#ifdef CONFIG_HMT #ifdef CONFIG_HMT
/* Start up the second thread on cpu 0 */ /* Start up the second thread on cpu 0 */
mfspr r3,PVR mfspr r3,SPRN_PVR
srwi r3,r3,16 srwi r3,r3,16
cmpwi r3,0x34 /* Pulsar */ cmpwi r3,0x34 /* Pulsar */
beq 90f beq 90f
@ -1742,7 +1742,7 @@ _STATIC(start_here_multiplatform)
mulli r13,r27,PACA_SIZE /* Calculate vaddr of right paca */ mulli r13,r27,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r24 /* for this processor. */ add r13,r13,r24 /* for this processor. */
sub r13,r13,r26 /* convert to physical addr */ sub r13,r13,r26 /* convert to physical addr */
mtspr SPRG3,r13 /* PPPBBB: Temp... -Peter */ mtspr SPRN_SPRG3,r13 /* PPPBBB: Temp... -Peter */
/* Do very early kernel initializations, including initial hash table, /* Do very early kernel initializations, including initial hash table,
* stab and slb setup before we turn on relocation. */ * stab and slb setup before we turn on relocation. */
@ -1759,7 +1759,7 @@ _STATIC(start_here_multiplatform)
lwz r3,PLATFORM(r3) /* r3 = platform flags */ lwz r3,PLATFORM(r3) /* r3 = platform flags */
andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */ andi. r3,r3,PLATFORM_LPAR /* Test if bit 0 is set (LPAR bit) */
beq 98f /* branch if result is 0 */ beq 98f /* branch if result is 0 */
mfspr r3,PVR mfspr r3,SPRN_PVR
srwi r3,r3,16 srwi r3,r3,16
cmpwi r3,0x37 /* SStar */ cmpwi r3,0x37 /* SStar */
beq 97f beq 97f
@ -1783,12 +1783,12 @@ _STATIC(start_here_multiplatform)
LOADADDR(r6,_SDR1) /* Only if NOT LPAR */ LOADADDR(r6,_SDR1) /* Only if NOT LPAR */
sub r6,r6,r26 sub r6,r6,r26
ld r6,0(r6) /* get the value of _SDR1 */ ld r6,0(r6) /* get the value of _SDR1 */
mtspr SDR1,r6 /* set the htab location */ mtspr SPRN_SDR1,r6 /* set the htab location */
98: 98:
LOADADDR(r3,.start_here_common) LOADADDR(r3,.start_here_common)
SET_REG_TO_CONST(r4, MSR_KERNEL) SET_REG_TO_CONST(r4, MSR_KERNEL)
mtspr SRR0,r3 mtspr SPRN_SRR0,r3
mtspr SRR1,r4 mtspr SPRN_SRR1,r4
rfid rfid
b . /* prevent speculative execution */ b . /* prevent speculative execution */
#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* CONFIG_PPC_MULTIPLATFORM */
@ -1819,7 +1819,7 @@ _STATIC(start_here_common)
LOADADDR(r24, paca) /* Get base vaddr of paca array */ LOADADDR(r24, paca) /* Get base vaddr of paca array */
mulli r13,r26,PACA_SIZE /* Calculate vaddr of right paca */ mulli r13,r26,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r24 /* for this processor. */ add r13,r13,r24 /* for this processor. */
mtspr SPRG3,r13 mtspr SPRN_SPRG3,r13
/* ptr to current */ /* ptr to current */
LOADADDR(r4,init_task) LOADADDR(r4,init_task)
@ -1846,7 +1846,7 @@ _STATIC(start_here_common)
_GLOBAL(hmt_init) _GLOBAL(hmt_init)
#ifdef CONFIG_HMT #ifdef CONFIG_HMT
LOADADDR(r5, hmt_thread_data) LOADADDR(r5, hmt_thread_data)
mfspr r7,PVR mfspr r7,SPRN_PVR
srwi r7,r7,16 srwi r7,r7,16
cmpwi r7,0x34 /* Pulsar */ cmpwi r7,0x34 /* Pulsar */
beq 90f beq 90f
@ -1855,10 +1855,10 @@ _GLOBAL(hmt_init)
cmpwi r7,0x37 /* SStar */ cmpwi r7,0x37 /* SStar */
beq 91f beq 91f
b 101f b 101f
90: mfspr r6,PIR 90: mfspr r6,SPRN_PIR
andi. r6,r6,0x1f andi. r6,r6,0x1f
b 92f b 92f
91: mfspr r6,PIR 91: mfspr r6,SPRN_PIR
andi. r6,r6,0x3ff andi. r6,r6,0x3ff
92: sldi r4,r24,3 92: sldi r4,r24,3
stwx r6,r5,r4 stwx r6,r5,r4
@ -1869,8 +1869,8 @@ __hmt_secondary_hold:
LOADADDR(r5, hmt_thread_data) LOADADDR(r5, hmt_thread_data)
clrldi r5,r5,4 clrldi r5,r5,4
li r7,0 li r7,0
mfspr r6,PIR mfspr r6,SPRN_PIR
mfspr r8,PVR mfspr r8,SPRN_PVR
srwi r8,r8,16 srwi r8,r8,16
cmpwi r8,0x34 cmpwi r8,0x34
bne 93f bne 93f
@ -1896,19 +1896,19 @@ __hmt_secondary_hold:
_GLOBAL(hmt_start_secondary) _GLOBAL(hmt_start_secondary)
LOADADDR(r4,__hmt_secondary_hold) LOADADDR(r4,__hmt_secondary_hold)
clrldi r4,r4,4 clrldi r4,r4,4
mtspr NIADORM, r4 mtspr SPRN_NIADORM, r4
mfspr r4, MSRDORM mfspr r4, SPRN_MSRDORM
li r5, -65 li r5, -65
and r4, r4, r5 and r4, r4, r5
mtspr MSRDORM, r4 mtspr SPRN_MSRDORM, r4
lis r4,0xffef lis r4,0xffef
ori r4,r4,0x7403 ori r4,r4,0x7403
mtspr TSC, r4 mtspr SPRN_TSC, r4
li r4,0x1f4 li r4,0x1f4
mtspr TST, r4 mtspr SPRN_TST, r4
mfspr r4, HID0 mfspr r4, SPRN_HID0
ori r4, r4, 0x1 ori r4, r4, 0x1
mtspr HID0, r4 mtspr SPRN_HID0, r4
mfspr r4, SPRN_CTRLF mfspr r4, SPRN_CTRLF
oris r4, r4, 0x40 oris r4, r4, 0x40
mtspr SPRN_CTRLT, r4 mtspr SPRN_CTRLT, r4

4
arch/ppc64/kernel/pmc.c
View File

@ -70,7 +70,7 @@ void power4_enable_pmcs(void)
{ {
unsigned long hid0; unsigned long hid0;
hid0 = mfspr(HID0); hid0 = mfspr(SPRN_HID0);
hid0 |= 1UL << (63 - 20); hid0 |= 1UL << (63 - 20);
/* POWER4 requires the following sequence */ /* POWER4 requires the following sequence */
@ -83,6 +83,6 @@ void power4_enable_pmcs(void)
"mfspr %0, %1\n" "mfspr %0, %1\n"
"mfspr %0, %1\n" "mfspr %0, %1\n"
"mfspr %0, %1\n" "mfspr %0, %1\n"
"isync" : "=&r" (hid0) : "i" (HID0), "0" (hid0): "isync" : "=&r" (hid0) : "i" (SPRN_HID0), "0" (hid0):
"memory"); "memory");
} }