Message ID | 1398379556-1132-2-git-send-email-julien.grall@linaro.org |
---|---|
State | Accepted |
Commit | 237f260efa3e69ca330e8218293fa2d79c5dabe1 |
Headers | show |
On Thu, 2014-04-24 at 23:45 +0100, Julien Grall wrote: > Commit 60f7376 "xen/arm: Inject an undefined instruction when the coproc/sysreg > is not handled" replaced panic by gdprintk. > > Unfortunately panic message string doesn't need newline, rather than gdprintk > will request one. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked + applied.
Hi Ian, On 05/02/2014 01:58 PM, Ian Campbell wrote: > > On Thu, 2014-04-24 at 23:45 +0100, Julien Grall wrote: >> Commit 60f7376 "xen/arm: Inject an undefined instruction when the coproc/sysreg >> is not handled" replaced panic by gdprintk. >> >> Unfortunately panic message string doesn't need newline, rather than gdprintk >> will request one. >> >> Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Acked + applied. Thanks. Is it possible to backport this patch for Xen 4.4? Regards,
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index d674a15..700665c 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1393,7 +1393,7 @@ static void do_cp15_32(struct cpu_user_regs *regs, "%s p15, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", cp32.read ? "mrc" : "mcr", cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); - gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x", + gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif inject_undef32_exception(regs); @@ -1430,7 +1430,7 @@ static void do_cp15_64(struct cpu_user_regs *regs, "%s p15, %d, r%d, r%d, cr%d @ 0x%"PRIregister"\n", cp64.read ? "mrrc" : "mcrr", cp64.op1, cp64.reg1, cp64.reg2, cp64.crm, regs->pc); - gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x", + gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif inject_undef32_exception(regs); @@ -1529,7 +1529,7 @@ static void do_sysreg(struct cpu_user_regs *regs, sysreg.op2, sysreg.read ? "=>" : "<=", sysreg.reg, regs->pc); - gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x", + gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x\n", hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef64_exception(regs, sysreg.len);
Commit 60f7376 "xen/arm: Inject an undefined instruction when the coproc/sysreg is not handled" replaced panic by gdprintk. Unfortunately panic message string doesn't need newline, rather than gdprintk will request one. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- xen/arch/arm/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)