From owner-svn-src-projects@freebsd.org  Fri Jul  8 04:34:15 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 22B27B844B4
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  8 Jul 2016 04:34:15 +0000 (UTC)
 (envelope-from nwhitehorn@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 D82D81712;
 Fri,  8 Jul 2016 04:34:14 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u684YECj097104;
 Fri, 8 Jul 2016 04:34:14 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u684YEph097103;
 Fri, 8 Jul 2016 04:34:14 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201607080434.u684YEph097103@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 8 Jul 2016 04:34:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r302424 - in projects/powernv/powerpc: ofw powernv
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jul 2016 04:34:15 -0000

Author: nwhitehorn
Date: Fri Jul  8 04:34:13 2016
New Revision: 302424
URL: https://svnweb.freebsd.org/changeset/base/302424

Log:
  Bring up PCI enumeration. This was failing due to some stale files in
  powerpc/ofw.

Deleted:
  projects/powernv/powerpc/ofw/ofw_pci.c
  projects/powernv/powerpc/ofw/ofw_pci.h
Modified:
  projects/powernv/powerpc/powernv/opal_pci.c

Modified: projects/powernv/powerpc/powernv/opal_pci.c
==============================================================================
--- projects/powernv/powerpc/powernv/opal_pci.c	Fri Jul  8 03:39:10 2016	(r302423)
+++ projects/powernv/powerpc/powernv/opal_pci.c	Fri Jul  8 04:34:13 2016	(r302424)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <powerpc/ofw/ofw_pci.h>
+#include <dev/ofw/ofwpci.h>
 
 #include "pcib_if.h"
 #include "iommu_if.h"
@@ -143,6 +143,17 @@ opalpci_attach(device_t dev)
 		return (ENXIO);
 	}
 
+	if (bootverbose)
+		device_printf(dev, "OPAL ID %#lx\n", sc->phb_id);
+
+#if 0
+	/* Reset PCI host controller */
+	opal_call(OPAL_PCI_RESET, sc->phb_id, 1, 1);
+	DELAY(1000);
+	opal_call(OPAL_PCI_RESET, sc->phb_id, 1, 0);
+	DELAY(1000);
+#endif
+
 	/*
 	 * Map all devices on the bus to partitionable endpoint zero until
 	 * such time as we start wanting to do things like bhyve.