From owner-svn-src-all@freebsd.org Tue Nov 14 03:53:16 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42626CFE25C; Tue, 14 Nov 2017 03:53:16 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 190D76CC90; Tue, 14 Nov 2017 03:53:16 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAE3rFpw012726; Tue, 14 Nov 2017 03:53:15 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAE3rF8g012725; Tue, 14 Nov 2017 03:53:15 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201711140353.vAE3rF8g012725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 14 Nov 2017 03:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325791 - head/sys/powerpc/mpc85xx X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/mpc85xx X-SVN-Commit-Revision: 325791 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 03:53:16 -0000 Author: jhibbits Date: Tue Nov 14 03:53:15 2017 New Revision: 325791 URL: https://svnweb.freebsd.org/changeset/base/325791 Log: Expand the Freescale PCIe root complex driver with the ofw_pcib_pci The interrupt map wasn't being allocated properly, preventing IRQs from being allocated to children of the PCIe bus. Fix this by cloning the ofw_pcib_pci code, which handles all cases -- device tree and probed. In the future this may become a subclass of the ofw_pcib_pci driver, but as that's not an exported class, it's cloned for now. MFC after: 3 weeks Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c ============================================================================== --- head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c Tue Nov 14 03:23:46 2017 (r325790) +++ head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c Tue Nov 14 03:53:15 2017 (r325791) @@ -50,12 +50,30 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include +#include + #include #include #include +#include + #include "pcib_if.h" +struct fsl_pcib_softc { + /* + * This is here so that we can use pci bridge methods, too - the + * generic routines only need the dev, secbus and subbus members + * filled. + */ + struct pcib_softc ops_pcib_sc; + phandle_t ops_node; + struct ofw_bus_iinfo ops_iinfo; +}; + static int fsl_pcib_rc_probe(device_t dev) { @@ -72,13 +90,89 @@ fsl_pcib_rc_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +static int +fsl_pcib_rc_attach(device_t dev) +{ + struct fsl_pcib_softc *sc; + + sc = device_get_softc(dev); + sc->ops_pcib_sc.dev = dev; + sc->ops_node = ofw_bus_get_node(dev); + + ofw_bus_setup_iinfo(sc->ops_node, &sc->ops_iinfo, + sizeof(cell_t)); + + pcib_attach_common(dev); + return (pcib_attach_child(dev)); +} + +static phandle_t +fsl_pcib_rc_get_node(device_t bridge, device_t dev) +{ + /* We have only one child, the PCI bus, so pass it our node */ + + return (ofw_bus_get_node(bridge)); +} + +static int +fsl_pcib_rc_route_interrupt(device_t bridge, device_t dev, int intpin) +{ + struct fsl_pcib_softc *sc; + struct ofw_bus_iinfo *ii; + struct ofw_pci_register reg; + cell_t pintr, mintr[2]; + int intrcells; + phandle_t iparent; + + sc = device_get_softc(bridge); + ii = &sc->ops_iinfo; + if (ii->opi_imapsz > 0) { + pintr = intpin; + + /* Fabricate imap information if this isn't an OFW device */ + bzero(®, sizeof(reg)); + reg.phys_hi = (pci_get_bus(dev) << OFW_PCI_PHYS_HI_BUSSHIFT) | + (pci_get_slot(dev) << OFW_PCI_PHYS_HI_DEVICESHIFT) | + (pci_get_function(dev) << OFW_PCI_PHYS_HI_FUNCTIONSHIFT); + + intrcells = ofw_bus_lookup_imap(ofw_bus_get_node(dev), ii, ®, + sizeof(reg), &pintr, sizeof(pintr), mintr, sizeof(mintr), + &iparent); + if (intrcells) { + /* + * If we've found a mapping, return it and don't map + * it again on higher levels - that causes problems + * in some cases, and never seems to be required. + */ + mintr[0] = ofw_bus_map_intr(dev, iparent, intrcells, + mintr); + return (mintr[0]); + } + } else if (intpin >= 1 && intpin <= 4) { + /* + * When an interrupt map is missing, we need to do the + * standard PCI swizzle and continue mapping at the parent. + */ + return (pcib_route_interrupt(bridge, dev, intpin)); + } + return (PCIB_ROUTE_INTERRUPT(device_get_parent(device_get_parent( + bridge)), bridge, intpin)); +} + static device_method_t fsl_pcib_rc_methods[] = { DEVMETHOD(device_probe, fsl_pcib_rc_probe), + DEVMETHOD(device_attach, fsl_pcib_rc_attach), + + /* pcib interface */ + DEVMETHOD(pcib_route_interrupt, fsl_pcib_rc_route_interrupt), + DEVMETHOD(pcib_request_feature, pcib_request_feature_allow), + + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, fsl_pcib_rc_get_node), DEVMETHOD_END }; static devclass_t fsl_pcib_rc_devclass; DEFINE_CLASS_1(pcib, fsl_pcib_rc_driver, fsl_pcib_rc_methods, - sizeof(struct pcib_softc), pcib_driver); + sizeof(struct fsl_pcib_softc), pcib_driver); DRIVER_MODULE(rcpcib, pci, fsl_pcib_rc_driver, fsl_pcib_rc_devclass, 0, 0); -