Merge tag 'x86_platform_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / x86 / platform / uv / uv_nmi.c

diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index ea277fc083574d6f2b179f391a050c0d4ddde23f..a60af0230e27b32526ade6f5b3906e81d19327cd 100644 (file)
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -244,8 +244,10 @@ static inline bool uv_nmi_action_is(const char *action)
 /* Setup which NMI support is present in system */
 static void uv_nmi_setup_mmrs(void)
 {
+       bool new_nmi_method_only = false;
+
        /* First determine arch specific MMRs to handshake with BIOS */
-       if (UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK) {
+       if (UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK) {      /* UV2,3,4 setup */
                uvh_nmi_mmrx = UVH_EVENT_OCCURRED0;
                uvh_nmi_mmrx_clear = UVH_EVENT_OCCURRED0_ALIAS;
                uvh_nmi_mmrx_shift = UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT;
@@ -255,26 +257,25 @@ static void uv_nmi_setup_mmrs(void)
                uvh_nmi_mmrx_req = UVH_BIOS_KERNEL_MMR_ALIAS_2;
                uvh_nmi_mmrx_req_shift = 62;
 
-       } else if (UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK) {
+       } else if (UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK) { /* UV5+ setup */
                uvh_nmi_mmrx = UVH_EVENT_OCCURRED1;
                uvh_nmi_mmrx_clear = UVH_EVENT_OCCURRED1_ALIAS;
                uvh_nmi_mmrx_shift = UVH_EVENT_OCCURRED1_EXTIO_INT0_SHFT;
                uvh_nmi_mmrx_type = "OCRD1-EXTIO_INT0";
 
-               uvh_nmi_mmrx_supported = UVH_EXTIO_INT0_BROADCAST;
-               uvh_nmi_mmrx_req = UVH_BIOS_KERNEL_MMR_ALIAS_2;
-               uvh_nmi_mmrx_req_shift = 62;
+               new_nmi_method_only = true;             /* Newer nmi always valid on UV5+ */
+               uvh_nmi_mmrx_req = 0;                   /* no request bit to clear */
 
        } else {
-               pr_err("UV:%s:cannot find EVENT_OCCURRED*_EXTIO_INT0\n",
-                       __func__);
+               pr_err("UV:%s:NMI support not available on this system\n", __func__);
                return;
        }
 
        /* Then find out if new NMI is supported */
-       if (likely(uv_read_local_mmr(uvh_nmi_mmrx_supported))) {
-               uv_write_local_mmr(uvh_nmi_mmrx_req,
-                                       1UL << uvh_nmi_mmrx_req_shift);
+       if (new_nmi_method_only || uv_read_local_mmr(uvh_nmi_mmrx_supported)) {
+               if (uvh_nmi_mmrx_req)
+                       uv_write_local_mmr(uvh_nmi_mmrx_req,
+                                               1UL << uvh_nmi_mmrx_req_shift);
                nmi_mmr = uvh_nmi_mmrx;
                nmi_mmr_clear = uvh_nmi_mmrx_clear;
                nmi_mmr_pending = 1UL << uvh_nmi_mmrx_shift;