Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2f904bb authored by Jack Steiner's avatar Jack Steiner Committed by Ingo Molnar
Browse files

x86, uv: fix for size of hub mappings 



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: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9b658f6f

arch/x86/kernel/genx2apic_uv_x.c

+7 −6
Original line number Diff line number Diff line
@@ -286,12 +286,13 @@ static __init void map_low_mmrs(void) 


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;



	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,

	       					paddr + bytes);

	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);

	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)
@@ -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);

	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)
@@ -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);

	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)
@@ -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);

	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)