@@ -2363,6 +2363,13 @@ done:
if (first) unmap_domain_page(first);
}
+static inline paddr_t get_faulting_ipa(void)
+{
+ register_t hpfar = READ_SYSREG(HPFAR_EL2);
+
+ return ((paddr_t)(hpfar & HPFAR_MASK) << (12 - 4));
+}
+
static void do_trap_instr_abort_guest(struct cpu_user_regs *regs,
const union hsr hsr)
{
@@ -2381,7 +2388,7 @@ static void do_trap_instr_abort_guest(struct cpu_user_regs *regs,
};
if ( hsr.iabt.s1ptw )
- gpa = READ_SYSREG(HPFAR_EL2);
+ gpa = get_faulting_ipa();
else
{
/*
@@ -2431,7 +2438,7 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs,
#endif
if ( dabt.s1ptw )
- info.gpa = READ_SYSREG(HPFAR_EL2);
+ info.gpa = get_faulting_ipa();
else
{
rc = gva_to_ipa(info.gva, &info.gpa, GV2M_READ);
@@ -565,6 +565,13 @@ union hsr {
#define FSC_LL_MASK (_AC(0x03,U)<<0)
+/* HPFAR_EL2: Hypervisor IPA Fault Address Register */
+#ifdef CONFIG_ARM_64
+#define HPFAR_MASK GENMASK(39, 4)
+#else
+#define HPFAR_MASK GENMASK(31, 4)
+#endif
+
/* Time counter hypervisor control register */
#define CNTHCTL_EL2_EL1PCTEN (1u<<0) /* Kernel/user access to physical counter */
#define CNTHCTL_EL2_EL1PCEN (1u<<1) /* Kernel/user access to CNTP timer regs */