dbdf20db53
This is a mixture ofcMichael McTernan's patch and the existing cplb-mpu code.
We ditch the old cplb-nompu implementation, which is a good example of
why a good algorithm in a HLL is preferrable to a bad algorithm written in
assembly. Rather than try to construct a table of all posible CPLBs and
search it, we just create a (smaller) table of memory regions and
their attributes. Some of the data structures are now unified for both
the mpu and nompu cases. A lot of needless complexity in cplbinit.c is
removed.
Further optimizations:
* compile cplbmgr.c with a lot of -ffixed-reg options, and omit saving
these registers on the stack when entering a CPLB exception.
* lose cli/nop/nop/sti sequences for some workarounds - these don't
* make
sense in an exception context
Additional code unification should be possible after this.
[Mike Frysinger <vapier.adi@gmail.com>:
- convert CPP if statements to C if statements
- remove redundant statements
- use a do...while loop rather than a for loop to get slightly better
optimization and to avoid gcc "may be used uninitialized" warnings ...
we know that the [id]cplb_nr_bounds variables will never be 0, so this
is OK
- the no-mpu code was the last user of MAX_MEM_SIZE and with that rewritten,
we can punt it
- add some BUG_ON() checks to make sure we dont overflow the small
cplb_bounds array
- add i/d cplb entries for the bootrom because there is functions/data in
there we want to access
- we do not need a NULL trailing entry as any time we access the bounds
arrays, we use the nr_bounds variable
]
Signed-off-by: Michael McTernan <mmcternan@airvana.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
87 lines
2.4 KiB
C
87 lines
2.4 KiB
C
/*
|
|
* File: include/asm-blackfin/cplbinit.h
|
|
* Based on:
|
|
* Author:
|
|
*
|
|
* Created:
|
|
* Description:
|
|
*
|
|
* Modified:
|
|
* Copyright 2004-2006 Analog Devices Inc.
|
|
*
|
|
* Bugs: Enter bugs at http://blackfin.uclinux.org/
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see the file COPYING, or write
|
|
* to the Free Software Foundation, Inc.,
|
|
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef __ASM_CPLBINIT_H__
|
|
#define __ASM_CPLBINIT_H__
|
|
|
|
#include <asm/blackfin.h>
|
|
#include <asm/cplb.h>
|
|
#include <linux/threads.h>
|
|
|
|
#ifdef CONFIG_CPLB_SWITCH_TAB_L1
|
|
# define PDT_ATTR __attribute__((l1_data))
|
|
#else
|
|
# define PDT_ATTR
|
|
#endif
|
|
|
|
struct cplb_entry {
|
|
unsigned long data, addr;
|
|
};
|
|
|
|
struct cplb_boundary {
|
|
unsigned long eaddr; /* End of this region. */
|
|
unsigned long data; /* CPLB data value. */
|
|
};
|
|
|
|
extern struct cplb_boundary dcplb_bounds[];
|
|
extern struct cplb_boundary icplb_bounds[];
|
|
extern int dcplb_nr_bounds, icplb_nr_bounds;
|
|
|
|
extern struct cplb_entry dcplb_tbl[NR_CPUS][MAX_CPLBS];
|
|
extern struct cplb_entry icplb_tbl[NR_CPUS][MAX_CPLBS];
|
|
extern int first_switched_icplb;
|
|
extern int first_switched_dcplb;
|
|
|
|
extern int nr_dcplb_miss[], nr_icplb_miss[], nr_icplb_supv_miss[];
|
|
extern int nr_dcplb_prot[], nr_cplb_flush[];
|
|
|
|
#ifdef CONFIG_MPU
|
|
|
|
extern int first_mask_dcplb;
|
|
|
|
extern int page_mask_order;
|
|
extern int page_mask_nelts;
|
|
|
|
extern unsigned long *current_rwx_mask[NR_CPUS];
|
|
|
|
extern void flush_switched_cplbs(unsigned int);
|
|
extern void set_mask_dcplbs(unsigned long *, unsigned int);
|
|
|
|
extern void __noreturn panic_cplb_error(int seqstat, struct pt_regs *);
|
|
|
|
#endif /* CONFIG_MPU */
|
|
|
|
extern void bfin_icache_init(struct cplb_entry *icplb_tbl);
|
|
extern void bfin_dcache_init(struct cplb_entry *icplb_tbl);
|
|
|
|
#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)
|
|
extern void generate_cplb_tables_all(void);
|
|
extern void generate_cplb_tables_cpu(unsigned int cpu);
|
|
#endif
|
|
#endif
|