Commit fd27bea3 authored by Steve Wahl's avatar Steve Wahl Committed by Dave Hansen
Browse files

x86/platform/uv: Add platform resolving #defines for misc GAM_MMIOH_REDIRECT* 



Upcoming changes will require use of new #defines
UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK and
UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK, which provide the
appropriate values on different uv platforms.

Also, fix typo that defined a couple of "*_CONFIG0_*" values twice
where "*_CONFIG1_*" was intended.

Signed-off-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20230519190752.3297140-2-steve.wahl%40hpe.com
parent 7877cb91

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

+16 −2
Original line number Diff line number Diff line
@@ -4199,6 +4199,13 @@ union uvh_rh_gam_mmioh_overlay_config1_u { 
#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT	0

#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK	0x0000000000007fffUL



/* UVH common defines */

#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK (			\

	is_uv(UV4A) ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK :	\

	is_uv(UV4)  ?  UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK :	\

	is_uv(UV3)  ?  UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK :	\

	0)





union uvh_rh_gam_mmioh_redirect_config0_u {

	unsigned long	v;
@@ -4247,8 +4254,8 @@ union uvh_rh_gam_mmioh_redirect_config0_u { 
	0)



/* UV4A unique defines */

#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT	0

#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK	0x0000000000000fffUL

#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT	0

#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK	0x0000000000000fffUL



/* UV4 unique defines */

#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT	0
@@ -4258,6 +4265,13 @@ union uvh_rh_gam_mmioh_redirect_config0_u { 
#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT	0

#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK	0x0000000000007fffUL



/* UVH common defines */

#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK (			\

	is_uv(UV4A) ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK :	\

	is_uv(UV4)  ?  UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK :	\

	is_uv(UV3)  ?  UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK :	\

	0)





union uvh_rh_gam_mmioh_redirect_config1_u {

	unsigned long	v;