Date: Tue, 27 Feb 2007 14:32:26 +0100 (CET) From: Goran Gajic <ggajic@afrodita.rcub.bg.ac.yu> To: freebsd-current@mx1.freebsd.org Subject: Re: em0+msi related panic Message-ID: <Pine.LNX.4.64.0702271425110.20218@afrodita.rcub.bg.ac.yu> In-Reply-To: <Pine.LNX.4.64.0702271128420.2901@afrodita.rcub.bg.ac.yu> References: <Pine.LNX.4.64.0702271128420.2901@afrodita.rcub.bg.ac.yu>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
Looking through source and diff of sys/dev/em/if_em.c I have noticed that
@@ -275,7 +275,7 @@ static void em_add_int_delay_sysctl(stru
static poll_handler_t em_poll;
static void em_intr(void *);
#else
-static void em_intr_fast(void *);
+static int em_intr_fast(void *);
static void em_add_int_process_limit(struct adapter *, const char *,
const char *, int *, int);
static void em_handle_rxtx(void *context, int pending);
@@ -1307,7 +1307,7 @@ em_handle_rxtx(void *context, int pendin
* Fast Interrupt Service routine
*
*********************************************************************/
-static void
+static int
em_intr_fast(void *arg)
{
struct adapter *adapter = arg;
@@ -2173,8 +2174,8 @@ em_allocate_intr(struct adapter *adapter
#ifdef DEVICE_POLLING
if (adapter->int_handler_tag == NULL && (error =
bus_setup_intr(dev,
- adapter->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, em_intr, adapter,
- &adapter->int_handler_tag)) != 0) {
+ adapter->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, NULL, em_intr,
+ adapter, &adapter->int_handler_tag)) != 0) {
device_printf(dev, "Failed to register interrupt
handler");
return (error);
}
between revision 1.168 and 1.169 that causes panic. I have switched
em_intr_fast to be static void and order in bus_setup_intr is incorrect.
It should be:
if ((error = bus_setup_intr(dev, adapter->res_interrupt,
INTR_TYPE_NET,NULL, em_intr_fast, adapter,
&adapter->int_handler_tag)) != 0) {
not
if ((error = bus_setup_intr(dev, adapter->res_interrupt,
INTR_TYPE_NET, em_intr_fast,NULL adapter,
&adapter->int_handler_tag)) != 0) {
which causes panic when:
/boot/loader
contains:
hw.pci.enable_msi=0
hw.pci.enable_msix=0
Btw. I'm using this since msi=1 cases watchdog timeouts with em0.
Regards,
gg.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.64.0702271425110.20218>