Skip to contentSkip to conversation

x86: SGI UV - Map low MMR ranges

PATCH In review Jack Steiner 1 participant 2 messages Nov 25, 2009 – Nov 26, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: SGI UV - Map low MMR ranges

Explicitly mmap the UV chipset MMR address ranges used to access blade-local registers. Although these same MMRs are also mmaped at higher addresses, the low range is more convenient when accessing blade-local registers.
The low range addresses always alias to the local blade regardless of the blade id.

---
 arch/x86/kernel/apic/x2apic_uv_x.c |    8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/kernel/apic/x2apic_uv_x.c +8 -0
Index: linux/arch/x86/kernel/apic/x2apic_uv_x.c
===================================================================
@@ -427,6 +427,12 @@ static __init void map_mmioh_high(int ma
 		map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc);
 }
 
+static __init void map_low_mmrs(void)
+{
+	init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE);
+	init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE);
+}
+
 static __init void uv_rtc_init(void)
 {
 	long status;
@@ -568,6 +574,8 @@ void __init uv_system_init(void)
 	unsigned long mmr_base, present, paddr;
 	unsigned short pnode_mask;
 
+	map_low_mmrs();
+
 	m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG);
 	m_val = m_n_config.s.m_skt;
 	n_val = m_n_config.s.n_skt;
#1 lore raw

[tip:x86/apic] x86: SGI UV: Map low MMR ranges

Commit-ID:  918bc960dc630b1a79c0d2991a81985812ff69f5
Gitweb:     http://git.kernel.org/tip/918bc960dc630b1a79c0d2991a81985812ff69f5
Author:     Jack Steiner <[email protected]>
AuthorDate: Wed, 25 Nov 2009 10:20:19 -0600
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 26 Nov 2009 10:52:36 +0100

x86: SGI UV: Map low MMR ranges

Explicitly mmap the UV chipset MMR address ranges used to access blade-local registers. Although these same MMRs are also mmaped at higher addresses, the low range is more convenient when accessing blade-local registers.

The low range addresses always alias to the local blade regardless of the blade id.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/apic/x2apic_uv_x.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +8 -0
index f5f5886..6d42549 100644
@@ -409,6 +409,12 @@ static __init void map_mmioh_high(int max_pnode)
 		map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc);
 }
 
+static __init void map_low_mmrs(void)
+{
+	init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE);
+	init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE);
+}
+
 static __init void uv_rtc_init(void)
 {
 	long status;
@@ -550,6 +556,8 @@ void __init uv_system_init(void)
 	unsigned long mmr_base, present, paddr;
 	unsigned short pnode_mask;
 
+	map_low_mmrs();
+
 	m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG);
 	m_val = m_n_config.s.m_skt;
 	n_val = m_n_config.s.n_skt;