Revert "ARM: hw_breakpoint: Workaround for Cortex-A12/A17"

This reverts commit 15d6bca6c4.

Replaced by commit 2bb93af182 ("ARM: 8997/2: hw_breakpoint: Handle inexact watchpoint addresses")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang 2020-12-28 17:34:18 +08:00
parent e1db199ebd
commit 79bdd6a061

View File

@ -731,20 +731,6 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
/* Check if the watchpoint value matches. */
val = read_wb_reg(ARM_BASE_WVR + i);
/*
* It seems Cortex-A12/A17 do not report report
* watchpoint hit address that matches the watchpoint
* set as ARM64.
* Add this workaround for pass Android 8+ CTS
* bionic ptrace watchpoint_imprecise.
*/
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A12) {
unsigned long dist;
dist = val > addr ? val - addr : addr - val;
if (dist > 8)
goto unlock;
} else
if (val != (addr & ~alignment_mask))
goto unlock;