From e77ce0a14de38b8b577013628d7d1829959f3c0b Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:40 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Trap debug break and watch from guest" This reverts commit 9b08f9cf8e70ed04c84515a91dbe15221d5d791e. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I12b04cb929fc891e8c6f06a86f1fe3d9e1f5db10 --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- arch/arm64/kvm/hyp/nvhe/sys_regs.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index ddb626bbee55..78946e0d314c 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -94,7 +94,7 @@ static void pvm_init_traps_aa64dfr0(struct kvm_vcpu *vcpu) /* Trap Debug */ if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_DEBUGVER), feature_ids)) - mdcr_set |= MDCR_EL2_TDRA | MDCR_EL2_TDA; + mdcr_set |= MDCR_EL2_TDRA | MDCR_EL2_TDA | MDCR_EL2_TDE; /* Trap OS Double Lock */ if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_DOUBLELOCK), feature_ids)) diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c index 7a7d8b07586e..296a69ce925a 100644 --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c @@ -338,17 +338,6 @@ static const struct sys_reg_desc pvm_sys_reg_descs[] = { /* Cache maintenance by set/way operations are restricted. */ /* Debug and Trace Registers are restricted. */ - RAZ_WI(SYS_DBGBVRn_EL1(0)), - RAZ_WI(SYS_DBGBCRn_EL1(0)), - RAZ_WI(SYS_DBGWVRn_EL1(0)), - RAZ_WI(SYS_DBGWCRn_EL1(0)), - RAZ_WI(SYS_MDSCR_EL1), - RAZ_WI(SYS_OSLAR_EL1), - RAZ_WI(SYS_OSLSR_EL1), - RAZ_WI(SYS_OSDLR_EL1), - - /* Group 1 ID registers */ - RAZ_WI(SYS_REVIDR_EL1), /* AArch64 mappings of the AArch32 ID registers */ /* CRm=1 */