From owner-cvs-all@FreeBSD.ORG Sat Jun 7 08:06:54 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7218D37B401 for ; Sat, 7 Jun 2003 08:06:54 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41E4743FE9 for ; Sat, 7 Jun 2003 08:06:52 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 22239 invoked from network); 7 Jun 2003 15:06:50 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 7 Jun 2003 15:06:50 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h57F6np0019585; Sat, 7 Jun 2003 11:06:49 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Sat, 07 Jun 2003 11:06:50 -0400 (EDT) From: John Baldwin To: John Baldwin cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: RE: cvs commit: src/sys/dev/pci pci.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2003 15:06:54 -0000 On 07-Jun-2003 John Baldwin wrote: > > On 07-Jun-2003 John Baldwin wrote: >> jhb 2003/06/07 08:00:19 PDT >> >> FreeBSD src repository >> >> Modified files: >> sys/dev/pci pci.c >> Log: >> - Adjust the comment about re-routing PCI interrupts to be less >> ia64-specific. >> - When trying to re-route interrupts, don't change cfg->intline if the >> re-route fails by returning an invalid vector. This fixes machines >> without any way of routing interrupts such as older PC's without a >> $PIR table. >> >> We do not currently write the new intline value back to the hardware, but >> we should. That will likely be added in a later commit. > > I committed this now to fix machines w/o $PIR tables. I will try to work > on a patch to write the new interrupt back to the hardware. Looks like this: Index: pci.c =================================================================== RCS file: /home/ncvs/src/sys/dev/pci/pci.c,v retrieving revision 1.217 diff -u -r1.217 pci.c --- pci.c 7 Jun 2003 15:00:19 -0000 1.217 +++ pci.c 7 Jun 2003 15:06:25 -0000 @@ -806,9 +806,10 @@ * have. */ irq = PCIB_ROUTE_INTERRUPT(pcib, dev, cfg->intpin); - if (PCI_INTERRUPT_VALID(irq)) + if (PCI_INTERRUPT_VALID(irq)) { + pci_write_config(dev, PCIR_INTLINE, irq, 1); cfg->intline = irq; - else + } else #endif irq = cfg->intline; resource_list_add(rl, SYS_RES_IRQ, 0, irq, irq, 1); -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/