2020-11-19 07:56:08

by Tiezhu Yang

Subject: [PATCH 0/2] Clean up and fix up cpu_cache_init()

Tiezhu Yang (2):
MIPS: Remove cpu_has_6k_cache and cpu_has_8k_cache in cpu_cache_init()
MIPS: Loongson64: Fix wrong scache size when execute lscpu

arch/mips/include/asm/cpu-features.h | 2 --
arch/mips/mm/c-r4k.c | 10 ++++------
arch/mips/mm/cache.c | 10 ----------
3 files changed, 4 insertions(+), 18 deletions(-)

--
2.1.0

2020-11-19 07:56:28

by Tiezhu Yang

Subject: [PATCH 1/2] MIPS: Remove cpu_has_6k_cache and cpu_has_8k_cache in cpu_cache_init()

Since commit 02cf2119684e ("Cleanup the mess in cpu_cache_init."),
cpu_has_6k_cache and cpu_has_8k_cache have no user, r6k_cache_init()
and r8k_cache_init() are not defined for over 15 years, just remove
them.

Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/mips/include/asm/cpu-features.h | 2 --
arch/mips/mm/cache.c | 10 ----------
2 files changed, 12 deletions(-)

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index f2e216e..336e02b 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -115,8 +115,6 @@
#ifndef cpu_has_3k_cache
#define cpu_has_3k_cache __isa_lt_and_opt(1, MIPS_CPU_3K_CACHE)
#endif
-#define cpu_has_6k_cache 0
-#define cpu_has_8k_cache 0
#ifndef cpu_has_4k_cache
#define cpu_has_4k_cache __isa_ge_or_opt(1, MIPS_CPU_4K_CACHE)
#endif
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 3e81ba0..ed99cde 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -203,21 +203,11 @@ void cpu_cache_init(void)

r3k_cache_init();
}
- if (cpu_has_6k_cache) {
- extern void __weak r6k_cache_init(void);
-
- r6k_cache_init();
- }
if (cpu_has_4k_cache) {
extern void __weak r4k_cache_init(void);

r4k_cache_init();
}
- if (cpu_has_8k_cache) {
- extern void __weak r8k_cache_init(void);
-
- r8k_cache_init();
- }
if (cpu_has_tx39_cache) {
extern void __weak tx39_cache_init(void);

--
2.1.0

2020-11-19 12:57:57

by Thomas Bogendoerfer

Subject: Re: [PATCH 0/2] Clean up and fix up cpu_cache_init()

On Thu, Nov 19, 2020 at 03:52:59PM +0800, Tiezhu Yang wrote:
> Tiezhu Yang (2):
> MIPS: Remove cpu_has_6k_cache and cpu_has_8k_cache in cpu_cache_init()
> MIPS: Loongson64: Fix wrong scache size when execute lscpu
>
> arch/mips/include/asm/cpu-features.h | 2 --
> arch/mips/mm/c-r4k.c | 10 ++++------
> arch/mips/mm/cache.c | 10 ----------
> 3 files changed, 4 insertions(+), 18 deletions(-)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]