ARC: retire ARC750 support
[email protected]
maintainerRFC 1/2 ARC: retire ARC750 support
From: Vineet Gupta <[email protected]>
There's no known/active customer using them with latest kernels anyways.
Signed-off-by Vineet Gupta <[email protected]>
--- arch/arc/Kconfig | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
arch/arc/Kconfig +1 -11
@@ -116,16 +116,9 @@ choice default ARC_CPU_770 if ISA_ARCOMPACT default ARC_CPU_HS if ISA_ARCV2 -if ISA_ARCOMPACT - -config ARC_CPU_750D - bool "ARC750D" - select ARC_CANT_LLSC - help - Support for ARC750 core - config ARC_CPU_770 bool "ARC770" + depends on ISA_ARCOMPACT select ARC_HAS_SWAPE help Support for ARC770 core introduced with Rel 4.10 (Summer 2011)
@@ -135,8 +128,6 @@ config ARC_CPU_770 -Caches: New Prog Model, Region Flush -Insns: endian swap, load-locked/store-conditional, time-stamp-ctr -endif #ISA_ARCOMPACT - config ARC_CPU_HS bool "ARC-HS" depends on ISA_ARCV2
@@ -275,7 +266,6 @@ config ARC_DCCM_BASE choice prompt "MMU Version" default ARC_MMU_V3 if ARC_CPU_770 - default ARC_MMU_V2 if ARC_CPU_750D default ARC_MMU_V4 if ARC_CPU_HS if ISA_ARCOMPACT
Signature · 1 line
2.25.1
[email protected]
maintainerRFC 2/2 ARC: retire MMUv1 and MMUv2 support
From: Vineet Gupta <[email protected]>
These were present in ancient ARC700 cores which don't seem to be active in field anymore.
Removal helps cleanup code and remove the hack for MMU_VER to MMU_V[3-4] conversion
Signed-off-by Vineet Gupta <[email protected]>
--- arch/arc/Kconfig | 22 +---- arch/arc/include/asm/mmu.h | 22 +---- arch/arc/include/asm/pgtable.h | 26 +---- arch/arc/include/asm/tlb-mmu1.h | 101 -------------------- arch/arc/mm/cache.c | 110 +++------------------ arch/arc/mm/tlb.c | 163 ++++---------------------------- arch/arc/mm/tlbex.S | 10 +- 7 files changed, 42 insertions(+), 412 deletions(-) delete mode 100644 arch/arc/include/asm/tlb-mmu1.h
arch/arc/Kconfig +3 -19
@@ -265,32 +265,17 @@ config ARC_DCCM_BASE choice prompt "MMU Version" - default ARC_MMU_V3 if ARC_CPU_770 - default ARC_MMU_V4 if ARC_CPU_HS - -if ISA_ARCOMPACT - -config ARC_MMU_V1 - bool "MMU v1" - help - Orig ARC700 MMU - -config ARC_MMU_V2 - bool "MMU v2" - help - Fixed the deficiency of v1 - possible thrashing in memcpy scenario - when 2 D-TLB and 1 I-TLB entries index into same 2way set. + default ARC_MMU_V3 if ISA_ARCOMPACT + default ARC_MMU_V4 if ISA_ARCV2 config ARC_MMU_V3 bool "MMU v3" - depends on ARC_CPU_770 + depends on ISA_ARCOMPACT help Introduced with ARC700 4.10: New Features Variable Page size (1k-16k), var JTLB size 128 x (2 or 4) Shared Address Spaces (SASID) -endif - config ARC_MMU_V4 bool "MMU v4" depends on ISA_ARCV2
@@ -309,7 +294,6 @@ config ARC_PAGE_SIZE_8K config ARC_PAGE_SIZE_16K bool "16KB" - depends on ARC_MMU_V3 || ARC_MMU_V4 config ARC_PAGE_SIZE_4K bool "4KB"
arch/arc/include/asm/mmu.h +4 -18
@@ -10,19 +10,10 @@#include <linux/threads.h> /* NR_CPUS */ #endif -#if defined(CONFIG_ARC_MMU_V1 ) -#define CONFIG_ARC_MMU_VER 1 -#elif defined(CONFIG_ARC_MMU_V2 ) -#define CONFIG_ARC_MMU_VER 2 -#elif defined(CONFIG_ARC_MMU_V3 ) -#define CONFIG_ARC_MMU_VER 3 -#elif defined(CONFIG_ARC_MMU_V4 ) -#define CONFIG_ARC_MMU_VER 4 -#endif -/* MMU Management regs */ #define ARC_REG_MMU_BCR 0x06f -#if (CONFIG_ARC_MMU_VER <4 ) + +#ifdef CONFIG_ARC_MMU_V3 #define ARC_REG_TLBPD0 0x405#define ARC_REG_TLBPD1 0x406#define ARC_REG_TLBPD1HI 0/* Dummy: allows code sharing with ARC700 */
@@ -52,7 +43,7 @@/* Error code if probe fails */ #define TLB_LKUP_ERR 0x80000000 -#if (CONFIG_ARC_MMU_VER <4 ) +#ifdef CONFIG_ARC_MMU_V3 #define TLB_DUP_ERR (TLB_LKUP_ERR | 0x00000001)#else #define TLB_DUP_ERR (TLB_LKUP_ERR | 0x40000000)
@@ -63,15 +54,10 @@#define TLBRead 0x2#define TLBGetIndex 0x3#define TLBProbe 0x4 - -#if (CONFIG_ARC_MMU_VER >=2 )#define TLBWriteNI 0x5/* write JTLB without inv uTLBs */ #define TLBIVUTLB 0x6/* explicitly inv uTLBs */ -#else -#define TLBWriteNI TLBWrite/* Not present in hardware, fallback */ -#endif -#if (CONFIG_ARC_MMU_VER >=4 ) +#ifdef CONFIG_ARC_MMU_V4 #define TLBInsertEntry 0x7#define TLBDeleteEntry 0x8#endif
arch/arc/include/asm/pgtable.h +2 -24
@@ -35,7 +35,7 @@#include <linux/bits.h> #include <asm-generic/pgtable-nopmd.h> #include <asm/page.h> -#include <asm/mmu.h> /* to propagate CONFIG_ARC_MMU_VER <n> */ +#include <asm/mmu.h> /************************************************************************** * Page Table Flags
@@ -51,20 +51,6 @@* (saves some bit shift ops in TLB Miss hdlrs) */ -#if (CONFIG_ARC_MMU_VER <=2 ) - -#define _PAGE_ACCESSED (1<<1)/* Page is accessed (S) */ -#define _PAGE_CACHEABLE (1<<2)/* Page is cached (H) */ -#define _PAGE_EXECUTE (1<<3)/* Page has user execute perm (H) */ -#define _PAGE_WRITE (1<<4)/* Page has user write perm (H) */ -#define _PAGE_READ (1<<5)/* Page has user read perm (H) */ -#define _PAGE_DIRTY (1<<6)/* Page modified (dirty) (S) */ -#define _PAGE_SPECIAL (1<<7) -#define _PAGE_GLOBAL (1<<8)/* Page is global (H) */ -#define _PAGE_PRESENT (1<<10)/* TLB entry is valid (H) */ - -#else /* MMU v3 onwards */ -#define _PAGE_CACHEABLE (1<<0)/* Page is cached (H) */ #define _PAGE_EXECUTE (1<<1)/* Page has user execute perm (H) */ #define _PAGE_WRITE (1<<2)/* Page has user write perm (H) */
@@ -73,23 +59,15 @@#define _PAGE_DIRTY (1<<5)/* Page modified (dirty) (S) */ #define _PAGE_SPECIAL (1<<6) -#if (CONFIG_ARC_MMU_VER >=4 ) -#define _PAGE_WTHRU (1<<7)/* Page cache mode write-thru (H) */ -#endif -#define _PAGE_GLOBAL (1<<8)/* Page is global (H) */ #define _PAGE_PRESENT (1<<9)/* TLB entry is valid (H) */ -#if (CONFIG_ARC_MMU_VER >=4 ) +#ifdef CONFIG_ARC_MMU_V4 #define _PAGE_HW_SZ (1<<10)/* Page Size indicator (H): 0 normal, 1 super */ #endif #define _PAGE_SHARED_CODE (1<<11)/* Shared Code page with cmn vaddr usable for shared TLB entries (H) */ - -#define _PAGE_UNUSED_BIT (1<<12) -#endif -/* vmalloc permissions */ #define _K_PAGE_PERMS (_PAGE_EXECUTE | _PAGE_WRITE | _PAGE_READ | \ _PAGE_GLOBAL | _PAGE_PRESENT)
arch/arc/include/asm/tlb-mmu1.h deleted +0 -101
101 lines not on this page · raw message
arch/arc/mm/cache.c +14 -96
135 lines not on this page · raw message
arch/arc/mm/tlb.c +18 -145
214 lines not on this page · raw message
arch/arc/mm/tlbex.S +1 -9
@@ -39,7 +39,6 @@ #include <asm/arcregs.h> #include <asm/cache.h> #include <asm/processor.h> -#include <asm/tlb-mmu1.h> #ifdef CONFIG_ISA_ARCOMPACT ;-----------------------------------------------------------------
@@ -279,7 +278,7 @@ ex_saved_reg1: ; Commit the TLB entry into MMU .macro COMMIT_ENTRY_TO_MMU -#if (CONFIG_ARC_MMU_VER < 4) +#ifdef CONFIG_ARC_MMU_V3 /* Get free TLB slot: Set = computed from vaddr, way = random */ sr TLBGetIndex, [ARC_REG_TLBCOMMAND]
@@ -375,13 +374,6 @@ ENTRY(EV_TLBMissD) CONV_PTE_TO_TLB -#if (CONFIG_ARC_MMU_VER == 1) - ; MMU with 2 way set assoc J-TLB, needs some help in pathetic case of - ; memcpy where 3 parties contend for 2 ways, ensuing a livelock. - ; But only for old MMU or one with Metal Fix - TLB_WRITE_HEURISTICS -#endif - COMMIT_ENTRY_TO_MMU TLBMISS_RESTORE_REGS EV_TLBMissD_fast_ret: ; additional label for VDK OS-kit instrumentation
Signature · 1 line
2.25.1