From: Arnd Bergmann <arnd@arndb.de>

Date: Mon, 26 Oct 2020 20:37:46 +0100

Subject: arm64: avoid -Woverride-init warning

Git-commit: 332576e69a046b9b33f49bd0c3c071cc98215b60

Patch-mainline: v5.10-rc2

References: git-fixes

The icache_policy_str[] definition causes a warning when extra

warning flags are enabled:

arch/arm64/kernel/cpuinfo.c:38:26: warning: initialized field overwritten [-Woverride-init]

   38 |  [ICACHE_POLICY_VIPT]  = "VIPT",

      |                          ^~~~~~

arch/arm64/kernel/cpuinfo.c:38:26: note: (near initialization for 'icache_policy_str[2]')

arch/arm64/kernel/cpuinfo.c:39:26: warning: initialized field overwritten [-Woverride-init]

   39 |  [ICACHE_POLICY_PIPT]  = "PIPT",

      |                          ^~~~~~

arch/arm64/kernel/cpuinfo.c:39:26: note: (near initialization for 'icache_policy_str[3]')

arch/arm64/kernel/cpuinfo.c:40:27: warning: initialized field overwritten [-Woverride-init]

   40 |  [ICACHE_POLICY_VPIPT]  = "VPIPT",

      |                           ^~~~~~~

arch/arm64/kernel/cpuinfo.c:40:27: note: (near initialization for 'icache_policy_str[0]')

There is no real need for the default initializer here, as printing a

NULL string is harmless. Rewrite the logic to have an explicit

reserved value for the only one that uses the default value.

This partially reverts the commit that removed ICACHE_POLICY_AIVIVT.

Fixes: 155433cb365e ("arm64: cache: Remove support for ASID-tagged VIVT I-caches")

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Link: https://lore.kernel.org/r/20201026193807.3816388-1-arnd@kernel.org

Signed-off-by: Will Deacon <will@kernel.org>

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>

---

 arch/arm64/include/asm/cache.h |    1 +

 arch/arm64/kernel/cpuinfo.c    |    8 ++++----

 2 files changed, 5 insertions(+), 4 deletions(-)

--- a/arch/arm64/include/asm/cache.h

+++ b/arch/arm64/include/asm/cache.h

@@ -24,6 +24,7 @@

 #define CTR_L1IP(ctr)		(((ctr) >> CTR_L1IP_SHIFT) & CTR_L1IP_MASK)

 #define ICACHE_POLICY_VPIPT	0

+#define ICACHE_POLICY_RESERVED	1

 #define ICACHE_POLICY_VIPT	2

 #define ICACHE_POLICY_PIPT	3

--- a/arch/arm64/kernel/cpuinfo.c

+++ b/arch/arm64/kernel/cpuinfo.c

@@ -34,10 +34,10 @@ DEFINE_PER_CPU(struct cpuinfo_arm64, cpu

 static struct cpuinfo_arm64 boot_cpu_data;

 static char *icache_policy_str[] = {

-	[0 ... ICACHE_POLICY_PIPT]	= "RESERVED/UNKNOWN",

+	[ICACHE_POLICY_VPIPT]		= "VPIPT",

+	[ICACHE_POLICY_RESERVED]	= "RESERVED/UNKNOWN",

 	[ICACHE_POLICY_VIPT]		= "VIPT",

 	[ICACHE_POLICY_PIPT]		= "PIPT",

-	[ICACHE_POLICY_VPIPT]		= "VPIPT",

 };

 unsigned long __icache_flags;

@@ -314,11 +314,11 @@ static void cpuinfo_detect_icache_policy

 	case ICACHE_POLICY_VPIPT:

 		set_bit(ICACHEF_VPIPT, &__icache_flags);

 		break;

-	default:

-		/* Fallthrough */

+	case ICACHE_POLICY_RESERVED:

 	case ICACHE_POLICY_VIPT:

 		/* Assume aliasing */

 		set_bit(ICACHEF_ALIASING, &__icache_flags);

+		break;

 	}

 	pr_info("Detected %s I-cache on CPU%d\n", icache_policy_str[l1ip], cpu);