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

Commit 77a0d763 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'rixi-3.7' of... 

Merge branch 'rixi-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
parents 8922c9b4 05857c64

arch/mips/include/asm/cpu-features.h

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
#ifndef cpu_has_smartmips

#define cpu_has_smartmips      (cpu_data[0].ases & MIPS_ASE_SMARTMIPS)

#endif

#ifndef kernel_uses_smartmips_rixi

#define kernel_uses_smartmips_rixi 0

#ifndef cpu_has_rixi

#define cpu_has_rixi		(cpu_data[0].options & MIPS_CPU_RIXI)

#endif

#ifndef cpu_has_vtag_icache

#define cpu_has_vtag_icache	(cpu_data[0].icache.flags & MIPS_CACHE_VTAG)

arch/mips/include/asm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ enum cpu_type_enum { 
#define MIPS_CPU_VINT		0x00080000 /* CPU supports MIPSR2 vectored interrupts */

#define MIPS_CPU_VEIC		0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */

#define MIPS_CPU_ULRI		0x00200000 /* CPU has ULRI feature */

#define MIPS_CPU_RIXI		0x00400000 /* CPU has TLB Read/eXec Inhibit */



/*

 * CPU ASE encodings

arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define cpu_has_veic		0

#define cpu_hwrena_impl_bits	0xc0000000



#define kernel_uses_smartmips_rixi (cpu_data[0].cputype != CPU_CAVIUM_OCTEON)

#define cpu_has_rixi		(cpu_data[0].cputype != CPU_CAVIUM_OCTEON)



#define ARCH_HAS_IRQ_PER_CPU	1

#define ARCH_HAS_SPINLOCK_PREFETCH 1

arch/mips/include/asm/mipsregs.h

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ 
#define MIPS_CONF3_VEIC		(_ULCAST_(1) <<  6)

#define MIPS_CONF3_LPA		(_ULCAST_(1) <<  7)

#define MIPS_CONF3_DSP		(_ULCAST_(1) << 10)

#define MIPS_CONF3_RXI		(_ULCAST_(1) << 12)

#define MIPS_CONF3_ULRI		(_ULCAST_(1) << 13)



#define MIPS_CONF4_MMUSIZEEXT	(_ULCAST_(255) << 0)

arch/mips/include/asm/pgtable-bits.h

+9 −9
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ 
/* implemented in software */

#define _PAGE_PRESENT_SHIFT	(0)

#define _PAGE_PRESENT		(1 << _PAGE_PRESENT_SHIFT)

/* implemented in software, should be unused if kernel_uses_smartmips_rixi. */

#define _PAGE_READ_SHIFT	(kernel_uses_smartmips_rixi ? _PAGE_PRESENT_SHIFT : _PAGE_PRESENT_SHIFT + 1)

#define _PAGE_READ ({if (kernel_uses_smartmips_rixi) BUG(); 1 << _PAGE_READ_SHIFT; })

/* implemented in software, should be unused if cpu_has_rixi. */

#define _PAGE_READ_SHIFT	(cpu_has_rixi ? _PAGE_PRESENT_SHIFT : _PAGE_PRESENT_SHIFT + 1)

#define _PAGE_READ ({BUG_ON(cpu_has_rixi); 1 << _PAGE_READ_SHIFT; })

/* implemented in software */

#define _PAGE_WRITE_SHIFT	(_PAGE_READ_SHIFT + 1)

#define _PAGE_WRITE		(1 << _PAGE_WRITE_SHIFT)
@@ -104,12 +104,12 @@ 
#endif



/* Page cannot be executed */

#define _PAGE_NO_EXEC_SHIFT	(kernel_uses_smartmips_rixi ? _PAGE_HUGE_SHIFT + 1 : _PAGE_HUGE_SHIFT)

#define _PAGE_NO_EXEC		({if (!kernel_uses_smartmips_rixi) BUG(); 1 << _PAGE_NO_EXEC_SHIFT; })

#define _PAGE_NO_EXEC_SHIFT	(cpu_has_rixi ? _PAGE_HUGE_SHIFT + 1 : _PAGE_HUGE_SHIFT)

#define _PAGE_NO_EXEC		({BUG_ON(!cpu_has_rixi); 1 << _PAGE_NO_EXEC_SHIFT; })



/* Page cannot be read */

#define _PAGE_NO_READ_SHIFT	(kernel_uses_smartmips_rixi ? _PAGE_NO_EXEC_SHIFT + 1 : _PAGE_NO_EXEC_SHIFT)

#define _PAGE_NO_READ		({if (!kernel_uses_smartmips_rixi) BUG(); 1 << _PAGE_NO_READ_SHIFT; })

#define _PAGE_NO_READ_SHIFT	(cpu_has_rixi ? _PAGE_NO_EXEC_SHIFT + 1 : _PAGE_NO_EXEC_SHIFT)

#define _PAGE_NO_READ		({BUG_ON(!cpu_has_rixi); 1 << _PAGE_NO_READ_SHIFT; })



#define _PAGE_GLOBAL_SHIFT	(_PAGE_NO_READ_SHIFT + 1)

#define _PAGE_GLOBAL		(1 << _PAGE_GLOBAL_SHIFT)
@@ -155,7 +155,7 @@ 
 */

static inline uint64_t pte_to_entrylo(unsigned long pte_val)

{

	if (kernel_uses_smartmips_rixi) {

	if (cpu_has_rixi) {

		int sa;

#ifdef CONFIG_32BIT

		sa = 31 - _PAGE_NO_READ_SHIFT;
@@ -220,7 +220,7 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val) 


#endif



#define __READABLE	(_PAGE_SILENT_READ | _PAGE_ACCESSED | (kernel_uses_smartmips_rixi ? 0 : _PAGE_READ))

#define __READABLE	(_PAGE_SILENT_READ | _PAGE_ACCESSED | (cpu_has_rixi ? 0 : _PAGE_READ))

#define __WRITEABLE	(_PAGE_WRITE | _PAGE_SILENT_WRITE | _PAGE_MODIFIED)



#define _PAGE_CHG_MASK  (_PFN_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK)