Skip to content

Commit

Permalink
[Blackfin] arch: add implicit icplb for the bootrom so we can use the…
Browse files Browse the repository at this point in the history
… utility functions in the kernel

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Apr 23, 2008
1 parent ac76d88 commit 4bea8b2
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions arch/blackfin/kernel/cplb-mpu/cplbmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ static noinline int dcplb_miss(void)
&& (status & (FAULT_RW | FAULT_USERSUPV)) == FAULT_USERSUPV) {
addr &= ~(1 * 1024 * 1024 - 1);
d_data &= ~PAGE_SIZE_4KB;
d_data |= PAGE_SIZE_1MB | CPLB_USER_RD;
d_data |= PAGE_SIZE_1MB;
} else
return CPLB_PROT_VIOL;
} else if (addr >= _ramend) {
Expand Down Expand Up @@ -243,7 +243,13 @@ static noinline int icplb_miss(void)
#endif

if (addr >= physical_mem_end) {
return CPLB_PROT_VIOL;
if (addr >= BOOT_ROM_START && addr < BOOT_ROM_START + BOOT_ROM_LENGTH
&& (status & FAULT_USERSUPV)) {
addr &= ~(1 * 1024 * 1024 - 1);
i_data &= ~PAGE_SIZE_4KB;
i_data |= PAGE_SIZE_1MB;
} else
return CPLB_PROT_VIOL;
} else if (addr >= _ramend) {
i_data |= CPLB_USER_RD;
} else {
Expand Down

0 comments on commit 4bea8b2

Please sign in to comment.