Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). 

Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach().

Previously hil_intr(9) returned immediately during 'cold', but
all interrupts are enabled at the end of configure() (actually
in MD cpu_configure()) and cold is cleared in confiugre2()
after configure(), so there is a small window when hil interrupts
can be triggered during cold.

It looks there is no problem to process hil_intr() before
hil_attach_deferre() is called via configure2() because
we already check 'sc->sc_status != HIL_STATUS_BUSY' on
processing a kthread.

Note this seems also to appease the similar panic on mame's hp9k370
emulation (though mame's emulation around DMAC looks still incomplete).

Should be pulled up to netbsd-10 and netbsd-9.
This commit is contained in:
tsutsui 2024-05-06 13:27:49 +00:00
parent e21ed88e62
commit adfd220df8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/hil/hil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hil.c,v 1.7 2022/06/25 02:36:27 tsutsui Exp $ */
/* $NetBSD: hil.c,v 1.8 2024/05/06 13:27:49 tsutsui Exp $ */
/* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
@ -153,6 +153,7 @@ hil_attach(struct hil_softc *sc, int *hil_is_console)
sc->sc_cmdbp = sc->sc_cmdbuf;
sc->sc_pollbp = sc->sc_pollbuf;
sc->sc_console = hil_is_console;
sc->sc_status = HIL_STATUS_BUSY;
}
/*
@ -272,9 +273,6 @@ hil_intr(void *v)
struct hil_softc *sc = v;
uint8_t c, stat;
if (cold)
return 0;
stat = bus_space_read_1(sc->sc_bst, sc->sc_bsh, HILP_STAT);
/*