--- zzzz-none-000/linux-4.19.183/arch/arm/kvm/hyp/switch.c	2021-03-24 10:07:39.000000000 +0000
+++ bcm63-7530ax-756/linux-4.19.183/arch/arm/kvm/hyp/switch.c	2023-06-28 08:54:18.000000000 +0000
@@ -134,12 +134,21 @@
 	if (!(hsr & HSR_DABT_S1PTW) && (hsr & HSR_FSC_TYPE) == FSC_PERM) {
 		u64 par, tmp;
 
+#if defined(CONFIG_BCM_KF_ARM_KASAN)
+		par = read_sysreg(PAR_64);
+#else
 		par = read_sysreg(PAR);
+#endif
 		write_sysreg(far, ATS1CPR);
 		isb();
 
+#if defined(CONFIG_BCM_KF_ARM_KASAN)
+		tmp = read_sysreg(PAR_64);
+		write_sysreg(par, PAR_64);
+#else
 		tmp = read_sysreg(PAR);
 		write_sysreg(par, PAR);
+#endif
 
 		if (unlikely(tmp & 1))
 			return false; /* Translation failed, back to guest */