shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Trap debug break and watch from guest"

Browse Source 
This reverts commit 9b08f9cf8e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I12b04cb929fc891e8c6f06a86f1fe3d9e1f5db10
This commit is contained in:
Will Deacon
2022-07-07 15:51:40 +01:00
parent d9cd49c2e1
commit e77ce0a14d
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kvm/hyp/nvhe/pkvm.c
View File

@@ -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))

11
arch/arm64/kvm/hyp/nvhe/sys_regs.c
View File

@@ -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 */