From owner-svn-src-projects@freebsd.org Mon Aug 22 19:27:31 2016 Return-Path: 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 4F145BC295C for ; Mon, 22 Aug 2016 19:27:31 +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 1F6C11F7D; Mon, 22 Aug 2016 19:27:31 +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 u7MJRURe079189; Mon, 22 Aug 2016 19:27:30 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MJRUOi079188; Mon, 22 Aug 2016 19:27:30 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201608221927.u7MJRUOi079188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Mon, 22 Aug 2016 19:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304627 - projects/powernv/powerpc/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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2016 19:27:31 -0000 Author: nwhitehorn Date: Mon Aug 22 19:27:30 2016 New Revision: 304627 URL: https://svnweb.freebsd.org/changeset/base/304627 Log: Set up OPAL IRQs properly. Modified: projects/powernv/powerpc/powernv/opal_dev.c Modified: projects/powernv/powerpc/powernv/opal_dev.c ============================================================================== --- projects/powernv/powerpc/powernv/opal_dev.c Mon Aug 22 19:27:20 2016 (r304626) +++ projects/powernv/powerpc/powernv/opal_dev.c Mon Aug 22 19:27:30 2016 (r304627) @@ -94,6 +94,7 @@ DRIVER_MODULE(opaldev, ofwbus, opaldev_d static int opaldev_probe(device_t dev) { + phandle_t iparent; pcell_t *irqs; int i, n_irqs; @@ -106,13 +107,18 @@ opaldev_probe(device_t dev) /* Manually add IRQs before attaching */ if (OF_hasprop(ofw_bus_get_node(dev), "opal-interrupts")) { + iparent = OF_finddevice("/interrupt-controller@0"); + iparent = OF_xref_from_node(iparent); +printf("IPARENT: %#x\n", iparent); + n_irqs = OF_getproplen(ofw_bus_get_node(dev), "opal-interrupts") / sizeof(*irqs); irqs = malloc(n_irqs * sizeof(*irqs), M_DEVBUF, M_WAITOK); OF_getencprop(ofw_bus_get_node(dev), "opal-interrupts", irqs, n_irqs * sizeof(*irqs)); for (i = 0; i < n_irqs; i++) - bus_set_resource(dev, SYS_RES_IRQ, i, irqs[i], 1); + bus_set_resource(dev, SYS_RES_IRQ, i, + ofw_bus_map_intr(dev, iparent, 1, &irqs[i]), 1); free(irqs, M_DEVBUF); } @@ -240,6 +246,8 @@ opal_shutdown(void *arg, int howto) opal_call(OPAL_CEC_POWER_DOWN, 0 /* Normal power off */); else opal_call(OPAL_CEC_REBOOT); + + opal_call(OPAL_RETURN_CPU); } static void