From owner-svn-src-projects@FreeBSD.ORG Tue May 18 21:01:43 2010 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 24CF7106566B; Tue, 18 May 2010 21:01:43 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 132AF8FC0C; Tue, 18 May 2010 21:01:43 +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 o4IL1glL066642; Tue, 18 May 2010 21:01:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4IL1g0s066638; Tue, 18 May 2010 21:01:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201005182101.o4IL1g0s066638@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 May 2010 21:01:42 +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: r208277 - in projects/ppc64/sys/powerpc: ofw powermac powerpc 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: Tue, 18 May 2010 21:01:43 -0000 Author: nwhitehorn Date: Tue May 18 21:01:42 2010 New Revision: 208277 URL: http://svn.freebsd.org/changeset/base/208277 Log: Switch the default OpenPIC polarity from high to low, following OS X and Linux. It seems that at least in Apple's case, all interrupts but IRQ 0 ignore the level part of the interrupt sense and all should be low. This meant that IRQ 0 was being misprogrammed, causing loss of interrupts. Submitted by: Andreas Tobler Merge after: Review on MPC85XX Modified: projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c projects/ppc64/sys/powerpc/powermac/uninorth.c projects/ppc64/sys/powerpc/powerpc/openpic.c Modified: projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c Tue May 18 18:28:17 2010 (r208276) +++ projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c Tue May 18 21:01:42 2010 (r208277) @@ -216,11 +216,10 @@ ofw_pcibus_enum_devtree(device_t dev, u_ intr[0] = INTR_VEC(iparent, intr[0]); if (iparent != 0 && icells > 1) { - powerpc_config_intr( - INTR_VEC(iparent, intr[0]), + powerpc_config_intr(intr[0], (intr[1] & 1) ? INTR_TRIGGER_LEVEL : INTR_TRIGGER_EDGE, - INTR_POLARITY_HIGH); + INTR_POLARITY_LOW); } resource_list_add(&dinfo->opd_dinfo.resources, @@ -266,15 +265,27 @@ ofw_pcibus_enum_bus(device_t dev, u_int dinfo = (struct ofw_pcibus_devinfo *)pci_read_device( pcib, domain, busno, s, f, sizeof(*dinfo)); - if (dinfo != NULL) { - dinfo->opd_obdinfo.obd_node = -1; + if (dinfo == NULL) + continue; + + dinfo->opd_obdinfo.obd_node = -1; - dinfo->opd_obdinfo.obd_name = NULL; - dinfo->opd_obdinfo.obd_compat = NULL; - dinfo->opd_obdinfo.obd_type = NULL; - dinfo->opd_obdinfo.obd_model = NULL; - pci_add_child(dev, (struct pci_devinfo *)dinfo); + dinfo->opd_obdinfo.obd_name = NULL; + dinfo->opd_obdinfo.obd_compat = NULL; + dinfo->opd_obdinfo.obd_type = NULL; + dinfo->opd_obdinfo.obd_model = NULL; + + /* + * For non OFW-devices, don't believe 0 + * for an interrupt. + */ + if (dinfo->opd_dinfo.cfg.intline == 0) { + dinfo->opd_dinfo.cfg.intline = PCI_INVALID_IRQ; + PCIB_WRITE_CONFIG(pcib, busno, s, f, + PCIR_INTLINE, PCI_INVALID_IRQ, 1); } + + pci_add_child(dev, (struct pci_devinfo *)dinfo); } } } @@ -312,7 +323,7 @@ ofw_pcibus_assign_interrupt(device_t dev * spec will need to be studied. */ - return (0); + return (PCI_INVALID_IRQ); #ifdef NOTYET intr = pci_get_intpin(child); Modified: projects/ppc64/sys/powerpc/powermac/uninorth.c ============================================================================== --- projects/ppc64/sys/powerpc/powermac/uninorth.c Tue May 18 18:28:17 2010 (r208276) +++ projects/ppc64/sys/powerpc/powermac/uninorth.c Tue May 18 21:01:42 2010 (r208277) @@ -180,7 +180,7 @@ unin_chip_add_intr(phandle_t devnode, st if (icells > 1) { powerpc_config_intr(INTR_VEC(iparent, intr[i]), (intr[i+1] & 1) ? INTR_TRIGGER_LEVEL : - INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH); + INTR_TRIGGER_EDGE, INTR_POLARITY_LOW); } dinfo->udi_interrupts[dinfo->udi_ninterrupts] = Modified: projects/ppc64/sys/powerpc/powerpc/openpic.c ============================================================================== --- projects/ppc64/sys/powerpc/powerpc/openpic.c Tue May 18 18:28:17 2010 (r208276) +++ projects/ppc64/sys/powerpc/powerpc/openpic.c Tue May 18 21:01:42 2010 (r208277) @@ -165,7 +165,7 @@ openpic_attach(device_t dev) for (irq = 0; irq < sc->sc_nirq; irq++) { x = irq; /* irq == vector. */ x |= OPENPIC_IMASK; - x |= OPENPIC_POLARITY_POSITIVE; + x |= OPENPIC_POLARITY_NEGATIVE; x |= OPENPIC_SENSE_LEVEL; x |= 8 << OPENPIC_PRIORITY_SHIFT; openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x);