[PATCH 09/21] X86_64, UV: Update MMIOH setup function to work for both UV3 and UV4

From	Mike Travis <travis@sgi.com>
Newsgroups	linux.kernel
Subject	[PATCH 09/21] X86_64, UV: Update MMIOH setup function to work for both UV3 and UV4
Date	2016-04-29 01:20 +0200
Message-ID	<rt3nZ-3WT-55@gated-at.bofh.it> (permalink)
References	<rt3nY-3WT-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Since UV3 and UV4 MMIOH regions are setup the same, we can use a common
function to setup both.

Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Dimitri Sivanich <sivanich@sgi.com>
Tested-by: John Estabrook <estabrook@sgi.com>
Tested-by: Gary Kroening <gfk@sgi.com>
Tested-by: Nathan Zimmer <nzimmer@sgi.com>
---
 arch/x86/kernel/apic/x2apic_uv_x.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -628,6 +628,7 @@ static __initdata struct mmioh_config mm
 	},
 };
 
+/* UV3 & UV4 have identical MMIOH overlay configs */
 static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
 {
 	union uv3h_rh_gam_mmioh_overlay_config0_mmr_u overlay;
@@ -707,7 +708,7 @@ static __init void map_mmioh_high(int mi
 	unsigned long mmr, base;
 	int shift, enable, m_io, n_io;
 
-	if (is_uv3_hub()) {
+	if (is_uv3_hub() || is_uv4_hub()) {
 		/* Map both MMIOH Regions */
 		map_mmioh_high_uv3(0, min_pnode, max_pnode);
 		map_mmioh_high_uv3(1, min_pnode, max_pnode);

--

Back to linux.kernel | Previous | Next — Previous 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-29 01:20 +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-29 01:20 +0200

csiph-web