d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[qemu] Fix VERSATILEPB kernel boot in QEMU broken by r300968

Browse Source 
QEMU does not implement hardware debug registers so when
dbg_monitor_is_enabled is called kernel receives "invalid instruction"
exception. QEMU implements only DIDR register and on read returns all
zeroes to indicate that it doesn't support other registers. Real
hardware has Version bits set.

MFC after:	1 week
This commit is contained in:
Oleksandr Tymoshenko 2016-12-29 21:55:23 +00:00
parent d73b7a9cdd
commit 78b5418242
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arm/arm/debug_monitor.c
View File

@ -792,10 +792,21 @@ dbg_get_ossr(void)
static __inline boolean_t
dbg_arch_supported(void)
{
uint32_t dbg_didr;
switch (dbg_model) {
case ID_DFR0_CP_DEBUG_M_V6:
case ID_DFR0_CP_DEBUG_M_V6_1:
dbg_didr = cp14_dbgdidr_get();
/*
* read-all-zeroes is used by QEMU
* to indicate that ARMv6 debug support
* is not implemented. Real hardware has at
* least version bits set
*/
if (dbg_didr == 0)
return (FALSE);
return (TRUE);
case ID_DFR0_CP_DEBUG_M_V7:
case ID_DFR0_CP_DEBUG_M_V7_1: /* fall through */
return (TRUE);