Removes obsolete scratch5 NMI handler only used in UV1 and early UV2
systems.
Signed-off-by: Mike Travis <mike.travis@xxxxxxx>
Reviewed-by: Steve Wahl <steve.wahl@xxxxxxx>
---
arch/x86/include/asm/uv/uv_hub.h | 6 ------
arch/x86/platform/uv/uv_nmi.c | 5 +----
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index d3e3197917be..958c18f94146 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -729,12 +729,6 @@ extern void uv_nmi_setup_hubless(void);
#define UVH_TSC_SYNC_VALID 3 /* 0011 */
#define UVH_TSC_SYNC_UNKNOWN 0 /* 0000 */
-/* BMC sets a bit this MMR non-zero before sending an NMI */
-#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"
-
struct uv_hub_nmi_s {
raw_spinlock_t nmi_lock;
atomic_t in_nmi; /* flag this node in UV NMI IRQ */
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index 1e9ff28bc2e0..926a4e006e5a 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -280,10 +280,7 @@ static void uv_nmi_setup_mmrs(void)
nmi_mmr_pending = 1UL << uvh_nmi_mmrx_shift;
pr_info("UV: SMI NMI support: %s\n", uvh_nmi_mmrx_type);
} else {
- nmi_mmr = UVH_NMI_MMR;
- nmi_mmr_clear = UVH_NMI_MMR_CLEAR;
- nmi_mmr_pending = 1UL << UVH_NMI_MMR_SHIFT;
- pr_info("UV: SMI NMI support: %s\n", UVH_NMI_MMR_TYPE);
+ pr_warn("UV: NMI handler not present or not supported\n");
}
}
--
2.26.2
