lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: fix bug cplbmgr.S does not exit properly on error condition

Browse Source 
https://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=1685

Ensure that cache/protection is turned back on when we get a
fault, and ensure that the initial population of the CPLB tables are
correct - that kernel is locked in CPLB tables

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
Robin Getz
2007-11-15 15:10:48 +08:00
committed by Bryan Wu
parent 0954f70ab1
commit 6a3f0b460c
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/blackfin/kernel/cplbinit.c
View File

@@ -163,8 +163,8 @@ static struct cplb_desc cplb_data[] = {
static u16 __init lock_kernel_check(u32 start, u32 end) static u16 __init lock_kernel_check(u32 start, u32 end)
{ {
if ((start <= (u32) _stext && end >= (u32) _end) if ((end <= (u32) _end && end >= (u32)_stext) ||
|| (start >= (u32) _stext && end <= (u32) _end)) (start <= (u32) _end && start >= (u32)_stext))
return IN_KERNEL; return IN_KERNEL;
return 0; return 0;
} }

4
arch/blackfin/kernel/traps.c
View File

@@ -670,8 +670,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
printk("\n"); printk("\n");
} else } else
printk("\n" KERN_NOTICE printk("\n" KERN_NOTICE
"Cannot look at the [PC] for it is" "Cannot look at the [PC] <%p> for it is"
" in unreadable memory - sorry\n"); " in unreadable memory - sorry\n", retaddr);
printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\n"); printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\n");
printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n", printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n",

25
arch/blackfin/mach-common/cplbmgr.S
View File

@@ -73,7 +73,7 @@ ENTRY(_cplb_mgr)
/* ICPLB Miss Exception. We need to choose one of the /* ICPLB Miss Exception. We need to choose one of the
* currently-installed CPLBs, and replace it with one * currently-installed CPLBs, and replace it with one
* from the configuration table. * from the configuration table.
*/ */
P4.L = LO(ICPLB_FAULT_ADDR); P4.L = LO(ICPLB_FAULT_ADDR);
P4.H = HI(ICPLB_FAULT_ADDR); P4.H = HI(ICPLB_FAULT_ADDR);
@@ -222,7 +222,7 @@ ENTRY(_cplb_mgr)
/* See if failed address > start address */ /* See if failed address > start address */
CC = R4 <= R0(IU); CC = R4 <= R0(IU);
IF !CC JUMP .Linext; IF !CC JUMP .Linext;
/* extract page size (17:16)*/ /* extract page size (17:16)*/
R3 = EXTRACT(R2, R1.L) (Z); R3 = EXTRACT(R2, R1.L) (Z);
@@ -271,16 +271,27 @@ ENTRY(_cplb_mgr)
/* FAILED CASES*/ /* FAILED CASES*/
.Lno_page_in_table: .Lno_page_in_table:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_NO_ADDR_MATCH; R0 = CPLB_NO_ADDR_MATCH;
RTS; JUMP .Lfail_ret;
.Lall_locked: .Lall_locked:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_NO_UNLOCKED; R0 = CPLB_NO_UNLOCKED;
RTS; JUMP .Lfail_ret;
.Lprot_violation: .Lprot_violation:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_PROT_VIOL; R0 = CPLB_PROT_VIOL;
.Lfail_ret:
/* Make sure we turn protection/cache back on, even in the failing case */
BITSET(R5,ENICPLB_P);
CLI R2;
SSYNC; /* SSYNC required before writing to IMEM_CONTROL. */
.align 8;
[P4] = R5;
SSYNC;
STI R2;
( R7:4,P5:3 ) = [SP++];
RTS; RTS;
.Ldcplb_write: .Ldcplb_write: