From: Andrew Banman <abanman@hpe.com>
To: Ingo Molnar <mingo@redhat.com>
Cc: Russ Anderson <rja@hpe.com>, Dimitri Sivanich <sivanich@hpe.com>,
Andrew Banman <abanman@hpe.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] x86/platform/uv/BAU: Replace hard-coded values with MMR definitions
Date: Mon, 8 Jan 2018 13:43:12 -0600 [thread overview]
Message-ID: <1515440592-44060-1-git-send-email-abanman@hpe.com> (raw)
In-Reply-To: <1515440405-20880-1-git-send-email-mike.travis@hpe.com>
Replaces hard-coded node ID shift for the descriptor base mmr to fix
initialization on UV4A while maintaining previous architectures.
Signed-off-by: Andrew Banman <abanman@hpe.com>
Acked-by: Mike Travis <mike.travis@hpe.com>
---
arch/x86/include/asm/uv/uv_bau.h | 1 -
arch/x86/platform/uv/tlb_uv.c | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
index 7cac798..7803114 100644
--- a/arch/x86/include/asm/uv/uv_bau.h
+++ b/arch/x86/include/asm/uv/uv_bau.h
@@ -48,7 +48,6 @@
#define UV2_NET_ENDPOINT_INTD 0x28
#define UV_NET_ENDPOINT_INTD (is_uv1_hub() ? \
UV1_NET_ENDPOINT_INTD : UV2_NET_ENDPOINT_INTD)
-#define UV_DESC_PSHIFT 49
#define UV_PAYLOADQ_GNODE_SHIFT 49
#define UV_PTC_BASENAME "sgi_uv/ptc_statistics"
#define UV_BAU_BASENAME "sgi_uv/bau_tunables"
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 8538a67..c2e9285 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1751,7 +1751,8 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)
uv1 = 1;
/* the 14-bit pnode */
- write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m));
+ write_mmr_descriptor_base(pnode,
+ (n << UVH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT | m));
/*
* Initializing all 8 (ITEMS_PER_DESC) descriptors for each
* cpu even though we only use the first one; one descriptor can
--
1.8.2.1
next prev parent reply other threads:[~2018-01-08 19:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 19:39 [PATCH 0/7 v2] x86/platform/UV: UV Fix patches for Intel processors Mike Travis
2018-01-08 19:39 ` [PATCH 1/7] x86/platform/UV: Update uv_mmrs.h to prep for UV4A fixes Mike Travis
2018-01-16 3:52 ` [tip:x86/platform] x86/platform/UV: Update uv_mmrs.h to prepare " tip-bot for Mike Travis
2018-01-08 19:40 ` [PATCH 2/7] x86/platform/UV: Support for UV4A fixes for new Intel Processors Mike Travis
2018-01-16 3:52 ` [tip:x86/platform] x86/platform/UV: Fix UV4A support on " tip-bot for Mike Travis
2018-01-08 19:40 ` [PATCH 3/7] x86/platform/UV: Add references to access to fixed UV4A HUB MMRs Mike Travis
2018-01-16 3:53 ` [tip:x86/platform] x86/platform/UV: Add references to access " tip-bot for Mike Travis
2018-01-08 19:40 ` [PATCH 4/7] x86/platform/UV: Fix GAM MMR changes in UV4A Mike Travis
2018-01-16 3:53 ` [tip:x86/platform] " tip-bot for Mike Travis
2018-01-08 19:40 ` [PATCH 5/7] x86/platform/UV: Fix GAM MMR references in UV x2apic code Mike Travis
2018-01-16 3:54 ` [tip:x86/platform] x86/platform/UV: Fix GAM MMR references in the " tip-bot for Mike Travis
2018-01-08 19:40 ` [PATCH 6/7] x86/platform/UV: Fix for UV4A BAU MMRs Mike Travis
2018-01-16 3:54 ` [tip:x86/platform] x86/platform/UV: Fix " tip-bot for Mike Travis
2018-01-08 19:43 ` Andrew Banman [this message]
2018-01-16 3:55 ` [tip:x86/platform] x86/platform/uv/BAU: Replace hard-coded values with MMR definitions tip-bot for Andrew Banman
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=1515440592-44060-1-git-send-email-abanman@hpe.com \
--to=abanman@hpe.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rja@hpe.com \
--cc=sivanich@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).