From owner-svn-src-projects@freebsd.org Sun Nov 15 01:50:19 2015 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 8743AA283E5 for ; Sun, 15 Nov 2015 01:50:19 +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 2E809110C; Sun, 15 Nov 2015 01:50:19 +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 tAF1oITr033905; Sun, 15 Nov 2015 01:50:18 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAF1oIRv033903; Sun, 15 Nov 2015 01:50:18 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201511150150.tAF1oIRv033903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sun, 15 Nov 2015 01:50:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290839 - 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.20 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: Sun, 15 Nov 2015 01:50:19 -0000 Author: nwhitehorn Date: Sun Nov 15 01:50:17 2015 New Revision: 290839 URL: https://svnweb.freebsd.org/changeset/base/290839 Log: Deal with the IOMMU with a hammer: turn it off. Full booting now blocked by the fact that non-IPI IRQs don't work for some reason. Modified: projects/powernv/powerpc/powernv/opal.h projects/powernv/powerpc/powernv/opal_pci.c Modified: projects/powernv/powerpc/powernv/opal.h ============================================================================== --- projects/powernv/powerpc/powernv/opal.h Sat Nov 14 23:43:59 2015 (r290838) +++ projects/powernv/powerpc/powernv/opal.h Sun Nov 15 01:50:17 2015 (r290839) @@ -50,9 +50,16 @@ int opal_call(uint64_t token, ...); #define OPAL_PCI_CONFIG_WRITE_WORD 18 #define OPAL_SET_XIVE 19 #define OPAL_GET_XIVE 20 +#define OPAL_PCI_SET_PE 31 #define OPAL_START_CPU 41 +#define OPAL_PCI_MAP_PE_DMA_WINDOW_REAL 45 + +/* For OPAL_PCI_SET_PE */ +#define OPAL_UNMAP_PE 0 +#define OPAL_MAP_PE 1 #define OPAL_SUCCESS 0 +#define OPAL_PARAMETER -1 #define OPAL_BUSY_EVENT -12 #endif Modified: projects/powernv/powerpc/powernv/opal_pci.c ============================================================================== --- projects/powernv/powerpc/powernv/opal_pci.c Sat Nov 14 23:43:59 2015 (r290838) +++ projects/powernv/powerpc/powernv/opal_pci.c Sun Nov 15 01:50:17 2015 (r290839) @@ -124,6 +124,7 @@ opalpci_attach(device_t dev) { struct opalpci_softc *sc; cell_t id[2]; + int err; sc = device_get_softc(dev); @@ -142,6 +143,28 @@ opalpci_attach(device_t dev) return (ENXIO); } + /* + * Map all devices on the bus to partitionable endpoint zero until + * such time as we start wanting to do things like bhyve. + */ + err = opal_call(OPAL_PCI_SET_PE, sc->phb_id, 0 /* Root PE */, + 0, 0, 0, 0, /* All devices */ + OPAL_MAP_PE); + if (err != 0) { + device_printf(dev, "PE mapping failed: %d\n", err); + return (ENXIO); + } + + /* + * Also disable the IOMMU for the time being for PE 0 (everything) + */ + err = opal_call(OPAL_PCI_MAP_PE_DMA_WINDOW_REAL, sc->phb_id, 0, 0, + 0 /* start address */, roundup2(Maxmem, 16*1024*1024)/* all RAM */); + if (err != 0) { + device_printf(dev, "DMA mapping failed: %d\n", err); + return (ENXIO); + } + return (ofw_pci_attach(dev)); }