V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

85xx: Reworked initial processor init 

Reworked the initial processor initialzation sequence:
* introduced cpu_early_init_f that is run in address space 1 (AS=1)
* Moved TLB/LAW and CCSR init into cpu_early_init_f()
* Reworked initial asm code to do most of the core init before TLBs

The main reasons for these changes are to allow handling of 36-bit phys
addresses in the future and some of the issues that will exist when we
do that.

There are a few caveats on what can be initialized via the LAW and TLB
static tables:
* TLB entry 14/15 can't be initialized via the TLB table
* any LAW that covers the implicit boot window (4G-8M to 4G) must map to
  the code that is currently executing.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-01-16 22:38:34 -06:00
parent 44a23cfd63
commit 8716318057
2 changed files with 115 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cpu/mpc85xx/cpu_init.c
View File

@ -31,6 +31,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <ioports.h> #include <ioports.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mmu.h>
#include <asm/fsl_law.h> #include <asm/fsl_law.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -123,6 +124,54 @@ void config_8560_ioports (volatile ccsr_cpm_t * cpm)
} }
#endif #endif
/* We run cpu_init_early_f in AS = 1 */
void cpu_init_early_f(void)
{
set_tlb(0, CFG_CCSRBAR, CFG_CCSRBAR,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
1, 0, BOOKE_PAGESZ_4K, 0);
/* set up CCSR if we want it moved */
#if (CFG_CCSRBAR_DEFAULT != CFG_CCSRBAR)
{
u32 temp;
set_tlb(0, CFG_CCSRBAR_DEFAULT, CFG_CCSRBAR_DEFAULT,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
1, 1, BOOKE_PAGESZ_4K, 0);
temp = in_be32((volatile u32 *)CFG_CCSRBAR_DEFAULT);
out_be32((volatile u32 *)CFG_CCSRBAR_DEFAULT, CFG_CCSRBAR >> 12);
temp = in_be32((volatile u32 *)CFG_CCSRBAR);
}
#endif
init_laws();
invalidate_tlb(0);
#ifdef CONFIG_FSL_INIT_TLBS
init_tlbs();
#else
{
extern u32 tlb1_entry;
u32 *tmp = &tlb1_entry;
int i;
int num = tmp[2];
/* skip to actual table */
tmp += 3;
for (i = 0; i < num; i++, tmp += 4) {
mtspr(MAS0, tmp[0]);
mtspr(MAS1, tmp[1]);
mtspr(MAS2, tmp[2]);
mtspr(MAS3, tmp[3]);
asm volatile("isync;msync;tlbwe;isync");
}
}
#endif
}
/* /*
* Breathe some life into the CPU... * Breathe some life into the CPU...
* *
@ -135,16 +184,15 @@ void cpu_init_f (void)
volatile ccsr_lbc_t *memctl = (void *)(CFG_MPC85xx_LBC_ADDR); volatile ccsr_lbc_t *memctl = (void *)(CFG_MPC85xx_LBC_ADDR);
extern void m8560_cpm_reset (void); extern void m8560_cpm_reset (void);
disable_tlb(14);
disable_tlb(15);
/* Pointer is writable since we allocated a register for it */ /* Pointer is writable since we allocated a register for it */
gd = (gd_t *) (CFG_INIT_RAM_ADDR + CFG_GBL_DATA_OFFSET); gd = (gd_t *) (CFG_INIT_RAM_ADDR + CFG_GBL_DATA_OFFSET);
/* Clear initial global data */ /* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t)); memset ((void *) gd, 0, sizeof (gd_t));
#ifdef CONFIG_FSL_LAW
init_laws();
#endif
#ifdef CONFIG_CPM2 #ifdef CONFIG_CPM2
config_8560_ioports((ccsr_cpm_t *)CFG_MPC85xx_CPM_ADDR); config_8560_ioports((ccsr_cpm_t *)CFG_MPC85xx_CPM_ADDR);
#endif #endif

131
cpu/mpc85xx/start.S
View File

@ -143,68 +143,8 @@ _start_e500:
li r1,0x0f00 li r1,0x0f00
mtspr IVOR15,r1 /* 15: Debug */ mtspr IVOR15,r1 /* 15: Debug */
/*
* After reset, CCSRBAR is located at CFG_CCSRBAR_DEFAULT, i.e.
* 0xff700000-0xff800000. We need add a TLB1 entry for this 1MB
* region before we can access any CCSR registers such as L2
* registers, Local Access Registers,etc. We will also re-allocate
* CFG_CCSRBAR_DEFAULT to CFG_CCSRBAR immediately after TLB1 setup.
*
* Please refer to board-specif directory for TLB1 entry configuration.
* (e.g. board/<yourboard>/init.S)
*
*/
bl tlb1_entry
mr r5,r0
lwzu r4,0(r5) /* how many TLB1 entries we actually use */
mtctr r4
0: lwzu r6,4(r5)
lwzu r7,4(r5)
lwzu r8,4(r5)
lwzu r9,4(r5)
mtspr MAS0,r6
mtspr MAS1,r7
mtspr MAS2,r8
mtspr MAS3,r9
isync
msync
tlbwe
isync
bdnz 0b
1:
#if (CFG_CCSRBAR_DEFAULT != CFG_CCSRBAR)
/* Special sequence needed to update CCSRBAR itself */
lis r4,CFG_CCSRBAR_DEFAULT@h
ori r4,r4,CFG_CCSRBAR_DEFAULT@l
lis r5,CFG_CCSRBAR@h
ori r5,r5,CFG_CCSRBAR@l
srwi r6,r5,12
stw r6,0(r4)
isync
lis r5,0xffff
ori r5,r5,0xf000
lwz r5,0(r5)
isync
lis r3,CFG_CCSRBAR@h
lwz r5,CFG_CCSRBAR@l(r3)
isync
#endif
/* set up local access windows, defined at board/<boardname>/init.S */
lis r7,CFG_CCSRBAR@h
ori r7,r7,CFG_CCSRBAR@l
/* Clear and set up some registers. */ /* Clear and set up some registers. */
li r0,0 li r0,0x0000
mtmsr r0
li r0,0x0000
lis r1,0xffff lis r1,0xffff
mtspr DEC,r0 /* prevent dec exceptions */ mtspr DEC,r0 /* prevent dec exceptions */
mttbl r0 /* prevent fit & wdt exceptions */ mttbl r0 /* prevent fit & wdt exceptions */
@ -214,18 +154,13 @@ _start_e500:
mtspr ESR,r0 /* clear exception syndrome register */ mtspr ESR,r0 /* clear exception syndrome register */
mtspr MCSR,r0 /* machine check syndrome register */ mtspr MCSR,r0 /* machine check syndrome register */
mtxer r0 /* clear integer exception register */ mtxer r0 /* clear integer exception register */
lis r1,0x0002 /* set CE bit (Critical Exceptions) */
ori r1,r1,0x1200 /* set ME/DE bit */
mtmsr r1 /* change MSR */
isync
/* Enable Time Base and Select Time Base Clock */ /* Enable Time Base and Select Time Base Clock */
lis r0,HID0_EMCP@h /* Enable machine check */ lis r0,HID0_EMCP@h /* Enable machine check */
#if defined(CONFIG_ENABLE_36BIT_PHYS) #if defined(CONFIG_ENABLE_36BIT_PHYS)
ori r0,r0,(HID0_TBEN|HID0_ENMAS7)@l /* Enable Timebase & MAS7 */ ori r0,r0,HID0_ENMAS7@l /* Enable MAS7 */
#else
ori r0,r0,HID0_TBEN@l /* enable Timebase */
#endif #endif
ori r0,r0,HID0_TBEN@l /* Enable Timebase */
mtspr HID0,r0 mtspr HID0,r0
li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */ li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */
@ -246,6 +181,58 @@ _start_e500:
mtspr DBCR0,r0 mtspr DBCR0,r0
#endif #endif
/* create a temp mapping in AS=1 to the boot window */
lis r6,FSL_BOOKE_MAS0(1, 15, 0)@h
ori r6,r6,FSL_BOOKE_MAS0(1, 15, 0)@l
lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16M)@h
ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16M)@l
lis r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@h
ori r8,r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@l
lis r9,FSL_BOOKE_MAS3(0xff800000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
ori r9,r9,FSL_BOOKE_MAS3(0xff800000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
mtspr MAS0,r6
mtspr MAS1,r7
mtspr MAS2,r8
mtspr MAS3,r9
isync
msync
tlbwe
/* create a temp mapping in AS=1 to the stack */
lis r6,FSL_BOOKE_MAS0(1, 14, 0)@h
ori r6,r6,FSL_BOOKE_MAS0(1, 14, 0)@l
lis r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16K)@h
ori r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_16K)@l
lis r8,FSL_BOOKE_MAS2(CFG_INIT_RAM_ADDR, 0)@h
ori r8,r8,FSL_BOOKE_MAS2(CFG_INIT_RAM_ADDR, 0)@l
lis r9,FSL_BOOKE_MAS3(CFG_INIT_RAM_ADDR, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
ori r9,r9,FSL_BOOKE_MAS3(CFG_INIT_RAM_ADDR, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
mtspr MAS0,r6
mtspr MAS1,r7
mtspr MAS2,r8
mtspr MAS3,r9
isync
msync
tlbwe
lis r6,MSR_CE|MSR_ME|MSR_DE|MSR_IS|MSR_DS@h
ori r6,r6,MSR_CE|MSR_ME|MSR_DE|MSR_IS|MSR_DS@l
lis r7,switch_as@h
ori r7,r7,switch_as@l
mtspr SPRN_SRR0,r7
mtspr SPRN_SRR1,r6
rfi
switch_as:
/* L1 DCache is used for initial RAM */ /* L1 DCache is used for initial RAM */
/* Allocate Initial RAM in data cache. /* Allocate Initial RAM in data cache.
@ -305,6 +292,14 @@ _start_cont:
stw r0,+12(r1) /* Save return addr (underflow vect) */ stw r0,+12(r1) /* Save return addr (underflow vect) */
GET_GOT GET_GOT
bl cpu_init_early_f
/* switch back to AS = 0 */
lis r3,(MSR_CE|MSR_ME|MSR_DE)@h
ori r3,r3,(MSR_CE|MSR_ME|MSR_DE)@l
mtmsr r3
isync
bl cpu_init_f bl cpu_init_f
bl board_init_f bl board_init_f
isync isync