d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Sibyte specific code from locore.S that sets the k0seg coherency.

Browse Source 
Move it to platform_start() instead.

Approved by: imp (mentor)
This commit is contained in:
Neel Natu 2010-01-23 03:19:13 +00:00
parent 3c0e59de3e
commit 531c6502cc
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/mips/include/cpu.h
View File

@ -163,11 +163,8 @@
* The bits in the CONFIG register * The bits in the CONFIG register
*/ */
#define CFG_K0_UNCACHED 2 #define CFG_K0_UNCACHED 2
#if defined(CPU_SB1)
#define CFG_K0_COHERENT 5 /* cacheable coherent */
#else
#define CFG_K0_CACHED 3 #define CFG_K0_CACHED 3
#endif #define CFG_K0_MASK 0x7
/* /*
* The bits in the context register. * The bits in the context register.

4
sys/mips/mips/locore.S
View File

@ -128,11 +128,7 @@ VECTOR(_locore, unknown)
mtc0 t2, COP_0_STATUS_REG mtc0 t2, COP_0_STATUS_REG
COP0_SYNC COP0_SYNC
/* Make sure KSEG0 is cached */ /* Make sure KSEG0 is cached */
#ifdef CPU_SB1
li t0, CFG_K0_COHERENT
#else
li t0, CFG_K0_CACHED li t0, CFG_K0_CACHED
#endif
mtc0 t0, MIPS_COP_0_CONFIG mtc0 t0, MIPS_COP_0_CONFIG
COP0_SYNC COP0_SYNC

17
sys/mips/sibyte/sb_machdep.c
View File

@ -230,12 +230,29 @@ platform_trap_exit(void)
} }
static void
kseg0_map_coherent(void)
{
uint32_t config;
const int CFG_K0_COHERENT = 5;
config = mips_rd_config();
config &= ~CFG_K0_MASK;
config |= CFG_K0_COHERENT;
mips_wr_config(config);
}
void void
platform_start(__register_t a0, __register_t a1, __register_t a2, platform_start(__register_t a0, __register_t a1, __register_t a2,
__register_t a3) __register_t a3)
{ {
vm_offset_t kernend; vm_offset_t kernend;
/*
* Make sure that kseg0 is mapped cacheable-coherent
*/
kseg0_map_coherent();
/* clear the BSS and SBSS segments */ /* clear the BSS and SBSS segments */
memset(&edata, 0, (vm_offset_t)&end - (vm_offset_t)&edata); memset(&edata, 0, (vm_offset_t)&end - (vm_offset_t)&edata);
kernend = round_page((vm_offset_t)&end); kernend = round_page((vm_offset_t)&end);