Commit 5f6bd3f3 authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Define FGT nMASK bits relative to other fields 



Now that RES0 and MASK have full coverage, no need to manually
encode nMASK. Calculate it relative to the other fields.

No functional change intended.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231214100158.2305400-14-tabba@google.com
parent 9ff67dd2

arch/arm64/include/asm/kvm_arm.h

+7 −7
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ 
 */

#define __HFGRTR_EL2_RES0	HFGxTR_EL2_RES0

#define __HFGRTR_EL2_MASK	GENMASK(49, 0)

#define __HFGRTR_EL2_nMASK	(GENMASK(63, 52) | BIT(50))

#define __HFGRTR_EL2_nMASK	~(__HFGRTR_EL2_RES0 | __HFGRTR_EL2_MASK)



/*

 * The HFGWTR bits are a subset of HFGRTR bits. To ensure we don't miss any
@@ -357,17 +357,17 @@ 
				 GENMASK(15, 14) | GENMASK(10, 9) | BIT(2))

#define __HFGWTR_EL2_RES0	(__HFGRTR_EL2_RES0 | __HFGRTR_ONLY_MASK)

#define __HFGWTR_EL2_MASK	(__HFGRTR_EL2_MASK & ~__HFGRTR_ONLY_MASK)

#define __HFGWTR_EL2_nMASK	(__HFGRTR_EL2_nMASK & ~__HFGRTR_ONLY_MASK)

#define __HFGWTR_EL2_nMASK	~(__HFGWTR_EL2_RES0 | __HFGWTR_EL2_MASK)



#define __HFGITR_EL2_RES0	HFGITR_EL2_RES0

#define __HFGITR_EL2_MASK	(BIT(62) | BIT(60) | GENMASK(54, 0))

#define __HFGITR_EL2_nMASK	GENMASK(59, 55)

#define __HFGITR_EL2_nMASK	~(__HFGITR_EL2_RES0 | __HFGITR_EL2_MASK)



#define __HDFGRTR_EL2_RES0	HDFGRTR_EL2_RES0

#define __HDFGRTR_EL2_MASK	(BIT(63) | GENMASK(58, 50) | GENMASK(48, 43) | \

				 GENMASK(41, 40) | GENMASK(37, 22) | \

				 GENMASK(19, 9) | GENMASK(7, 0))

#define __HDFGRTR_EL2_nMASK	GENMASK(62, 59)

#define __HDFGRTR_EL2_nMASK	~(__HDFGRTR_EL2_RES0 | __HDFGRTR_EL2_MASK)



#define __HDFGWTR_EL2_RES0	HDFGWTR_EL2_RES0

#define __HDFGWTR_EL2_MASK	(GENMASK(57, 52) | GENMASK(50, 48) | \
@@ -375,16 +375,16 @@ 
				 GENMASK(37, 35) | GENMASK(33, 31) | \

				 GENMASK(29, 23) | GENMASK(21, 10) | \

				 GENMASK(8, 7) | GENMASK(5, 0))

#define __HDFGWTR_EL2_nMASK	GENMASK(62, 60)

#define __HDFGWTR_EL2_nMASK	~(__HDFGWTR_EL2_RES0 | __HDFGWTR_EL2_MASK)



#define __HAFGRTR_EL2_RES0	HAFGRTR_EL2_RES0

#define __HAFGRTR_EL2_MASK	(GENMASK(49, 17) | GENMASK(4, 0))

#define __HAFGRTR_EL2_nMASK	0UL

#define __HAFGRTR_EL2_nMASK	~(__HAFGRTR_EL2_RES0 | __HAFGRTR_EL2_MASK)



/* Similar definitions for HCRX_EL2 */

#define __HCRX_EL2_RES0         HCRX_EL2_RES0

#define __HCRX_EL2_MASK		(BIT(6))

#define __HCRX_EL2_nMASK	(GENMASK(24, 14) | GENMASK(11, 7) | GENMASK(5, 0))

#define __HCRX_EL2_nMASK	~(__HCRX_EL2_RES0 | __HCRX_EL2_MASK)



/* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */

#define HPFAR_MASK	(~UL(0xf))