[src/trunk]: src/sys/arch/xen/xen Back out previous KASSERTMSG for now.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0b9f72bf97dd
branches:  trunk
changeset: 357452:0b9f72bf97dd
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Nov 11 17:02:53 2017 +0000

description:
Back out previous KASSERTMSG for now.

The immediate problem appears to have been elsewhere, in the wrong
interrupt level passed by the Xen-specific intr_establish to
event_set_handler.

We should maybe restore these assertions later, but at least one was
violated before cherry's interrupt rototill anyway.

diffstat:

 sys/arch/xen/xen/evtchn.c |  16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (44 lines):

diff -r 48b9e9ed9e77 -r 0b9f72bf97dd sys/arch/xen/xen/evtchn.c
--- a/sys/arch/xen/xen/evtchn.c Sat Nov 11 16:49:13 2017 +0000
+++ b/sys/arch/xen/xen/evtchn.c Sat Nov 11 17:02:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: evtchn.c,v 1.77 2017/11/11 08:23:50 riastradh Exp $    */
+/*     $NetBSD: evtchn.c,v 1.78 2017/11/11 17:02:53 riastradh Exp $    */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.77 2017/11/11 08:23:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.78 2017/11/11 17:02:53 riastradh Exp $");
 
 #include "opt_xen.h"
 #include "isa.h"
@@ -386,11 +386,6 @@
                ci->ci_ilevel = ih->ih_level;
                ih_fun = (void *)ih->ih_fun;
                ih_fun(ih->ih_arg, regs);
-               KASSERTMSG(ci->ci_ilevel == ih->ih_level,
-                   "event handler %p for evtsource[%d] (%s) changed ipl:"
-                   " %d != %d",
-                   ih->ih_realfun, evtch, evtsource[evtch]->ev_evname,
-                   ci->ci_ilevel, ih->ih_level);
                ih = ih->ih_evt_next;
        }
        mutex_spin_exit(&evtlock[evtch]);
@@ -415,13 +410,6 @@
                                        sti();
                                        ih_fun = (void *)ih->ih_fun;
                                        ih_fun(ih->ih_arg, regs);
-                                       KASSERTMSG(ci->ci_ilevel == i,
-                                           "interrupt handler %p"
-                                           " for interrupt source %s"
-                                           " changed ipl: %d != %d",
-                                           ih->ih_realfun,
-                                           ci->ci_isources[i]->is_xname,
-                                           ci->ci_ilevel, i);
                                        cli();
                                }
                                hypervisor_enable_ipl(i);