From owner-p4-projects@FreeBSD.ORG Sat Nov 8 05:33:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B5C1065691; Sat, 8 Nov 2008 05:33:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9D0A106568F for ; Sat, 8 Nov 2008 05:33:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C855E8FC0C for ; Sat, 8 Nov 2008 05:33:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA85X04j016971 for ; Sat, 8 Nov 2008 05:33:00 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA85X0iZ016969 for perforce@freebsd.org; Sat, 8 Nov 2008 05:33:00 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 8 Nov 2008 05:33:00 GMT Message-Id: <200811080533.mA85X0iZ016969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 152642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2008 05:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=152642 Change 152642 by nwhitehorn@nwhitehorn_trantor on 2008/11/08 05:32:43 Spent too much time with the emulator: fix PCI interrupt setup on real hardware. Affected files ... .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_imap.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#8 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#6 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/ofw/ofw_imap.c#2 (text+ko) ==== @@ -182,9 +182,16 @@ &pintrsz, sizeof(pintrsz)) == -1) pintrsz = 1; /* default */ pintrsz *= sizeof(pcell_t); - if (pintrsz != rintrsz) + if (pintrsz < rintrsz) panic("ofw_bus_search_intrmap: expected interrupt cell " - "size incorrect: %d != %d", rintrsz, pintrsz); + "size incorrect: %d > %d", rintrsz, pintrsz); + + /* + * XXX: Apple hardware used a second cell to set information + * on the interrupt trigger type. This information should + * be used. + */ + if (bcmp(ref, mptr, physsz + intrsz) == 0) { bcopy(mptr + physsz + intrsz + sizeof(parent), result, rintrsz); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#8 (text+ko) ==== @@ -615,6 +615,10 @@ sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) return (mintr); + /* Maybe it's a real interrupt, not an intpin */ + if (pin > 4) + return (pin); + device_printf(bus, "could not route pin %d for device %d.%d\n", pin, pci_get_slot(dev), pci_get_function(dev)); return (PCI_INVALID_IRQ); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#5 (text+ko) ==== @@ -349,6 +349,10 @@ sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) return (mintr); + /* Maybe it's a real interrupt, not an intpin */ + if (pin > 4) + return (pin); + device_printf(bus, "could not route pin %d for device %d.%d\n", pin, pci_get_slot(dev), pci_get_function(dev)); return (PCI_INVALID_IRQ); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#6 (text+ko) ==== @@ -374,6 +374,10 @@ sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) return (mintr); + /* Maybe it's a real interrupt, not an intpin */ + if (pin > 4) + return (pin); + device_printf(bus, "could not route pin %d for device %d.%d\n", pin, pci_get_slot(dev), pci_get_function(dev)); return (PCI_INVALID_IRQ);