lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, uv: fix for size of hub mappings

Browse Source 
Fix the size of the mappings of UV hub registers. Size must
be a function of the maximum node number within the SSI.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jack Steiner
2008-09-25 07:52:10 -05:00
committed by Ingo Molnar
parent 9b658f6f8b
commit d2f904bb9a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/genx2apic_uv_x.c
View File

@@ -286,12 +286,13 @@ static __init void map_low_mmrs(void)
enum map_type {map_wb, map_uc}; enum map_type {map_wb, map_uc};
static __init void map_high(char *id, unsigned long base, int shift, enum map_type map_type) static __init void map_high(char *id, unsigned long base, int shift,
int max_pnode, enum map_type map_type)
{ {
unsigned long bytes, paddr; unsigned long bytes, paddr;
paddr = base << shift; paddr = base << shift;
bytes = (1UL << shift); bytes = (1UL << shift) * (max_pnode + 1);
printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr, printk(KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n", id, paddr,
paddr + bytes); paddr + bytes);
if (map_type == map_uc) if (map_type == map_uc)
@@ -307,7 +308,7 @@ static __init void map_gru_high(int max_pnode)
gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR); gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR);
if (gru.s.enable) if (gru.s.enable)
map_high("GRU", gru.s.base, shift, map_wb); map_high("GRU", gru.s.base, shift, max_pnode, map_wb);
} }
static __init void map_config_high(int max_pnode) static __init void map_config_high(int max_pnode)
@@ -317,7 +318,7 @@ static __init void map_config_high(int max_pnode)
cfg.v = uv_read_local_mmr(UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR); cfg.v = uv_read_local_mmr(UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR);
if (cfg.s.enable) if (cfg.s.enable)
map_high("CONFIG", cfg.s.base, shift, map_uc); map_high("CONFIG", cfg.s.base, shift, max_pnode, map_uc);
} }
static __init void map_mmr_high(int max_pnode) static __init void map_mmr_high(int max_pnode)
@@ -327,7 +328,7 @@ static __init void map_mmr_high(int max_pnode)
mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR); mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR);
if (mmr.s.enable) if (mmr.s.enable)
map_high("MMR", mmr.s.base, shift, map_uc); map_high("MMR", mmr.s.base, shift, max_pnode, map_uc);
} }
static __init void map_mmioh_high(int max_pnode) static __init void map_mmioh_high(int max_pnode)
@@ -337,7 +338,7 @@ static __init void map_mmioh_high(int max_pnode)
mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR); mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR);
if (mmioh.s.enable) if (mmioh.s.enable)
map_high("MMIOH", mmioh.s.base, shift, map_uc); map_high("MMIOH", mmioh.s.base, shift, max_pnode, map_uc);
} }
static __init void uv_rtc_init(void) static __init void uv_rtc_init(void)