Skip to content

L
linux
Commit 3086a7d5 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

ppc64: put paca in r13 and fix non zero boot cpu

parent a1c90320
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 84 deletions
arch/ppc64/kernel/entry.S
View file @ 3086a7d5
......@@ -64,7 +64,8 @@ _GLOBAL(DoSyscall)
#ifdef SHOW_SYSCALLS_TASK
LOADBASE(r31,show_syscalls_task)
ld r31,show_syscalls_task@l(r31)
cmp 0,r13,r31
ld r10,PACACURRENT(r13)
cmp 0,r10,r31
bne 1f
#endif
LOADADDR(r3,7f)
......@@ -78,7 +79,7 @@ _GLOBAL(DoSyscall)
LOADADDR(r3,77f)
ld r4,GPR8(r1)
ld r5,GPR9(r1)
mr r6,r13
ld r6, PACACURRENT(r13)
bl .printk
ld r0,GPR0(r1)
ld r3,GPR3(r1)
......@@ -129,7 +130,8 @@ _GLOBAL(ret_from_syscall_1)
20: std r3,RESULT(r1) /* Save result */
#ifdef SHOW_SYSCALLS
#ifdef SHOW_SYSCALLS_TASK
cmp 0,r13,r31
ld r10, PACACURRENT(13)
cmp 0,r10,r31
bne 91f
#endif
mr r4,r3
......@@ -289,9 +291,8 @@ _GLOBAL(_switch)
std r23,_CCR(r1)
std r1,KSP(r3) /* Set old stack pointer */
mfspr r5,SPRG3 /* Get paca */
addi r13,r4,-THREAD /* Convert THREAD to 'current' */
std r13,PACACURRENT(r5) /* Set new 'current' */
addi r6,r4,-THREAD /* Convert THREAD to 'current' */
std r6,PACACURRENT(r13) /* Set new 'current' */
#ifdef CONFIG_PPC_ISERIES
#error fixme
......@@ -335,6 +336,7 @@ irq_recheck:
CHECKANYINT(r3,r4)
beq+ 4f /* skip do_IRQ if no interrupts */
#warning FIX ISERIES
mfspr r5,SPRG3
li r3,0
stb r3,PACAPROCENABLED(r5) /* ensure we are disabled */
......@@ -370,9 +372,15 @@ recheck:
bne do_work
addi r0,r1,INT_FRAME_SIZE /* size of frame */
std r0,THREAD+KSP(r13) /* save kernel stack pointer */
mfspr r4,SPRG3 /* current task's PACA */
std r1,PACAKSAVE(r4) /* save exception stack pointer */
ld r4,PACACURRENT(r13)
std r0,THREAD+KSP(r4) /* save kernel stack pointer */
std r1,PACAKSAVE(r13) /* save exception stack pointer */
/*
* r13 is our per cpu area, only restore it if we are returning to
* userspace
*/
REST_GPR(13,r1)
restore:
ld r3,_CTR(r1)
......@@ -389,25 +397,33 @@ restore:
stdcx. r0,0,r1 /* to clear the reservation */
#ifdef DO_SOFT_DISABLE
/* XXX do this in do_work, r13 isnt valid here */
ld r0,SOFTE(r1)
stb r0,PACAPROCENABLED(r13)
#endif
ld r0,_MSR(r1)
mtspr SRR1,r0
ld r2,_CCR(r1)
mtcrf 0xFF,r2
ld r2,_NIP(r1)
mtspr SRR0,r2
REST_GPR(13,r1)
ld r0,GPR0(r1)
ld r2,GPR2(r1)
ld r3,GPR3(r1)
ld r4,GPR4(r1)
ld r1,GPR1(r1)
/*
* What if we took an exception and stole this segment, we may
* fault on the above addresses and globber SRR0/1. Should check RI
* bit and repeat - Anton
*/
rfid
/* Note: this must change if we start using the TIF_NOTIFY_RESUME bit */
do_work:
/* Enable interrupts */
ori r10,r10,MSR_EE|MSR_RI
......@@ -419,15 +435,12 @@ do_work:
b recheck
1: andi. r0,r3,_TIF_SIGPENDING
beq 2f
beq recheck
li r3,0
addi r4,r1,STACK_FRAME_OVERHEAD
bl .do_signal
b recheck
2: /* nobody uses the TIF_NOTIFY_RESUME bit yet */
b recheck
/*
* On CHRP, the Run-Time Abstraction Services (RTAS) have to be
* called with the MMU off.
......@@ -446,7 +459,7 @@ _GLOBAL(enter_rtas)
* RTAS might touch to the stack. (r0, r3-r13 are caller saved)
*/
SAVE_GPR(2, r1) /* Save the TOC */
SAVE_GPR(13, r1) /* Save current */
SAVE_GPR(13, r1) /* Save paca */
SAVE_8GPRS(14, r1) /* Save the non-volatiles */
SAVE_10GPRS(22, r1) /* ditto */
......@@ -465,14 +478,13 @@ _GLOBAL(enter_rtas)
mfsrr1 r10
std r10,_SRR1(r1)
/* Unfortunatly, the stack pointer and the MSR are also clobbered,
* so they are saved in the PACA (SPRG3) which allows us to restore
/* Unfortunately, the stack pointer and the MSR are also clobbered,
* so they are saved in the PACA which allows us to restore
* our original state after RTAS returns.
*/
mfspr r4,SPRG3 /* Get PACA */
std r1,PACAR1(r4)
std r1,PACAR1(r13)
mfmsr r6
std r6,PACASAVEDMSR(r4)
std r6,PACASAVEDMSR(r13)
/* Setup our real return addr */
SET_REG_TO_LABEL(r4,.rtas_return_loc)
......@@ -516,13 +528,11 @@ _STATIC(rtas_return_loc)
_STATIC(rtas_restore_regs)
/* relocation is on at this point */
REST_GPR(2, r1) /* Restore the TOC */
REST_GPR(13, r1) /* Restore current */
REST_GPR(13, r1) /* Restore paca */
REST_8GPRS(14, r1) /* Restore the non-volatiles */
REST_10GPRS(22, r1) /* ditto */
/* put back current in r13 */
mfspr r4,SPRG3
ld r13,PACACURRENT(r4)
mfspr r13,SPRG3
ld r4,_CCR(r1)
mtcr r4
......@@ -555,7 +565,7 @@ _GLOBAL(enter_prom)
* PROM might touch to the stack. (r0, r3-r13 are caller saved)
*/
SAVE_8GPRS(2, r1) /* Save the TOC & incoming param(s) */
SAVE_GPR(13, r1) /* Save current */
SAVE_GPR(13, r1) /* Save paca */
SAVE_8GPRS(14, r1) /* Save the non-volatiles */
SAVE_10GPRS(22, r1) /* ditto */
......@@ -600,7 +610,7 @@ _GLOBAL(enter_prom)
isync
REST_8GPRS(2, r1) /* Restore the TOC & param(s) */
REST_GPR(13, r1) /* Restore current */
REST_GPR(13, r1) /* Restore paca */
REST_8GPRS(14, r1) /* Restore the non-volatiles */
REST_10GPRS(22, r1) /* ditto */
blrl /* Entering PROM here... */
......@@ -611,7 +621,7 @@ _GLOBAL(enter_prom)
isync
REST_GPR(2, r1) /* Restore the TOC */
REST_GPR(13, r1) /* Restore current */
REST_GPR(13, r1) /* Restore paca */
REST_8GPRS(14, r1) /* Restore the non-volatiles */
REST_10GPRS(22, r1) /* ditto */
......
arch/ppc64/kernel/head.S
View file @ 3086a7d5
......@@ -275,7 +275,7 @@ _GLOBAL(__secondary_hold)
SAVE_8GPRS(2, r1); /* save r2 - r13 in stackframe */ \
SAVE_4GPRS(10, r1); \
ld r2,PACATOC(r20); \
ld r13,PACACURRENT(r20)
mr r13,r20
/*
* Note: code which follows this uses cr0.eq (set if from kernel),
......@@ -433,8 +433,8 @@ __end_stab:
.globl SystemReset_Iseries
SystemReset_Iseries:
mfspr 25,SPRG3 /* Get paca address */
lhz r24,PACAPACAINDEX(r25) /* Get processor # */
mfspr r13,SPRG3 /* Get paca address */
lhz r24,PACAPACAINDEX(r13) /* Get processor # */
cmpi 0,r24,0 /* Are we processor 0? */
beq .__start_initialization_iSeries /* Start up the first processor */
mfspr r4,CTRLF
......@@ -445,7 +445,7 @@ SystemReset_Iseries:
1:
HMT_LOW
#ifdef CONFIG_SMP
lbz r23,PACAPROCSTART(r25) /* Test if this processor
lbz r23,PACAPROCSTART(r13) /* Test if this processor
* should start */
sync
LOADADDR(r3,current_set)
......@@ -475,7 +475,7 @@ iseries_secondary_smp_loop:
#endif /* CONFIG_SMP */
li r0,-1 /* r0=-1 indicates a Hypervisor call */
sc /* Invoke the hypervisor via a system call */
mfspr r25,SPRG3 /* Put r25 back ???? */
mfspr r13,SPRG3 /* Put r13 back ???? */
b 1b /* If SMP not configured, secondaries
* loop forever */
......@@ -688,33 +688,41 @@ HardwareInterrupt_entry:
/* */
/* The call to do_irq will preserve the value of r14 - r31 */
/* */
mfspr r20,SPRG3 /* get paca */
lbz r21,PACAHRDWINTCOUNT(r20) /* get hardware interrupt cnt */
/*
* XXX turn off interrupt stacks until the thread_info stuff is fixed.
* Otherwise we end up setting need_resched etc bits in the interrupt
* stack and they never get seen when we return to the process stack - Anton
*/
#if 0
lbz r21,PACAHRDWINTCOUNT(r13) /* get hardware interrupt cnt */
cmpi 0,r21,1 /* */
addi r21,r21,1 /* incr hardware interrupt cnt*/
stb r21,PACAHRDWINTCOUNT(r20) /* */
stb r21,PACAHRDWINTCOUNT(r13) /* */
bne 2f /* */
mr r14,r1 /* preserve current r1 */
ld r1,PACAHRDWINTSTACK(r20) /* */
ld r1,PACAHRDWINTSTACK(r13) /* */
std r14,0(r1) /* set the back chain */
bl .do_IRQ
lbz r22,PACAHRDWINTCOUNT(r20) /* get hardware interrupt cnt */
lbz r22,PACAHRDWINTCOUNT(r13) /* get hardware interrupt cnt */
cmp 0,r22,r21 /* debug test */
bne 3f
subi r21,r21,1
stb r21,PACAHRDWINTCOUNT(r20) /* */
stb r21,PACAHRDWINTCOUNT(r13) /* */
mr r1,r14 /* */
b .ret_from_except
#endif
2:
bl .do_IRQ
lbz r22,PACAHRDWINTCOUNT(r20) /* get hardware interrupt cnt */
#if 0
lbz r22,PACAHRDWINTCOUNT(r13) /* get hardware interrupt cnt */
cmp 0,r22,r21 /* debug test */
bne 3f /* */
subi r21,r21,1 /* decr hardware interrupt cnt*/
stb r21,PACAHRDWINTCOUNT(r20) /* */
stb r21,PACAHRDWINTCOUNT(r13) /* */
#endif
b .ret_from_except
......@@ -1119,21 +1127,22 @@ _GLOBAL(save_remaining_regs)
* Indicate that r1 contains the kernel stack and
* get the Kernel TOC and CURRENT pointers from the paca
*/
mfspr r23,SPRG3 /* Get PACA */
std r22,PACAKSAVE(r23) /* r1 is now kernel sp */
ld r2,PACATOC(r23) /* Get Kernel TOC pointer */
std r22,PACAKSAVE(r13) /* r1 is now kernel sp */
ld r2,PACATOC(r13) /* Get Kernel TOC pointer */
/*
* If from user state, update THREAD.regs
*/
beq 2f /* Modify THREAD.regs if from user */
addi r24,r1,STACK_FRAME_OVERHEAD
std r24,THREAD+PT_REGS(r13)
ld r22, PACACURRENT(r13)
std r24,THREAD+PT_REGS(r22)
2:
SET_REG_TO_CONST(r22, MSR_KERNEL)
#ifdef DO_SOFT_DISABLE
stb r20,PACAPROCENABLED(r23) /* possibly soft enable */
#warning FIX ISERIES
stb r20,PACAPROCENABLED(r13) /* possibly soft enable */
ori r22,r22,MSR_EE /* always hard enable */
#else
rldimi r22,r20,15,48 /* Insert desired EE value */
......@@ -1180,20 +1189,20 @@ _GLOBAL(pseries_secondary_smp_init)
/* Set up a paca value for this processor. */
LOADADDR(r24, paca) /* Get base vaddr of paca array */
mulli r25,r3,PACA_SIZE /* Calculate vaddr of right paca */
add r25,r25,r24 /* for this processor. */
mulli r13,r3,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r24 /* for this processor. */
mtspr SPRG3,r25 /* Save vaddr of paca in SPRG3 */
mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */
mr r24,r3 /* __secondary_start needs cpu# */
1:
HMT_LOW
lbz r23,PACAPROCSTART(r25) /* Test if this processor should */
lbz r23,PACAPROCSTART(r13) /* Test if this processor should */
/* start. */
sync
/* Create a temp kernel stack for use before relocation is on. */
mr r1,r25
mr r1,r13
addi r1,r1,PACAGUARD
addi r1,r1,0x1000
subi r1,r1,STACK_FRAME_OVERHEAD
......@@ -1422,7 +1431,8 @@ _STATIC(load_up_fpu)
#endif /* CONFIG_SMP */
/* enable use of FP after return */
ori r23,r23,MSR_FP|MSR_FE0|MSR_FE1
addi r5,r13,THREAD /* Get THREAD */
ld r4, PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
lfd fr0,THREAD_FPSCR-4(r5)
mtfsf 0xff,fr0
REST_32FPRS(0, r5)
......@@ -1442,8 +1452,7 @@ _GLOBAL(KernelFP)
ori r3,r3,MSR_FP
std r3,_MSR(r1) /* enable use of FP after return */
LOADADDR(r3,86f)
mfspr r4,SPRG3 /* Get PACA */
ld r4,PACACURRENT(r4) /* current */
ld r4,PACACURRENT(r13) /* current */
ld r5,_NIP(r1)
b .ret_from_except
86: .string "floating point used in kernel (task=%p, pc=%x)\n"
......@@ -1492,7 +1501,7 @@ _GLOBAL(giveup_fpu)
* On entry the following are set:
* r1 = stack pointer. vaddr for iSeries, raddr (temp stack) for pSeries
* r24 = cpu# (in Linux terms)
* r25 = paca virtual address
* r13 = paca virtual address
* SPRG3 = paca virtual address
*/
_GLOBAL(__secondary_start)
......@@ -1504,10 +1513,10 @@ _GLOBAL(__secondary_start)
addi r2,r2,0x4000
addi r2,r2,0x4000
std r2,PACATOC(r25)
std r2,PACATOC(r13)
li r6,0
std r6,PACAKSAVE(r25)
stb r6,PACAPROCENABLED(r25)
std r6,PACAKSAVE(r13)
stb r6,PACAPROCENABLED(r13)
#ifndef CONFIG_PPC_ISERIES
/* Initialize the page table pointer register. */
......@@ -1516,12 +1525,9 @@ _GLOBAL(__secondary_start)
mtspr SDR1,r6 /* set the htab location */
#endif
/* Initialize the first segment table (or SLB) entry */
ld r3,PACASTABVIRT(r25) /* get addr of segment table */
ld r3,PACASTABVIRT(r13) /* get addr of segment table */
bl .stab_initialize
/* load current into r13 */
ld r13,PACACURRENT(r25)
/* Initialize the kernel stack. Just a repeat for iSeries. */
LOADADDR(r3,current_set)
sldi r28,r24,3 /* get current_set[cpu#] */
......@@ -1529,7 +1535,7 @@ _GLOBAL(__secondary_start)
addi r1,r1,THREAD_SIZE
subi r1,r1,STACK_FRAME_OVERHEAD
ld r3,PACASTABREAL(r25) /* get raddr of segment table */
ld r3,PACASTABREAL(r13) /* get raddr of segment table */
ori r4,r3,1 /* turn on valid bit */
#ifdef CONFIG_PPC_ISERIES
......@@ -1672,11 +1678,20 @@ _STATIC(start_here_pSeries)
/* Get the pointer to the segment table which is used by */
/* stab_initialize */
li r27,0x4000
ld r6,PACA(r27) /* Get the base paca pointer */
sub r6,r6,r26 /* convert to physical addr */
mtspr SPRG3,r6 /* PPPBBB: Temp... -Peter */
ld r3,PACASTABREAL(r6)
LOADADDR(r27, boot_cpuid)
sub r27,r27,r26
lwz r27,0(r27)
LOADADDR(r24, paca) /* Get base vaddr of paca array */
mulli r13,r27,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r24 /* for this processor. */
sub r13,r13,r26 /* convert to physical addr */
mtspr SPRG3,r13 /* PPPBBB: Temp... -Peter */
li r3,0x5000
std r3,PACASTABREAL(r13)
LOADADDR(r24, __start_stab)
std r24,PACASTABVIRT(r13)
ori r4,r3,1 /* turn on valid bit */
/* set the ASR */
......@@ -1754,18 +1769,21 @@ _STATIC(start_here_common)
addi r8,r8,0x4000
std r8,0(r9) /* set the value of the naca ptr */
LOADADDR(r4,naca) /* Get naca ptr address */
ld r4,0(r4) /* Get the location of the naca */
ld r4,PACA(r4) /* Get the base paca pointer */
mtspr SPRG3,r4
LOADADDR(r26, boot_cpuid)
lwz r26,0(r26)
LOADADDR(r24, paca) /* Get base vaddr of paca array */
mulli r13,r26,PACA_SIZE /* Calculate vaddr of right paca */
add r13,r13,r24 /* for this processor. */
mtspr SPRG3,r13
/* ptr to current */
LOADADDR(r13,init_task)
std r13,PACACURRENT(r4)
LOADADDR(r4,init_task)
std r4,PACACURRENT(r13)
std r2,PACATOC(r4)
std r2,PACATOC(r13)
li r5,0
std r0,PACAKSAVE(r4)
std r0,PACAKSAVE(r13)
/* ptr to hardware interrupt stack for processor 0 */
LOADADDR(r3, hardware_int_paca0)
......@@ -1774,10 +1792,10 @@ _STATIC(start_here_common)
subi r5,r5,STACK_FRAME_OVERHEAD
add r3,r3,r5
std r3,PACAHRDWINTSTACK(r4)
std r3,PACAHRDWINTSTACK(r13)
li r3,0
stb r3,PACAHRDWINTCOUNT(r4)
stb r3,PACAHRDWINTCOUNT(r13)
/* Restore the parms passed in from the bootloader. */
mr r3,r31
......@@ -1791,6 +1809,7 @@ _STATIC(start_here_common)
/* Load up the kernel context */
5:
#ifdef DO_SOFT_DISABLE
#warning FIX ISERIES
mfspr r4,SPRG3
li r5,0
stb r5,PACAPROCENABLED(r4) /* Soft Disabled */
......@@ -1898,10 +1917,10 @@ ioremap_dir:
hardware_int_paca0:
.space 8*4096
/* 1 page segment table per cpu (max 48, cpu0 allocated at 0x5000) */
/* 1 page segment table per cpu (max 48) */
.globl stab_array
stab_array:
.space 4096 * (48 - 1)
.space 4096 * 48
/*
* This space gets a copy of optional info passed to us by the bootstrap
......
arch/ppc64/kernel/misc.S
View file @ 3086a7d5
......@@ -66,6 +66,7 @@ _GLOBAL(get_sp)
#ifdef CONFIG_PPC_ISERIES
/* unsigned long __no_use_save_flags(void) */
_GLOBAL(__no_use_save_flags)
#warning FIX ISERIES
mfspr r4,SPRG3
lbz r3,PACAPROCENABLED(r4)
blr
......@@ -78,6 +79,7 @@ _GLOBAL(__no_use_restore_flags)
* sense anyway.
* -- Cort
*/
#warning FIX ISERIES
mfspr r6,SPRG3
lbz r5,PACAPROCENABLED(r6)
/* Check if things are setup the way we want _already_. */
......@@ -99,6 +101,7 @@ _GLOBAL(__no_use_restore_flags)
blr
_GLOBAL(__no_use_cli)
#warning FIX ISERIES
mfspr r5,SPRG3
lbz r3,PACAPROCENABLED(r5)
li r4,0
......@@ -106,6 +109,7 @@ _GLOBAL(__no_use_cli)
blr /* Done */
_GLOBAL(__no_use_sti)
#warning FIX ISERIES
mfspr r6,SPRG3
li r3,1
stb r3,PACAPROCENABLED(r6)
......
arch/ppc64/kernel/process.c
View file @ 3086a7d5
......@@ -175,9 +175,8 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
childregs = (struct pt_regs *) sp;
*childregs = *regs;
if ((childregs->msr & MSR_PR) == 0) {
/* for kernel thread, set `current' and stackptr in new task */
/* for kernel thread, set stackptr in new task */
childregs->gpr[1] = sp + sizeof(struct pt_regs);
childregs->gpr[13] = (unsigned long) p;
p->thread.regs = NULL; /* no user register state */
clear_ti_thread_flag(p->thread_info, TIF_32BIT);
#ifdef CONFIG_PPC_ISERIES
......
arch/ppc64/kernel/smp.c
View file @ 3086a7d5
......@@ -152,6 +152,7 @@ static void smp_iSeries_probe(void)
for (i=0; i < MAX_PACAS; ++i) {
lpPaca = paca[i].xLpPacaPtr;
if ( lpPaca->xDynProcStatus < 2 ) {
paca[i].active = 1;
++np;
paca[i].next_jiffy_update_tb = paca[0].next_jiffy_update_tb;
}
......
arch/ppc64/kernel/time.c
View file @ 3086a7d5
......@@ -269,7 +269,7 @@ int timer_interrupt(struct pt_regs * regs)
#ifdef CONFIG_SMP
smp_local_timer_interrupt(regs);
#endif
if (cpu == 0) {
if (cpu == boot_cpuid) {
write_lock(&xtime_lock);
tb_last_stamp = lpaca->next_jiffy_update_tb;
do_timer(regs);
......
include/asm-ppc64/current.h
View file @ 3086a7d5
#ifndef _PPC64_CURRENT_H
#define _PPC64_CURRENT_H
#include <asm/paca.h>
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -10,6 +12,9 @@
* Use r13 for current since the ppc64 ABI reserves it - Anton
*/
register struct task_struct *current asm ("r13");
#include <asm/thread_info.h>
#define get_current() ((struct task_struct *)(get_paca()->xCurrent))
#define current get_current()
#endif /* !(_PPC64_CURRENT_H) */
include/asm-ppc64/paca.h
View file @ 3086a7d5
......@@ -45,7 +45,8 @@
#define MAX_PACAS MAX_PROCESSORS * 2
extern struct paca_struct paca[];
#define get_paca() ((struct paca_struct *)mfspr(SPRG3))
register struct paca_struct *local_paca asm("r13");
#define get_paca() local_paca
/*============================================================================
* Name_______: paca
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7