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

Commit bd47a85a authored by mike.travis@hpe.com's avatar mike.travis@hpe.com Committed by Thomas Gleixner
Browse files

x86/platform/UV: Fix critical UV MMR address error 



A critical error was found testing the fixed UV4 HUB in that an MMR address
was found to be incorrect.  This causes the virtual address space for
accessing the MMIOH1 region to be allocated with the incorrect size.

Fixes: 673aa20c ("x86/platform/UV: Update uv_mmrs.h to prepare for UV4A fixes")
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Cc: Russ Anderson <russ.anderson@hpe.com>
Cc: Andrew Banman <andrew.banman@hpe.com>
Link: https://lkml.kernel.org/r/20180328174011.041801248@stormcage.americas.sgi.com
parent 151ad17f

arch/x86/include/asm/uv/uv_mmrs.h

+1 −1
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ union uvh_rh_gam_mmioh_overlay_config0_mmr_u { 
#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR uv_undefined("UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR")

#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR uv_undefined("UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR")

#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x1603000UL

#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x483000UL

#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x484000UL

#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR (				\

	is_uv1_hub() ? UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR :		\

	is_uv2_hub() ? UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR :		\