diff options
| author |   Steven J. Hill <sjhill@mips.com> | 2012-09-13 16:47:58 -0500 |
|---|---|---|
| committer | Steven J. Hill <sjhill@mips.com> | 2012-09-13 16:55:53 -0500 |
| commit | b2ab4f08e84d4031f82255447180c559bd076bbf (patch) | |
| tree | c43f3abc03b50d68c73c33750528819e349422e6 /arch/mips/kernel | |
| parent | Linux 3.6-rc3 (diff) | |
| download | linux-dev-b2ab4f08e84d4031f82255447180c559bd076bbf.tar.xz linux-dev-b2ab4f08e84d4031f82255447180c559bd076bbf.zip | |
MIPS: Add base architecture support for RI and XI.
Originally both Read Inhibit (RI) and Execute Inhibit (XI) were
supported by the TLB only for a SmartMIPS core. The MIPSr3(TM)
Architecture now defines an optional feature to implement these
TLB bits separately. Support for one or both features can be
checked by looking at the Config3.RXI bit.
Signed-off-by: Steven J. Hill <sjhill@mips.com>
Acked-by: David Daney <david.daney@cavium.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 1b51046191e8..0beb75fb3980 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -421,8 +421,12 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) config3 = read_c0_config3(); - if (config3 & MIPS_CONF3_SM) + if (config3 & MIPS_CONF3_SM) { c->ases |= MIPS_ASE_SMARTMIPS; + c->options |= MIPS_CPU_RIXI; + } + if (config3 & MIPS_CONF3_RXI) + c->options |= MIPS_CPU_RIXI; if (config3 & MIPS_CONF3_DSP) c->ases |= MIPS_ASE_DSP; if (config3 & MIPS_CONF3_VINT) |