Insert a check early in UV system startup that checks whether BIOS was
able to obtain satisfactory TSC Sync stability.  If not, it usually
is caused by an error in the external TSC clock generation source.
In this case the best fallback is to use the builtin hardware RTC as
the kernel would also not be able to obtain an accurate TSC sync.

Signed-off-by: Mike Travis <mike.tra...@hpe.com>
Reviewed-by: Dimitri Sivanich <dimitri.sivan...@hpe.com>
Reviewed-by: Russ Anderson <russ.ander...@hpe.com>
Reviewed-by: Andrew Banman <andrew.aban...@hpe.com>
---
 arch/x86/include/asm/uv/uv_hub.h   |   19 +++++++++++++--
 arch/x86/kernel/apic/x2apic_uv_x.c |   44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)

--- linux.orig/arch/x86/include/asm/uv/uv_hub.h
+++ linux/arch/x86/include/asm/uv/uv_hub.h
@@ -776,9 +776,22 @@ static inline int uv_num_possible_blades
 extern void uv_nmi_setup(void);
 extern void uv_nmi_setup_hubless(void);
 
+/* BIOS/Kernel flags exchange MMR */
+#define        UVH_BIOS_KERNEL_MMR             UVH_SCRATCH5
+#define        UVH_BIOS_KERNEL_MMR_ALIAS       UVH_SCRATCH5_ALIAS
+#define UVH_BIOS_KERNEL_MMR_ALIAS_2    UVH_SCRATCH5_ALIAS_2
+
+/* TSC sync valid, set by BIOS */
+#define        UVH_TSC_SYNC_MMR        UVH_BIOS_KERNEL_MMR
+#define        UVH_TSC_SYNC_SHIFT      10
+#define        UVH_TSC_SYNC_SHIFT_UV2K 16      /* UV3k has different bits */
+#define        UVH_TSC_SYNC_MASK       3       /* 0011 */
+#define        UVH_TSC_SYNC_VALID      3       /* 0011 */
+#define        UVH_TSC_SYNC_INVALID    2       /* 0010 */
+
 /* BMC sets a bit this MMR non-zero before sending an NMI */
-#define UVH_NMI_MMR            UVH_SCRATCH5
-#define UVH_NMI_MMR_CLEAR      UVH_SCRATCH5_ALIAS
+#define UVH_NMI_MMR            UVH_BIOS_KERNEL_MMR
+#define UVH_NMI_MMR_CLEAR      UVH_BIOS_KERNEL_MMR_ALIAS
 #define UVH_NMI_MMR_SHIFT      63
 #define        UVH_NMI_MMR_TYPE        "SCRATCH5"
 
@@ -792,7 +805,7 @@ extern void uv_nmi_setup_hubless(void);
 #define UVH_NMI_MMRX_SUPPORTED UVH_EXTIO_INT0_BROADCAST
 
 /* Indicates to BIOS that we want to use the newer SMM NMI handler */
-#define UVH_NMI_MMRX_REQ       UVH_SCRATCH5_ALIAS_2
+#define UVH_NMI_MMRX_REQ       UVH_BIOS_KERNEL_MMR_ALIAS_2
 #define UVH_NMI_MMRX_REQ_SHIFT 62
 
 struct uv_hub_nmi_s {
--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -154,6 +154,49 @@ static int __init early_get_pnodeid(void
        return pnode;
 }
 
+static void uv_tsc_check_sync(void)
+{
+       u64 mmr;
+       int sync_state;
+       int mmr_shift;
+       char *reason;
+       char *state;
+       bool valid;
+
+       /* Accommodate different UV arch BIOSes */
+       mmr = uv_early_read_mmr(UVH_TSC_SYNC_MMR);
+       mmr_shift =
+               is_uv1_hub() ? 0 :
+               is_uv2_hub() ? UVH_TSC_SYNC_SHIFT_UV2K : UVH_TSC_SYNC_SHIFT;
+       if (mmr_shift)
+               sync_state = (mmr >> mmr_shift) & UVH_TSC_SYNC_MASK;
+       else
+               sync_state = 0;
+
+       switch (sync_state) {
+       case UVH_TSC_SYNC_VALID:
+               state = "in sync";
+               valid = true;
+               reason = "UV BIOS";
+               break;
+
+       case UVH_TSC_SYNC_INVALID:
+               state = "unstable";
+               valid = false;
+               break;
+       default:
+               state = "unknown";
+               valid = true;
+               reason = "UV default";
+               break;
+       }
+       pr_info("UV: TSC sync state from BIOS:0%d(%s)\n", sync_state, state);
+       if (valid)
+               mark_tsc_socket0_nonzero(reason);
+       else
+               mark_tsc_unstable("UV BIOS");
+}
+
 /* [Copied from arch/x86/kernel/cpu/topology.c:detect_extended_topology()] */
 
 #define SMT_LEVEL                      0       /* Leaf 0xb SMT level */
@@ -288,6 +331,7 @@ static int __init uv_acpi_madt_oem_check
        }
 
        pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", 
oem_id, oem_table_id, uv_system_type, uv_min_hub_revision_id, uv_apic);
+       uv_tsc_check_sync();
 
        return uv_apic;
 

-- 

Reply via email to