aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/cplb-mpu/cplbinfo.c8
-rw-r--r--arch/blackfin/kernel/cplb-mpu/cplbmgr.c6
2 files changed, 5 insertions, 9 deletions
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinfo.c b/arch/blackfin/kernel/cplb-mpu/cplbinfo.c
index bd072299f7f2..822beefa3a4b 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbinfo.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbinfo.c
@@ -39,14 +39,6 @@
39#include <asm/cplbinit.h> 39#include <asm/cplbinit.h>
40#include <asm/blackfin.h> 40#include <asm/blackfin.h>
41 41
42#define CPLB_I 1
43#define CPLB_D 2
44
45#define SYNC_SYS SSYNC()
46#define SYNC_CORE CSYNC()
47
48#define CPLB_BIT_PAGESIZE 0x30000
49
50static char page_size_string_table[][4] = { "1K", "4K", "1M", "4M" }; 42static char page_size_string_table[][4] = { "1K", "4K", "1M", "4M" };
51 43
52static char *cplb_print_entry(char *buf, struct cplb_entry *tbl, int switched) 44static char *cplb_print_entry(char *buf, struct cplb_entry *tbl, int switched)
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 3377cbf28fb4..3b165bbe90fa 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -161,6 +161,11 @@ static noinline int dcplb_miss(void)
161 addr &= ~0x3fffff; 161 addr &= ~0x3fffff;
162 d_data &= ~PAGE_SIZE_4KB; 162 d_data &= ~PAGE_SIZE_4KB;
163 d_data |= PAGE_SIZE_4MB; 163 d_data |= PAGE_SIZE_4MB;
164 } else if (addr >= BOOT_ROM_START && addr < BOOT_ROM_START + BOOT_ROM_LENGTH
165 && (status & (FAULT_RW | FAULT_USERSUPV)) == FAULT_USERSUPV) {
166 addr &= ~(1 * 1024 * 1024 - 1);
167 d_data &= ~PAGE_SIZE_4KB;
168 d_data |= PAGE_SIZE_1MB | CPLB_USER_RD;
164 } else 169 } else
165 return CPLB_PROT_VIOL; 170 return CPLB_PROT_VIOL;
166 } else if (addr >= _ramend) { 171 } else if (addr >= _ramend) {
@@ -277,7 +282,6 @@ static noinline int icplb_miss(void)
277 282
278static noinline int dcplb_protection_fault(void) 283static noinline int dcplb_protection_fault(void)
279{ 284{
280 unsigned long addr = bfin_read_DCPLB_FAULT_ADDR();
281 int status = bfin_read_DCPLB_STATUS(); 285 int status = bfin_read_DCPLB_STATUS();
282 286
283 nr_dcplb_prot++; 287 nr_dcplb_prot++;