|
@@ -136,10 +136,11 @@ static u8 get_debug_arch(void)
|
|
|
u32 didr;
|
|
|
|
|
|
/* Do we implement the extended CPUID interface? */
|
|
|
- if (WARN_ONCE((((read_cpuid_id() >> 16) & 0xf) != 0xf),
|
|
|
- "CPUID feature registers not supported. "
|
|
|
- "Assuming v6 debug is present.\n"))
|
|
|
+ if (((read_cpuid_id() >> 16) & 0xf) != 0xf) {
|
|
|
+ pr_warning("CPUID feature registers not supported. "
|
|
|
+ "Assuming v6 debug is present.\n");
|
|
|
return ARM_DEBUG_ARCH_V6;
|
|
|
+ }
|
|
|
|
|
|
ARM_DBG_READ(c0, 0, didr);
|
|
|
return (didr >> 16) & 0xf;
|
|
@@ -231,7 +232,7 @@ static int enable_monitor_mode(void)
|
|
|
|
|
|
/* Ensure that halting mode is disabled. */
|
|
|
if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN,
|
|
|
- "halting debug mode enabled. Unable to access hardware resources.\n")) {
|
|
|
+ "halting debug mode enabled. Unable to access hardware resources.\n")) {
|
|
|
ret = -EPERM;
|
|
|
goto out;
|
|
|
}
|
|
@@ -626,10 +627,9 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
|
|
|
* we can use the mismatch feature as a poor-man's hardware
|
|
|
* single-step, but this only works for per-task breakpoints.
|
|
|
*/
|
|
|
- if (WARN_ONCE(!bp->overflow_handler &&
|
|
|
- (arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps()
|
|
|
- || !bp->hw.bp_target),
|
|
|
- "overflow handler required but none found\n")) {
|
|
|
+ if (!bp->overflow_handler && (arch_check_bp_in_kernelspace(bp) ||
|
|
|
+ !core_has_mismatch_brps() || !bp->hw.bp_target)) {
|
|
|
+ pr_warning("overflow handler required but none found\n");
|
|
|
ret = -EINVAL;
|
|
|
}
|
|
|
out:
|