x86/platform/uv: Fix printed information in calc_mmioh_map

Fix incorrect mask names and values in calc_mmioh_map() that caused it
to print wrong NASID information. And an unused blade position is not
an error condition, but will yield an invalid NASID value, so change
the invalid NASID message from an error to a debug message.

Signed-off-by: Steve Wahl <steve.wahl@hpe.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20230519190752.3297140-4-steve.wahl%40hpe.com

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 48285522796454b4b368e8ff1c0287e4bef7d574..6d2739eadb710cb1875ec39d07707a8c37a7f8af 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -1022,7 +1022,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index,
        switch (index) {
        case UVY_MMIOH0:
                mmr = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0;
-               nasid_mask = UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK;
+               nasid_mask = UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK;
                n = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH;
                min_nasid = min_pnode;
                max_nasid = max_pnode;
@@ -1030,7 +1030,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index,
                break;
        case UVY_MMIOH1:
                mmr = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1;
-               nasid_mask = UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK;
+               nasid_mask = UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK;
                n = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH;
                min_nasid = min_pnode;
                max_nasid = max_pnode;
@@ -1038,7 +1038,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index,
                break;
        case UVX_MMIOH0:
                mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0;
-               nasid_mask = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK;
+               nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK;
                n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH;
                min_nasid = min_pnode * 2;
                max_nasid = max_pnode * 2;
@@ -1046,7 +1046,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index,
                break;
        case UVX_MMIOH1:
                mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1;
-               nasid_mask = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK;
+               nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK;
                n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH;
                min_nasid = min_pnode * 2;
                max_nasid = max_pnode * 2;
@@ -1072,8 +1072,9 @@ static void __init calc_mmioh_map(enum mmioh_arch index,
 
                /* Invalid NASID check */
                if (nasid < min_nasid || max_nasid < nasid) {
-                       pr_err("UV:%s:Invalid NASID:%x (range:%x..%x)\n",
-                               __func__, index, min_nasid, max_nasid);
+                       /* Not an error: unused table entries get "poison" values */
+                       pr_debug("UV:%s:Invalid NASID(%x):%x (range:%x..%x)\n",
+                              __func__, index, nasid, min_nasid, max_nasid);
                        nasid = -1;
                }