From owner-svn-src-all@freebsd.org Wed Nov 30 14:18:53 2016 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 CCE64C5D2B3; Wed, 30 Nov 2016 14:18:53 +0000 (UTC) (envelope-from andrew@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 9C9CF1A18; Wed, 30 Nov 2016 14:18:53 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAUEIqf8066972; Wed, 30 Nov 2016 14:18:52 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAUEIqDk066971; Wed, 30 Nov 2016 14:18:52 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201611301418.uAUEIqDk066971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 30 Nov 2016 14:18:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309328 - head/sys/dev/pci X-SVN-Group: head 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.23 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: Wed, 30 Nov 2016 14:18:53 -0000 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