Date: Wed, 30 Nov 2016 14:18:52 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309328 - head/sys/dev/pci Message-ID: <201611301418.uAUEIqDk066971@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Wed Nov 30 14:18:52 2016 New Revision: 309328 URL: https://svnweb.freebsd.org/changeset/base/309328 Log: Fix the PCI host generic FDT driver to call into the common code and not recurse into itself. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/pci/pci_host_generic_fdt.c Modified: head/sys/dev/pci/pci_host_generic_fdt.c ============================================================================== --- head/sys/dev/pci/pci_host_generic_fdt.c Wed Nov 30 14:17:06 2016 (r309327) +++ head/sys/dev/pci/pci_host_generic_fdt.c Wed Nov 30 14:18:52 2016 (r309328) @@ -152,7 +152,7 @@ pci_host_generic_attach(device_t dev) device_printf(dev, "Bus is%s cache-coherent\n", sc->base.coherent ? "" : " not"); - error = pci_host_generic_attach(dev); + error = pci_host_generic_core_attach(dev); if (error != 0) return (error); @@ -327,15 +327,15 @@ pci_host_generic_alloc_resource(device_t #if defined(NEW_PCIB) && defined(PCI_RES_BUS) if (type == PCI_RES_BUS) { - return (pci_host_generic_alloc_resource(dev, child, type, rid, + return (pci_host_generic_core_alloc_resource(dev, child, type, rid, start, end, count, flags)); } #endif /* For PCIe devices that do not have FDT nodes, use PCIB method */ if ((int)ofw_bus_get_node(child) <= 0) - return (pci_host_generic_alloc_resource(dev, child, type, rid, - start, end, count, flags)); + return (pci_host_generic_core_alloc_resource(dev, child, type, + rid, start, end, count, flags)); /* For other devices use OFW method */ sc = device_get_softc(dev); @@ -377,8 +377,8 @@ pci_host_generic_alloc_resource(device_t } } - return (bus_generic_alloc_resource(dev, child, type, rid, start, end, - count, flags)); + return (bus_generic_alloc_resource(dev, child, type, rid, start, + end, count, flags)); } static int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611301418.uAUEIqDk066971>