Module Name: src
Committed By: tsutsui
Date: Fri May 3 01:08:28 UTC 2019
Modified Files:
src/sys/arch/atari/atari: autoconf.c locore.s
Log Message:
Make sure interrupts are disabled during cpu_configure(9).
Fixes 'panic: kernel diagnostic assertion "cv_is_valid(cv)" failed'
during fdcisa(4) probe on Milan's DIAGNOSTIC kernel, caused by
a stray interrupt from the FDC right after isa_intr_establish().
No visible bad side effect on TT030 with this change.
Should be pulled up to netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/atari/atari/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.65 src/sys/arch/atari/atari/autoconf.c:1.66
--- src/sys/arch/atari/atari/autoconf.c:1.65 Mon Mar 24 18:39:57 2014
+++ src/sys/arch/atari/atari/autoconf.c Fri May 3 01:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.65 2014/03/24 18:39:57 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.65 2014/03/24 18:39:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $");
#include "opt_md.h"
@@ -73,10 +73,14 @@ cpu_configure(void)
atari_realconfig = 1;
+ (void)splhigh();
+
init_sicallback();
if (config_rootfound("mainbus", __UNCONST("mainbus")) == NULL)
panic("no mainbus found");
+
+ (void)spl0();
}
void
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.113 src/sys/arch/atari/atari/locore.s:1.114
--- src/sys/arch/atari/atari/locore.s:1.113 Tue Mar 19 20:30:05 2019
+++ src/sys/arch/atari/atari/locore.s Fri May 3 01:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.113 2019/03/19 20:30:05 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.114 2019/05/03 01:08:28 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1000,8 +1000,6 @@ Lcacheon:
/*
* Final setup for C code
*/
- movw #PSL_LOWIPL,%sr | lower SPL
-
#ifdef notdef
movl %d6,_C_LABEL(bootdev) | and boot device
#endif
