From owner-svn-src-head@FreeBSD.ORG Mon Jan 5 18:15:17 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F6169E5; Mon, 5 Jan 2015 18:15:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7B87264EC2; Mon, 5 Jan 2015 18:15:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05IFH1f058794; Mon, 5 Jan 2015 18:15:17 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05IFHBT058793; Mon, 5 Jan 2015 18:15:17 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201501051815.t05IFHBT058793@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Mon, 5 Jan 2015 18:15:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276713 - head/sys/powerpc/pseries X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2015 18:15:17 -0000 Author: nwhitehorn Date: Mon Jan 5 18:15:16 2015 New Revision: 276713 URL: https://svnweb.freebsd.org/changeset/base/276713 Log: Revert r272109 locally, which is not quite equivalent in how it deals with missing interrupt-parent properties. A better solution will come later, but this restores pseries in QEMU for the time being. Modified: head/sys/powerpc/pseries/vdevice.c Modified: head/sys/powerpc/pseries/vdevice.c ============================================================================== --- head/sys/powerpc/pseries/vdevice.c Mon Jan 5 17:23:02 2015 (r276712) +++ head/sys/powerpc/pseries/vdevice.c Mon Jan 5 18:15:16 2015 (r276713) @@ -128,6 +128,8 @@ vdevice_attach(device_t dev) { phandle_t root, child; device_t cdev; + int icells, i, nintr, *intr; + phandle_t iparent; struct vdevice_devinfo *dinfo; root = ofw_bus_get_node(dev); @@ -142,7 +144,25 @@ vdevice_attach(device_t dev) } resource_list_init(&dinfo->mdi_resources); - ofw_bus_intr_to_rl(dev, child, &dinfo->mdi_resources); + if (OF_searchprop(child, "#interrupt-cells", &icells, + sizeof(icells)) <= 0) + icells = 2; + if (OF_getprop(child, "interrupt-parent", &iparent, + sizeof(iparent)) <= 0) + iparent = -1; + nintr = OF_getprop_alloc(child, "interrupts", sizeof(*intr), + (void **)&intr); + if (nintr > 0) { + for (i = 0; i < nintr; i += icells) { + u_int irq = intr[i]; + if (iparent != -1) + irq = ofw_bus_map_intr(dev, iparent, + icells, &intr[i]); + + resource_list_add(&dinfo->mdi_resources, + SYS_RES_IRQ, i, irq, irq, i); + } + } cdev = device_add_child(dev, NULL, -1); if (cdev == NULL) {