Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e354b54 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

[Blackfin] arch: cplb-mpu code clean up 



 - allow bootrom to be readable from supervisor mode
 - delete unused local variable "addr"
 - punt unused local defines of cplbinfo.c

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 77955664

arch/blackfin/kernel/cplb-mpu/cplbinfo.c

+0 −8
Original line number Diff line number Diff line
@@ -39,14 +39,6 @@ 
#include <asm/cplbinit.h>

#include <asm/blackfin.h>



#define CPLB_I 1

#define CPLB_D 2



#define SYNC_SYS    SSYNC()

#define SYNC_CORE   CSYNC()



#define CPLB_BIT_PAGESIZE 0x30000



static char page_size_string_table[][4] = { "1K", "4K", "1M", "4M" };



static char *cplb_print_entry(char *buf, struct cplb_entry *tbl, int switched)

arch/blackfin/kernel/cplb-mpu/cplbmgr.c

+5 −1
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ static noinline int dcplb_miss(void) 
			addr &= ~0x3fffff;

			d_data &= ~PAGE_SIZE_4KB;

			d_data |= PAGE_SIZE_4MB;

		} else if (addr >= BOOT_ROM_START && addr < BOOT_ROM_START + BOOT_ROM_LENGTH

		    && (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;

		} else

			return CPLB_PROT_VIOL;

	} else if (addr >= _ramend) {
@@ -277,7 +282,6 @@ static noinline int icplb_miss(void) 


static noinline int dcplb_protection_fault(void)

{

	unsigned long addr = bfin_read_DCPLB_FAULT_ADDR();

	int status = bfin_read_DCPLB_STATUS();



	nr_dcplb_prot++;