From 0e792f3c6dd08c9f56b73021e4d82fbf8da90083 Mon Sep 17 00:00:00 2001 From: Dave Hansen Date: Tue, 22 Sep 2026 21:24:03 -0700 Subject: [PATCH 16/75] x86/platform/uv: Remove the write-only uv_cpuid.gpa_shift early_get_pnodeid() sets uv_cpuid.gpa_shift to a hardcoded default of 46, with a comment saying it will be changed later if needed. Nothing has changed it in a long time, and its one reader - the gpa_mask computation in uv_init_hub_info() - went away with the rest of the GPA address format fields. Note that this is not the gpa_shift the UV BIOS reports in the GAM parameters table. That one lives in struct uv_gam_parameters, is still printed by decode_gam_params() and is untouched here. No functional change intended. --- arch/x86/kernel/apic/x2apic_uv_x.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index e795e08b1fe4f..b6631500a6df6 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -45,7 +45,6 @@ static struct { unsigned int socketid_shift; /* aka pnode_shift for UV2/3 */ unsigned int pnode_mask; unsigned int nasid_shift; - unsigned int gpa_shift; unsigned int gnode_shift; unsigned int m_skt; unsigned int n_skt; @@ -117,7 +116,6 @@ static void __init early_get_pnodeid(void) uv_cpuid.pnode_mask = (1 << uv_cpuid.n_skt) - 1; pnode = (uv_node_id >> uv_cpuid.nasid_shift) & uv_cpuid.pnode_mask; - uv_cpuid.gpa_shift = 46; /* Default unless changed */ pr_info("UV: n_skt:%d pnmsk:%x pn:%x\n", uv_cpuid.n_skt, uv_cpuid.pnode_mask, pnode); -- 2.43.0