Commit 05857c64 authored by Steven J. Hill's avatar Steven J. Hill
Browse files

MIPS: Replace 'kernel_uses_smartmips_rixi' with 'cpu_has_rixi'. 



Remove usage of the 'kernel_uses_smartmips_rixi' macro from all files
and use new 'cpu_has_rixi' instead.

Signed-off-by: default avatarSteven J. Hill <sjhill@mips.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
parent b2ab4f08

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

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ 
#ifndef cpu_has_rixi

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

#endif

#ifndef kernel_uses_smartmips_rixi

#define kernel_uses_smartmips_rixi 0

#endif

#ifndef cpu_has_vtag_icache

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

#endif

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/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)

arch/mips/include/asm/pgtable.h

+6 −6
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ struct mm_struct; 
struct vm_area_struct;



#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _CACHE_CACHABLE_NONCOHERENT)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_WRITE | (kernel_uses_smartmips_rixi ? 0 : _PAGE_READ) | \

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_WRITE | (cpu_has_rixi ? 0 : _PAGE_READ) | \

				 _page_cachable_default)

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | (kernel_uses_smartmips_rixi ? 0 : _PAGE_READ) | \

				 (kernel_uses_smartmips_rixi ?  _PAGE_NO_EXEC : 0) | _page_cachable_default)

#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | (kernel_uses_smartmips_rixi ? 0 : _PAGE_READ) | \

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | \

				 (cpu_has_rixi ?  _PAGE_NO_EXEC : 0) | _page_cachable_default)

#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | \

				 _page_cachable_default)

#define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \

				 _PAGE_GLOBAL | _page_cachable_default)

#define PAGE_USERIO	__pgprot(_PAGE_PRESENT | (kernel_uses_smartmips_rixi ? 0 : _PAGE_READ) | _PAGE_WRITE | \

#define PAGE_USERIO	__pgprot(_PAGE_PRESENT | (cpu_has_rixi ? 0 : _PAGE_READ) | _PAGE_WRITE | \

				 _page_cachable_default)

#define PAGE_KERNEL_UNCACHED __pgprot(_PAGE_PRESENT | __READABLE | \

			__WRITEABLE | _PAGE_GLOBAL | _CACHE_UNCACHED)
@@ -299,7 +299,7 @@ static inline pte_t pte_mkdirty(pte_t pte) 
static inline pte_t pte_mkyoung(pte_t pte)

{

	pte_val(pte) |= _PAGE_ACCESSED;

	if (kernel_uses_smartmips_rixi) {

	if (cpu_has_rixi) {

		if (!(pte_val(pte) & _PAGE_NO_READ))

			pte_val(pte) |= _PAGE_SILENT_READ;

	} else {

arch/mips/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ EXPORT_SYMBOL(_page_cachable_default); 


static inline void setup_protection_map(void)

{

	if (kernel_uses_smartmips_rixi) {

	if (cpu_has_rixi) {

		protection_map[0]  = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);

		protection_map[1]  = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC);

		protection_map[2]  = __pgprot(_page_cachable_default | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);