MIPS: R10000: Split R10000 definitions from R12000 and up
Subsystems (2)
PATCH 1/1 MIPS: R10000: Split R10000 definitions from R12000 and up
From: Joshua Kinard <[email protected]>
This patch splits the old R10000 definitions so that the R10000_LLSC_WAR can be disabled and -mno-fix-r10000 passed to CFLAGS for systems running R12000 CPUs and greater. This allows the kernel to build without branch-likely instructions, which are considered deprecated in current MIPS implementations.
Only R10000 systems with R2.6 and lower CPUs require branch-likely to work
around a known hardware errata item.
Verified on both an SGI Onyx2 and an SGI Octane.
--- arch/mips/Kconfig | 18 +++++++++++++++++- arch/mips/Makefile | 3 +++ arch/mips/include/asm/hazards.h | 3 ++- arch/mips/include/asm/mach-ip27/war.h | 7 ++++++- arch/mips/include/asm/module.h | 2 ++ arch/mips/sgi-ip27/Platform | 15 ++++++++------- arch/mips/sgi-ip32/Platform | 2 ++ drivers/video/fbdev/gbefb.c | 2 +- 8 files changed, 41 insertions(+), 11 deletions(-)
linux-mips-split-r10k-family.patch
arch/mips/Kconfig +17 -1
@@ -551,6 +551,7 @@ config SGI_IP27 select HW_HAS_PCI select NR_CPUS_DEFAULT_64 select SYS_HAS_CPU_R10000 + select SYS_HAS_CPU_R12K_R14K_R16K select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_NUMA
@@ -612,6 +613,7 @@ config SGI_IP32 select RM7000_CPU_SCACHE select SYS_HAS_CPU_R5000 select SYS_HAS_CPU_R10000 if BROKEN + select SYS_HAS_CPU_R12K_R14K_R16K if BROKEN select SYS_HAS_CPU_RM7000 select SYS_HAS_CPU_NEVADA select SYS_SUPPORTS_64BIT_KERNEL
@@ -1456,7 +1458,18 @@ config CPU_R10000 select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HUGEPAGES help - MIPS Technologies R10000-series processors. + MIPS Technologies R10000 processor. + +config CPU_R12K_R14K_R16K + bool "R12k/R14k/R16k" + depends on SYS_HAS_CPU_R12K_R14K_R16K + select CPU_HAS_PREFETCH + select CPU_SUPPORTS_32BIT_KERNEL + select CPU_SUPPORTS_64BIT_KERNEL + select CPU_SUPPORTS_HIGHMEM + select CPU_SUPPORTS_HUGEPAGES + help + MIPS Technologies R12k/R14k/R16k-series processors. config CPU_RM7000 bool "RM7000"
@@ -1704,6 +1717,9 @@ config SYS_HAS_CPU_R8000 config SYS_HAS_CPU_R10000 bool +config SYS_HAS_CPU_R12K_R14K_R16K + bool + config SYS_HAS_CPU_RM7000 bool
arch/mips/Makefile +3 -0
@@ -176,6 +176,9 @@ cflags-$(CONFIG_CPU_SB1) += $(call cc-option,-mno-mips3d) cflags-$(CONFIG_CPU_R8000) += -march=r8000 -Wa,--trap cflags-$(CONFIG_CPU_R10000) += $(call cc-option,-march=r10000,-march=r8000) \ -Wa,--trap +cflags-$(CONFIG_CPU_R12K_R14K_R16K) += $(call cc-option,-march=r12000,-march=r8000) \ + $(call cc-option,-mno-fix-r10000,) \ + -Wa,--trap cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += $(call cc-option,-march=octeon) -Wa,--trap ifeq (,$(findstring march=octeon, $(cflags-$(CONFIG_CPU_CAVIUM_OCTEON)))) cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
arch/mips/include/asm/hazards.h +2 -1
@@ -138,7 +138,8 @@ do { \#elif defined(CONFIG_MIPS_ALCHEMY ) || defined(CONFIG_CPU_CAVIUM_OCTEON ) || \ defined(CONFIG_CPU_LOONGSON2 ) || defined(CONFIG_CPU_R10000 ) || \ - defined(CONFIG_CPU_R5500 ) || defined(CONFIG_CPU_XLR ) + defined(CONFIG_CPU_R12K_R14K_R16K ) || defined(CONFIG_CPU_R5500 ) || \ + defined(CONFIG_CPU_XLR )/* * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
arch/mips/include/asm/mach-ip27/war.h +6 -1
@@ -18,7 +18,12 @@#define MIPS_CACHE_SYNC_WAR 0#define TX49XX_ICACHE_INDEX_INV_WAR 0#define ICACHE_REFILLS_WORKAROUND_WAR 0 -#define R10000_LLSC_WAR 1#define MIPS34K_MISSED_ITLB_WAR 0 +#ifdef CONFIG_CPU_R10000 +#define R10000_LLSC_WAR 1 +#else +#define R10000_LLSC_WAR 0 +#endif +#endif /* __ASM_MIPS_MACH_IP27_WAR_H */
arch/mips/include/asm/module.h +2 -0
@@ -118,6 +118,8 @@ search_module_dbetables(unsigned long addr)#define MODULE_PROC_FAMILY "R8000 "#elif definedCONFIG_CPU_R10000 #define MODULE_PROC_FAMILY "R10000 " +#elif definedCONFIG_CPU_R12K_R14K_R16K +#define MODULE_PROC_FAMILY "R12K/R14K/R16K "#elif definedCONFIG_CPU_RM7000 #define MODULE_PROC_FAMILY "RM7000 "#elif definedCONFIG_CPU_SB1
arch/mips/sgi-ip27/Platform +8 -7
@@ -6,14 +6,15 @@ # be 16kb aligned or the handling of the current variable will break. # ifdef CONFIG_SGI_IP27 -platform-$(CONFIG_SGI_IP27) += sgi-ip27/ -cflags-$(CONFIG_SGI_IP27) += -I$(srctree)/arch/mips/include/asm/mach-ip27 +platform-$(CONFIG_SGI_IP27) += sgi-ip27/ +cflags-$(CONFIG_SGI_IP27) += -I$(srctree)/arch/mips/include/asm/mach-ip27 +cflags-$(CONFIG_CPU_R12K_R14K_R16K) += -mno-fix-r10000 ifdef CONFIG_MAPPED_KERNEL -load-$(CONFIG_SGI_IP27) += 0xc00000004001c000 -OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000 -dataoffset-$(CONFIG_SGI_IP27) += 0x01000000 +load-$(CONFIG_SGI_IP27) += 0xc00000004001c000 +OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000 +dataoffset-$(CONFIG_SGI_IP27) += 0x01000000 else -load-$(CONFIG_SGI_IP27) += 0xa80000000001c000 -OBJCOPYFLAGS := --change-addresses=0x57ffffff80000000 +load-$(CONFIG_SGI_IP27) += 0xa80000000001c000 +OBJCOPYFLAGS := --change-addresses=0x57ffffff80000000 endif endif
arch/mips/sgi-ip32/Platform +2 -0
@@ -8,4 +8,6 @@ # platform-$(CONFIG_SGI_IP32) += sgi-ip32/ cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/include/asm/mach-ip32 +cflags-$(CONFIG_CPU_R10000) += -mr10k-cache-barrier=load-store +cflags-$(CONFIG_CPU_R12K_R14K_R16K) += -mno-fix-r10000 -mr10k-cache-barrier=load-store load-$(CONFIG_SGI_IP32) += 0xffffffff80004000
drivers/video/fbdev/gbefb.c +1 -1
@@ -47,7 +47,7 @@ struct gbefb_par {/* macro for fastest write-though access to the framebuffer */ #ifdef CONFIG_MIPS -#ifdef CONFIG_CPU_R10000 +#if defined(CONFIG_CPU_R10000 ) || defined(CONFIG_CPU_R12K_R14K_R16K )#define pgprot_fb (_prot) (((_prot) & (~_CACHE_MASK)) | _CACHE_UNCACHED_ACCELERATED)#else #define pgprot_fb (_prot) (((_prot) & (~_CACHE_MASK)) | _CACHE_CACHABLE_NO_WA)
Quoted 8 lines · Joshua Kinard
From: Joshua Kinard <[email protected]>
This patch splits the old R10000 definitions so that the
R10000_LLSC_WARcan be disabled and -mno-fix-r10000 passed to CFLAGS for systems running R12000 CPUs and greater. This allows the kernel to build without branch-likely instructions, which are considered deprecated in current MIPS implementations.
Only R10000 systems with R2.6 and lower CPUs require branch-likely to work
around a known hardware errata item.