Date: Mon, 9 Nov 2009 16:42:08 +0000 (UTC) From: Randall Stewart <rrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r199089 - projects/mips/sys/mips/rmi Message-ID: <200911091642.nA9Gg8Ph027199@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rrs Date: Mon Nov 9 16:42:08 2009 New Revision: 199089 URL: http://svn.freebsd.org/changeset/base/199089 Log: - Comment out recrusive call to setup interrupt. - Change the way we pass the irq. Modified: projects/mips/sys/mips/rmi/iodi.c Modified: projects/mips/sys/mips/rmi/iodi.c ============================================================================== --- projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:32:48 2009 (r199088) +++ projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:42:08 2009 (r199089) @@ -124,9 +124,9 @@ iodi_setup_intr(device_t dev, device_t c } else if (strcmp(device_get_name(child), "rge") == 0) { int irq; - - irq = rman_get_rid(ires); - if (rmi_spin_mutex_safe) + /* This is a hack to pass in the irq */ + irq = (int)ires->__r_i; + if (rmi_spin_mutex_safe) mtx_lock_spin(&xlr_pic_lock); reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE); xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31)); @@ -143,9 +143,10 @@ iodi_setup_intr(device_t dev, device_t c mtx_unlock_spin(&xlr_pic_lock); cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep); } + /* This causes a panic and looks recursive to me (RRS). BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); - + */ return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911091642.nA9Gg8Ph027199>