Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1488239

[PATCH 04/10] arch/x86/platform/uv: BAU replace uv_physnodeaddr

Show all headers | View raw

The BAU driver should use the functions provided by uv_hub.h rather than
its own implementations. uv_physnodeaddr converts vaddrs to paddrs for
BAU MMR fields, but this is done better by uv_gpa_to_offset.

Signed-off-by: Andrew Banman <abanman@sgi.com>
Acked-by: Mike Travis <travis@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/include/asm/uv/uv_bau.h | 2 --
 arch/x86/platform/uv/tlb_uv.c    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
index cc058c6..a46f270 100644
--- a/arch/x86/include/asm/uv/uv_bau.h
+++ b/arch/x86/include/asm/uv/uv_bau.h
@@ -55,8 +55,6 @@
 #define UV_BAU_TUNABLES_DIR		"sgi_uv"
 #define UV_BAU_TUNABLES_FILE		"bau_tunables"
 #define WHITESPACE			" \t\n"
-#define uv_mmask			((1UL << uv_hub_info->m_val) - 1)
-#define uv_physnodeaddr(x)		((__pa((unsigned long)(x)) & uv_mmask))
 #define cpubit_isset(cpu, bau_local_cpumask) \
 	test_bit((cpu), (bau_local_cpumask).bits)
 
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index f6bc43b..34b2a48 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1812,8 +1812,8 @@ static void pq_init(int node, int pnode)
 		bcp->queue_last		= pqp + (DEST_Q_SIZE - 1);
 	}
 
-	first = uv_physnodeaddr(pqp);
-	last = uv_physnodeaddr(pqp + (DEST_Q_SIZE - 1));
+	first = uv_gpa_to_offset(uv_gpa(pqp));
+	last = uv_gpa_to_offset(uv_gpa(pqp + (DEST_Q_SIZE - 1)));
 	tail = first;
 	gnode = uv_gpa_to_gnode(uv_gpa(pqp));
 	first = (gnode << UV_PAYLOADQ_GNODE_SHIFT) | tail;
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] arch/x86/platform/uv: add UV4 support to BAU Andrew Banman <abanman@sgi.com> - 2016-09-21 00:40 +0200
  [PATCH 7/9] arch/x86/platform/uv: BAU UV4 disable software timeout Andrew Banman <abanman@sgi.com> - 2016-09-21 00:40 +0200
  [PATCH 6/9] arch/x86/platform/uv: BAU UV4 populate uvhub_version Andrew Banman <abanman@sgi.com> - 2016-09-21 00:40 +0200
  Re: [PATCH 0/9] arch/x86/platform/uv: add UV4 support to BAU Thomas Gleixner <tglx@linutronix.de> - 2016-09-21 17:00 +0200
  [PATCHv2 0/10] arch/x86/platform/uv: add UV4 support to BAU Andrew Banman <abanman@sgi.com> - 2016-09-21 18:10 +0200
    [PATCH 01/10] arch/x86/platform/uv: BAU cleanup: vertical alignment Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Clean up vertical alignment tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 02/10] arch/x86/platform/uv: BAU cleanup: update printks Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Clean up and update printks tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 10/10] arch/x86/platform/uv: BAU UV4 add version-specific functions Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Add UV4-specific functions tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 08/10] arch/x86/platform/uv: BAU UV4 disable software timeout Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Disable software timeout on  UV4 hardware tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 03/10] arch/x86/platform/uv: BAU cleanup: pq_init Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Clean up pq_init() tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 06/10] arch/x86/platform/uv: BAU use generic function pointers Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Use generic function  pointers tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 04/10] arch/x86/platform/uv: BAU replace uv_physnodeaddr Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Convert uv_physnodeaddr()  use to uv_gpa_to_offset() tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 05/10] arch/x86/platform/uv: BAU add generic function pointers Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Add generic function  pointers tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 07/10] arch/x86/platform/uv: BAU UV4 populate uvhub_version Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Populate ->uvhub_version  with UV4 version information tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200
    [PATCH 09/10] arch/x86/platform/uv: BAU UV4 fix payload queue setup Andrew Banman <abanman@sgi.com> - 2016-09-21 18:20 +0200
      [tip:x86/platform] x86/platform/uv/BAU: Fix payload queue setup on  UV4 hardware tip-bot for Andrew Banman <tipbot@zytor.com> - 2016-09-22 12:40 +0200

csiph-web