From owner-svn-src-projects@freebsd.org Mon Aug 22 19:47:30 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 D8010BC2E95 for ; Mon, 22 Aug 2016 19:47:30 +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 8D63E1E87; Mon, 22 Aug 2016 19:47:30 +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 u7MJlTYu086827; Mon, 22 Aug 2016 19:47:29 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MJlT9v086826; Mon, 22 Aug 2016 19:47:29 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201608221947.u7MJlT9v086826@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:47:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304631 - 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:47:30 -0000 Author: nwhitehorn Date: Mon Aug 22 19:47:29 2016 New Revision: 304631 URL: https://svnweb.freebsd.org/changeset/base/304631 Log: Add support for 32-bit only MSI. Modified: projects/powernv/powerpc/powernv/opal_pci.c Modified: projects/powernv/powerpc/powernv/opal_pci.c ============================================================================== --- projects/powernv/powerpc/powernv/opal_pci.c Mon Aug 22 19:35:12 2016 (r304630) +++ projects/powernv/powerpc/powernv/opal_pci.c Mon Aug 22 19:47:29 2016 (r304631) @@ -32,6 +32,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include +#include #include #include @@ -44,13 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include - -#include -#include -#include #include #include @@ -520,6 +517,7 @@ opalpci_map_msi(device_t dev, device_t c uint32_t *data) { struct opalpci_softc *sc; + struct pci_devinfo *dinfo; int err, xive; sc = device_get_softc(dev); @@ -528,9 +526,20 @@ opalpci_map_msi(device_t dev, device_t c xive = irq - sc->base_msi_irq - sc->msi_base; opal_call(OPAL_PCI_SET_XIVE_PE, sc->phb_id, OPAL_PCI_DEFAULT_PE, xive); - err = opal_call(OPAL_GET_MSI_64, sc->phb_id, OPAL_PCI_DEFAULT_PE, xive, - 1, vtophys(addr), vtophys(data)); - *addr = be64toh(*addr); + + dinfo = device_get_ivars(child); + if (dinfo->cfg.msi.msi_alloc > 0 && + (dinfo->cfg.msi.msi_ctrl & PCIM_MSICTRL_64BIT) == 0) { + uint32_t msi32; + err = opal_call(OPAL_GET_MSI_32, sc->phb_id, + OPAL_PCI_DEFAULT_PE, xive, 1, vtophys(&msi32), + vtophys(data)); + *addr = be32toh(msi32); + } else { + err = opal_call(OPAL_GET_MSI_64, sc->phb_id, + OPAL_PCI_DEFAULT_PE, xive, 1, vtophys(addr), vtophys(data)); + *addr = be64toh(*addr); + } *data = be32toh(*data); if (bootverbose && err != 0)