Messages in this thread Patch in this message | | | Date | Wed, 27 Apr 2016 19:55:06 -0500 | From | Mike Travis <> | Subject | [PATCH 09/21] X86_64, UV: Update MMIOH setup function to work for both UV3 and UV4 |
| |
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> --- 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 @@ -571,6 +571,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; @@ -650,7 +651,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); --
| |