From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 16:42:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFBE91065698; Mon, 9 Nov 2009 16:42:08 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DF4D98FC1E; Mon, 9 Nov 2009 16:42:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9Gg8La027201; Mon, 9 Nov 2009 16:42:08 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9Gg8Ph027199; Mon, 9 Nov 2009 16:42:08 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200911091642.nA9Gg8Ph027199@svn.freebsd.org> From: Randall Stewart Date: Mon, 9 Nov 2009 16:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199089 - projects/mips/sys/mips/rmi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 16:42:09 -0000 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); }