Re: arch/x86/kernel/apic/x2apic_uv_x.c:106 early_get_pnodeid() warn: inconsistent indenting

From: Mike Travis
Date: Wed Apr 21 2021 - 21:39:00 EST

I'm a bit confused. I have this in my inbox that someone else has this fix. So will that fix be applied or should I send a separate one that is essentially a duplicate?

----- Forwarded message from Yang Li <yang.lee@xxxxxxxxxxxxxxxxx> -----

Date: Fri, 16 Apr 2021 18:10:40 +0800
From: Yang Li <yang.lee@xxxxxxxxxxxxxxxxx>
To: steve.wahl@xxxxxxx
CC: mike.travis@xxxxxxx, dimitri.sivanich@xxxxxxx, russ.anderson@xxxxxxx, tglx@xxxxxxxxxxxxx, mingo@xxxxxxxxxx, bp@xxxxxxxxx,
x86@xxxxxxxxxx, hpa@xxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Yang Li <yang.lee@xxxxxxxxxxxxxxxxx>
Subject: [PATCH] x86/platform/uv: Fix inconsistent indenting
X-Mailer: git-send-email 1.8.3.1

Kernel test robot throws below warning ->

smatch warnings:
arch/x86/kernel/apic/x2apic_uv_x.c:111 early_get_pnodeid() warn:
inconsistent indenting

Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx>
Signed-off-by: Yang Li <yang.lee@xxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 52bc217..3e7534e 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -108,7 +108,7 @@ static void __init early_get_pnodeid(void)
} else if (UVH_RH_GAM_ADDR_MAP_CONFIG) {
union uvh_rh_gam_addr_map_config_u m_n_config;
- m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_ADDR_MAP_CONFIG);
+ m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_ADDR_MAP_CONFIG);
uv_cpuid.n_skt = m_n_config.s.n_skt;
if (is_uv(UV3))
uv_cpuid.m_skt = m_n_config.s3.m_skt;
--
1.8.3.1


----- End forwarded message -----



On 4/21/2021 4:03 AM, kernel test robot wrote:
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 1fe5501ba1abf2b7e78295df73675423bd6899a0
commit: 6c7794423a998478f6df0234d2dd5baa3ccbdb1d x86/platform/uv: Add UV5 direct references
date: 7 months ago
config: x86_64-randconfig-m001-20210421 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@xxxxxxxxx>

smatch warnings:
arch/x86/kernel/apic/x2apic_uv_x.c:106 early_get_pnodeid() warn: inconsistent indenting

vim +106 arch/x86/kernel/apic/x2apic_uv_x.c

1b9b89e7f16333 arch/x86/kernel/genx2apic_uv_x.c Yinghai Lu 2008-07-21 91
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 92 static void __init early_get_pnodeid(void)
27229ca63269c1 arch/x86/kernel/apic/x2apic_uv_x.c Jack Steiner 2009-04-17 93 {
d8850ba425d982 arch/x86/kernel/apic/x2apic_uv_x.c Jack Steiner 2010-11-30 94 int pnode;
7a1110e861b266 arch/x86/kernel/apic/x2apic_uv_x.c Jack Steiner 2010-01-12 95
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 96 uv_cpuid.m_skt = 0;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 97 if (UVH_RH10_GAM_ADDR_MAP_CONFIG) {
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 98 union uvh_rh10_gam_addr_map_config_u m_n_config;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 99
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 100 m_n_config.v = uv_early_read_mmr(UVH_RH10_GAM_ADDR_MAP_CONFIG);
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 101 uv_cpuid.n_skt = m_n_config.s.n_skt;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 102 uv_cpuid.nasid_shift = 0;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 103 } else if (UVH_RH_GAM_ADDR_MAP_CONFIG) {
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 104 union uvh_rh_gam_addr_map_config_u m_n_config;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 105
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 @106 m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_ADDR_MAP_CONFIG);
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 107 uv_cpuid.n_skt = m_n_config.s.n_skt;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 108 if (is_uv(UV3))
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 109 uv_cpuid.m_skt = m_n_config.s3.m_skt;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 110 if (is_uv(UV2))
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 111 uv_cpuid.m_skt = m_n_config.s2.m_skt;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 112 uv_cpuid.nasid_shift = 1;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 113 } else {
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 114 unsigned long GAM_ADDR_MAP_CONFIG = 0;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 115
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 116 WARN(GAM_ADDR_MAP_CONFIG == 0,
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 117 "UV: WARN: GAM_ADDR_MAP_CONFIG is not available\n");
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 118 uv_cpuid.n_skt = 0;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 119 uv_cpuid.nasid_shift = 0;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 120 }
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 121
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 122 if (is_uv(UV4|UVY))
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 123 uv_cpuid.gnode_shift = 2; /* min partition is 4 sockets */
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 124
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 125 uv_cpuid.pnode_mask = (1 << uv_cpuid.n_skt) - 1;
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 126 pnode = (uv_node_id >> uv_cpuid.nasid_shift) & uv_cpuid.pnode_mask;
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 127 uv_cpuid.gpa_shift = 46; /* Default unless changed */
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 128
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 129 pr_info("UV: n_skt:%d pnmsk:%x pn:%x\n",
6c7794423a9984 arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 130 uv_cpuid.n_skt, uv_cpuid.pnode_mask, pnode);
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 131 }
647128f1536efa arch/x86/kernel/apic/x2apic_uv_x.c Mike Travis 2020-10-05 132

:::::: The code at line 106 was first introduced by commit
:::::: 647128f1536efacca7bedf189790d24b22f03cca x86/platform/uv: Update UV MMRs for UV5

:::::: TO: Mike Travis <mike.travis@xxxxxxx>
:::::: CC: Borislav Petkov <bp@xxxxxxx>

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@xxxxxxxxxxxx