x86: SGU UV Map MMIO-High memory range
Subsystems (2)
PATCH 1/1 x86: SGU UV Map MMIO-High memory range
UV depends on the MMRHI space being identity mapped. The patch:
x86: Make 64-bit efi_ioremap use ioremap on MMIO regions
changed this to make efi regions at a different address using ioremap. Add the identity mapping to uv_system_init.
(Note this code was previously present but was deleted when BIOS added the ranges to the EFI map - previous efi code identify mapped the ranges).
--- arch/x86/kernel/apic/x2apic_uv_x.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/x86/kernel/apic/x2apic_uv_x.c +11 -0
@@ -390,6 +390,16 @@ static __init void map_gru_high(int max_map_high ("GRU" , gru.s.base, shift, max_pnode, map_wb); } +static __init void map_mmr_high (int max_pnode) +{ +union uvh_rh_gam_mmr_overlay_config_mmr_u mmr; +int shift =UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT ; + + mmr.v =uv_read_local_mmr (UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR ); +if (mmr.s.enable) +map_high ("MMR" , mmr.s.base, shift, max_pnode, map_uc); +} +static __init void map_mmioh_high (int max_pnode) {union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh;
@@ -644,6 +654,7 @@ void __init uv_system_init(void) }map_gru_high (max_pnode); +map_mmr_high (max_pnode);map_mmioh_high (max_pnode);uv_cpu_init ();
[tip:x86/urgent] x86: SGI UV: Map MMIO-High memory range
Commit-ID: daf7b9c9216e2b82e4c14b7248a85286dab021c3 Gitweb: http://git.kernel.org/tip/daf7b9c9216e2b82e4c14b7248a85286dab021c3 Author: Jack Steiner <[email protected]> AuthorDate: Wed, 9 Sep 2009 10:43:39 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 18 Sep 2009 14:06:40 +0200
x86: SGI UV: Map MMIO-High memory range
UV depends on the MMRHI space being identity mapped. The patch:
x86: Make 64-bit efi_ioremap use ioremap on MMIO regions
changed this to make efi regions at a different address using ioremap. Add the identity mapping to uv_system_init.
( Note this code was previously present but was deleted when BIOS
added the ranges to the EFI map - previous efi code identify mapped the ranges. )
LKML-Reference: <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +11 -0
@@ -389,6 +389,16 @@ static __init void map_gru_high(int max_pnode)map_high ("GRU" , gru.s.base, shift, max_pnode, map_wb); } +static __init void map_mmr_high (int max_pnode) +{ +union uvh_rh_gam_mmr_overlay_config_mmr_u mmr; +int shift =UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT ; + + mmr.v =uv_read_local_mmr (UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR ); +if (mmr.s.enable) +map_high ("MMR" , mmr.s.base, shift, max_pnode, map_uc); +} +static __init void map_mmioh_high (int max_pnode) {union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh;
@@ -643,6 +653,7 @@ void __init uv_system_init(void) }map_gru_high (max_pnode); +map_mmr_high (max_pnode);map_mmioh_high (max_pnode);uv_cpu_init ();