From owner-freebsd-current@FreeBSD.ORG Wed Jul 23 23:20:41 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EC2A37B401 for ; Wed, 23 Jul 2003 23:20:41 -0700 (PDT) Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3D6343FB1 for ; Wed, 23 Jul 2003 23:20:38 -0700 (PDT) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: from zibbi.icomtek.csir.co.za (localhost [IPv6:::1]) h6O6KZ5v054755 for ; Thu, 24 Jul 2003 08:20:35 +0200 (SAST) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: (from jhay@localhost) by zibbi.icomtek.csir.co.za (8.12.9/8.12.9/Submit) id h6O6KYRg054754 for current@FreeBSD.org; Thu, 24 Jul 2003 08:20:34 +0200 (SAST) (envelope-from jhay) Date: Thu, 24 Jul 2003 08:20:34 +0200 From: John Hay To: current@FreeBSD.org Message-ID: <20030724062034.GA54536@zibbi.icomtek.csir.co.za> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i Subject: pnp code and irq 2 problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2003 06:20:41 -0000 Hi, Somewhere along the line the code in FreeBSD that maps irq 2 to irq 9 has gone away and a panic was added if one tries to use irq 2. This is all well and fine, except that the pnp code was not notified of this. :-) So if you have a pnp device that have irq 2 in its mask and FreeBSD then decides that irq 2 is a good irq to use for this device, you have an instant panic. I have worked around it with this crude patch below. Crude because: 1) I don't know if it should be an i386 only fix, and 2) I used 0x04 directly, maybe IRQ_SLAVE from i386/isa/icu.h or some other difine should be used? John -- John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org Index: isa/pnpparse.c =================================================================== RCS file: /home/ncvs/src/sys/isa/pnpparse.c,v retrieving revision 1.13 diff -u -r1.13 pnpparse.c --- isa/pnpparse.c 16 Oct 2002 09:07:30 -0000 1.13 +++ isa/pnpparse.c 19 Jun 2003 06:00:02 -0000 @@ -110,7 +110,8 @@ if (bootverbose) pnp_printf(id, "adding irq mask %#02x\n", I16(res)); - config->ic_irqmask[config->ic_nirq] = I16(res); + config->ic_irqmask[config->ic_nirq] = I16(res) & + ~0x04; config->ic_nirq++; break;