From: Mike Travis <mike.travis@hpe.com>
To: Borislav Petkov <bp@alien8.de>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Steve Wahl <steve.wahl@hpe.com>,
x86@kernel.org
Cc: Mike Travis <mike.travis@hpe.com>,
Andy Shevchenko <andy@infradead.org>,
Darren Hart <dvhart@infradead.org>,
Dimitri Sivanich <dimitri.sivanich@hpe.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Russ Anderson <russ.anderson@hpe.com>,
linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org
Subject: [PATCH 1/4] x86/platform/uv: Remove Obsolete Scratch5 NMI handler
Date: Mon, 7 Mar 2022 19:05:34 -0600 [thread overview]
Message-ID: <20220308010537.70150-2-mike.travis@hpe.com> (raw)
In-Reply-To: <20220308010537.70150-1-mike.travis@hpe.com>
Removes obsolete scratch5 NMI handler only used in UV1 and early UV2
systems.
Signed-off-by: Mike Travis <mike.travis@hpe.com>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
---
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
next prev parent reply other threads:[~2022-03-08 1:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 1:05 [PATCH 0/4] x86/platform/uv: UV Kernel support for UV5 Mike Travis
2022-03-08 1:05 ` Mike Travis [this message]
2022-03-10 16:12 ` [PATCH 1/4] x86/platform/uv: Remove Obsolete Scratch5 NMI handler Hans de Goede
2022-03-08 1:05 ` [PATCH 2/4] x86/platform/uv: Update NMI Handler for UV5 Mike Travis
2022-03-10 16:22 ` Hans de Goede
2022-03-08 1:05 ` [PATCH 3/4] x86/platform/uv: Update TSC sync state " Mike Travis
2022-03-08 1:05 ` [PATCH 4/4] x86/platform/uv: Add gap hole end size Mike Travis
2022-03-08 16:09 ` Steve Wahl
2022-03-10 16:23 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220308010537.70150-2-mike.travis@hpe.com \
--to=mike.travis@hpe.com \
--cc=andy@infradead.org \
--cc=bp@alien8.de \
--cc=dimitri.sivanich@hpe.com \
--cc=dvhart@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=russ.anderson@hpe.com \
--cc=steve.wahl@hpe.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).