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

Groups > linux.kernel > #1394032

[tip:x86/platform] x86/platform/UV: Add UV Architecture Defines

From tip-bot for Mike Travis <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:x86/platform] x86/platform/UV: Add UV Architecture Defines
Date 2016-05-04 09:20 +0200
Message-ID <ruZgd-7OK-7@gated-at.bofh.it> (permalink)
References <rtoC9-4GO-51@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  e0ee1c97c3b1cabc3651d7bcf39c1f54d736fd20
Gitweb:     http://git.kernel.org/tip/e0ee1c97c3b1cabc3651d7bcf39c1f54d736fd20
Author:     Mike Travis <travis@sgi.com>
AuthorDate: Fri, 29 Apr 2016 16:54:04 -0500
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 4 May 2016 08:48:47 +0200

x86/platform/UV: Add UV Architecture Defines

Add defines to control which UV architectures are supported, and modify the
'if (is_uvX_*)' functions to return constant 0 for those not supported.
This will help optimize code paths when support for specific UV arches
is removed.

Tested-by: John Estabrook <estabrook@sgi.com>
Tested-by: Gary Kroening <gfk@sgi.com>
Tested-by: Nathan Zimmer <nzimmer@sgi.com>
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Dimitri Sivanich <sivanich@sgi.com>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160429215402.897143440@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/uv/uv_hub.h | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 38166ad..6660c09a 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -178,22 +178,43 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
 #define UV3_HUB_REVISION_BASE		5
 #define UV4_HUB_REVISION_BASE		7
 
+#ifdef	UV1_HUB_IS_SUPPORTED
 static inline int is_uv1_hub(void)
 {
 	return uv_hub_info->hub_revision < UV2_HUB_REVISION_BASE;
 }
+#else
+static inline int is_uv1_hub(void)
+{
+	return 0;
+}
+#endif
 
+#ifdef	UV2_HUB_IS_SUPPORTED
 static inline int is_uv2_hub(void)
 {
 	return ((uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE) &&
 		(uv_hub_info->hub_revision < UV3_HUB_REVISION_BASE));
 }
+#else
+static inline int is_uv2_hub(void)
+{
+	return 0;
+}
+#endif
 
+#ifdef	UV3_HUB_IS_SUPPORTED
 static inline int is_uv3_hub(void)
 {
 	return ((uv_hub_info->hub_revision >= UV3_HUB_REVISION_BASE) &&
 		(uv_hub_info->hub_revision < UV4_HUB_REVISION_BASE));
 }
+#else
+static inline int is_uv3_hub(void)
+{
+	return 0;
+}
+#endif
 
 #ifdef	UV4_HUB_IS_SUPPORTED
 static inline int is_uv4_hub(void)
@@ -207,15 +228,20 @@ static inline int is_uv4_hub(void)
 }
 #endif
 
-static inline int is_uv_hub(void)
+static inline int is_uvx_hub(void)
 {
-	return uv_hub_info->hub_revision;
+	if (uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE)
+		return uv_hub_info->hub_revision;
+
+	return 0;
 }
 
-/* code common to uv2/3/4 only */
-static inline int is_uvx_hub(void)
+static inline int is_uv_hub(void)
 {
-	return uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE;
+#ifdef	UV1_HUB_IS_SUPPORTED
+	return uv_hub_info->hub_revision;
+#endif
+	return is_uvx_hub();
 }
 
 union uvh_apicid {

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

Thread

[PATCH 00/21] X86_64, UV: Update kernel for SGI UV4 support Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
  [PATCH 18/21] X86_64, UV: Build GAM reference tables Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Build GAM reference tables tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 17/21] X86_64, UV: Support UV4 socket address changes Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Support UV4 socket address  changes tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 09/21] X86_64, UV: Update MMIOH setup function to work for both UV3 and UV4 Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Update MMIOH setup function to  work for both UV3 and UV4 tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 03/21] X86_64, UV: Add UV4 Specific Defines Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Add UV4 Specific Defines tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 11/21] X86_64, UV: Move scir info to the per cpu info struct Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Move scir info to the per cpu  info struct tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 15/21] X86_64, UV: Add UV4 addressing discovery function Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Add UV4 addressing discovery  function tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 13/21] X86_64, UV: Allocate common per node hub info structs on local node Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Allocate common per node hub  info structs on local node tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 14/21] X86_64, UV: Fold blade info into per node hub info structs Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Fold blade info into per node  hub info structs tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 21/21] X86_64, UV: Fix incorrect nodes and pnodes for cpuless and memoryless nodes Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Fix incorrect nodes and pnodes  for cpuless and memoryless nodes tip-bot for Dimitri Sivanich <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 07/21] X86_64, UV: Disable Obsolete APIC ID fixup code used only on UV1 Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    Re: [PATCH 07/21] X86_64, UV: Disable Obsolete APIC ID fixup code  used only on UV1 Ingo Molnar <mingo@kernel.org> - 2016-05-03 09:40 +0200
      Re: [PATCH 07/21] X86_64, UV: Disable Obsolete APIC ID fixup code  used only on UV1 Mike Travis <travis@sgi.com> - 2016-05-03 16:50 +0200
  [PATCH 10/21] X86_64, UV: Create per cpu info structs to replace per hub info structs Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Create per cpu info structs to  replace per hub info structs tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 20/21] X86_64, UV: Remove Obsolete GRU MMR address translation Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Remove Obsolete GRU MMR address  translation tip-bot for Dimitri Sivanich <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 16/21] X86_64, UV: Add obtaining GAM Range Table from UV BIOS Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Add obtaining GAM Range Table  from UV BIOS tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 19/21] X86_64, UV: Update physical address conversions for UV4 Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Update physical address  conversions for UV4 tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 05/21] X86_64, UV: Prep for UV4 MMR updates Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Prep for UV4 MMR updates tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 02/21] X86_64, UV: Add UV Architecture Defines Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Add UV Architecture Defines tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 01/21] X86_64, UV: Add Initial UV4 definitions Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Add Initial UV4 definitions tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 12/21] X86_64, UV: Move blade local processor ID to the per cpu info struct Mike Travis <travis@sgi.com> - 2016-04-30 00:00 +0200
    [tip:x86/platform] x86/platform/UV: Move blade local processor ID  to the per cpu info struct tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:30 +0200
  [PATCH 04/21] X86_64, UV: Add UV MMR Illegal Access Function Mike Travis <travis@sgi.com> - 2016-04-30 00:10 +0200
    [tip:x86/platform] x86/platform/UV: Add UV MMR Illegal Access  Function tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200
  [PATCH 08/21] X86_64, UV: Clean up redunduncies after merge of UV4 MMR definitions Mike Travis <travis@sgi.com> - 2016-04-30 00:10 +0200
    [tip:x86/platform] x86/platform/UV: Clean up redunduncies after  merge of UV4 MMR definitions tip-bot for Mike Travis <tipbot@zytor.com> - 2016-05-04 09:20 +0200

csiph-web