From owner-svn-src-projects@freebsd.org  Sun Nov 15 03:18:51 2015
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 731EFA2E4C2
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 15 Nov 2015 03:18:51 +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 3D7F21270;
 Sun, 15 Nov 2015 03:18:51 +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 tAF3Io7o066894;
 Sun, 15 Nov 2015 03:18:50 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAF3IoxS066893;
 Sun, 15 Nov 2015 03:18:50 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201511150318.tAF3IoxS066893@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: Sun, 15 Nov 2015 03:18:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r290841 - projects/powernv/powerpc/pseries
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.20
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: Sun, 15 Nov 2015 03:18:51 -0000

Author: nwhitehorn
Date: Sun Nov 15 03:18:50 2015
New Revision: 290841
URL: https://svnweb.freebsd.org/changeset/base/290841

Log:
  The compatible checks are sufficient here: no need to test the complicated
  "name" property that might have a unit address on the end with an FDT. This
  fixes interrupt routing and lets me boot multiuser on the powernv simulator
  when running as an OPAL payload.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  projects/powernv/powerpc/pseries/xics.c

Modified: projects/powernv/powerpc/pseries/xics.c
==============================================================================
--- projects/powernv/powerpc/pseries/xics.c	Sun Nov 15 03:04:39 2015	(r290840)
+++ projects/powernv/powerpc/pseries/xics.c	Sun Nov 15 03:18:50 2015	(r290841)
@@ -152,9 +152,6 @@ xicp_mem_for_cpu(int cpu)
 static int
 xicp_probe(device_t dev)
 {
-	if (ofw_bus_get_name(dev) == NULL || strcmp(ofw_bus_get_name(dev),
-	    "interrupt-controller") != 0)
-		return (ENXIO);
 
 	if (!ofw_bus_is_compatible(dev, "ibm,ppc-xicp"))
 		return (ENXIO);
@@ -166,9 +163,6 @@ xicp_probe(device_t dev)
 static int
 xics_probe(device_t dev)
 {
-	if (ofw_bus_get_name(dev) == NULL || strcmp(ofw_bus_get_name(dev),
-	    "interrupt-controller") != 0)
-		return (ENXIO);
 
 	if (!ofw_bus_is_compatible(dev, "ibm,ppc-xics"))
 		return (ENXIO);