Use CONFIG_ARC_DBG_IOC_ENABLE Kconfig option instead of ioc_enable global variable.
Signed-off-by: Eugeniy Paltsev Eugeniy.Paltsev@synopsys.com --- arch/arc/Kconfig | 18 ++++++++++++++++ arch/arc/include/asm/cache.h | 5 +++++ arch/arc/lib/cache.c | 49 ++++++++++++++++++++++++++------------------ 3 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index e3f9db7b29..aee15d5353 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -116,6 +116,24 @@ config SYS_DCACHE_OFF bool "Do not use Data Cache" default n
+menuconfig ARC_DBG + bool "ARC debugging" + default n + +if ARC_DBG + +config ARC_DBG_IOC_ENABLE + bool "Enable IO coherency unit" + depends on CPU_ARCHS38 + default n + help + Enable IO coherency unit to debug problems with caches and + DMA peripherals. + NOTE: as of today linux will not work properly if this option + is enabled in u-boot! + +endif + choice prompt "Target select" default TARGET_AXS103 diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index 382c4126c3..fe75409b5c 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -32,6 +32,11 @@ void cache_init(void); void flush_n_invalidate_dcache_all(void);
+static const inline int is_ioc_enabled(void) +{ + return IS_ENABLED(CONFIG_ARC_DBG_IOC_ENABLE); +} + #endif /* __ASSEMBLY__ */
#endif /* __ASM_ARC_CACHE_H */ diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 031ebd7765..ad14900135 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -107,18 +107,8 @@ DECLARE_GLOBAL_DATA_PTR; #define SLC_CTRL_BUSY 0x100 #define SLC_CTRL_RGN_OP_INV 0x200
-/* - * By default that variable will fall into .bss section. - * But .bss section is not relocated and so it will be initilized before - * relocation but will be used after being zeroed. - */ #define CACHE_LINE_MASK (~(gd->arch.l1_line_sz - 1))
-bool ioc_exists __section(".data") = false; - -/* To force enable IOC set ioc_enable to 'true' */ -bool ioc_enable __section(".data") = false; - static inline bool pae_exists(void) { /* TODO: should we compare mmu version from BCR and from CONFIG? */ @@ -162,6 +152,30 @@ static inline bool slc_exists(void) return false; }
+static inline bool ioc_exists(void) +{ + if (is_isa_arcv2()) { + union bcr_clust_cfg cbcr; + + cbcr.word = read_aux_reg(ARC_BCR_CLUSTER); + return cbcr.fields.c; + } + + return false; +} + +static inline bool ioc_enabled(void) +{ + /* + * We check only CONFIG option instead of IOC HW state check as IOC + * must be disabled by default. + */ + if (is_ioc_enabled()) + return ioc_exists(); + + return false; +} + static void __slc_entire_op(const int op) { unsigned int ctrl; @@ -295,17 +309,12 @@ static void read_decode_cache_bcr_arcv2(void) #ifdef CONFIG_ISA_ARCV2
union bcr_slc_cfg slc_cfg; - union bcr_clust_cfg cbcr;
if (slc_exists()) { slc_cfg.word = read_aux_reg(ARC_AUX_SLC_CONFIG); gd->arch.slc_line_sz = (slc_cfg.fields.lsz == 0) ? 128 : 64; }
- cbcr.word = read_aux_reg(ARC_BCR_CLUSTER); - if (cbcr.fields.c && ioc_enable) - ioc_exists = true; - #endif /* CONFIG_ISA_ARCV2 */ }
@@ -339,7 +348,7 @@ void cache_init(void) if (is_isa_arcv2()) read_decode_cache_bcr_arcv2();
- if (is_isa_arcv2() && ioc_exists) + if (is_isa_arcv2() && ioc_enabled()) arc_ioc_setup();
if (is_isa_arcv2() && slc_exists()) @@ -511,10 +520,10 @@ void invalidate_dcache_range(unsigned long start, unsigned long end) * ARCv2 && no IOC -> call __dc_line_op; call __slc_rgn_op * ARCv2 && IOC enabled -> nothing */ - if (!is_isa_arcv2() || !ioc_exists) + if (!is_isa_arcv2() || !ioc_enabled()) __dc_line_op(start, end - start, OP_INV);
- if (is_isa_arcv2() && !ioc_exists) + if (is_isa_arcv2() && !ioc_enabled()) __slc_rgn_op(start, end - start, OP_INV); }
@@ -528,10 +537,10 @@ void flush_dcache_range(unsigned long start, unsigned long end) * ARCv2 && no IOC -> call __dc_line_op; call __slc_rgn_op * ARCv2 && IOC enabled -> nothing */ - if (!is_isa_arcv2() || !ioc_exists) + if (!is_isa_arcv2() || !ioc_enabled()) __dc_line_op(start, end - start, OP_FLUSH);
- if (is_isa_arcv2() && !ioc_exists) + if (is_isa_arcv2() && !ioc_enabled()) __slc_rgn_op(start, end - start, OP_FLUSH); }