From owner-svn-src-head@freebsd.org Sun Oct 25 10:08:46 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8F24449A38; Sun, 25 Oct 2020 10:08:46 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CJtwG5t71z3ZpM; Sun, 25 Oct 2020 10:08:46 +0000 (UTC) (envelope-from br@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD790278DE; Sun, 25 Oct 2020 10:08:46 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09PA8k82053490; Sun, 25 Oct 2020 10:08:46 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09PA8kpM053489; Sun, 25 Oct 2020 10:08:46 GMT (envelope-from br@FreeBSD.org) Message-Id: <202010251008.09PA8kpM053489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Sun, 25 Oct 2020 10:08:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367037 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 367037 X-SVN-Commit-Repository: base 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.33 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: Sun, 25 Oct 2020 10:08:47 -0000 Author: br Date: Sun Oct 25 10:08:46 2020 New Revision: 367037 URL: https://svnweb.freebsd.org/changeset/base/367037 Log: Add IOMMU support to GICv3 Interrupt Translation Service (ITS) driver. Submitted by: andrew Sponsored by: Innovate DSbD Differential Revision: https://reviews.freebsd.org/D26878 Modified: head/sys/arm64/arm64/gicv3_its.c Modified: head/sys/arm64/arm64/gicv3_its.c ============================================================================== --- head/sys/arm64/arm64/gicv3_its.c Sun Oct 25 07:48:07 2020 (r367036) +++ head/sys/arm64/arm64/gicv3_its.c Sun Oct 25 10:08:46 2020 (r367037) @@ -32,6 +32,7 @@ #include "opt_acpi.h" #include "opt_platform.h" +#include "opt_iommu.h" #include __FBSDID("$FreeBSD$"); @@ -47,6 +48,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include @@ -56,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -72,6 +76,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef IOMMU +#include +#include +#endif + #include "pcib_if.h" #include "pic_if.h" #include "msi_if.h" @@ -269,6 +278,7 @@ struct gicv3_its_softc { #define ITS_FLAGS_ERRATA_CAVIUM_22375 0x00000004 u_int sc_its_flags; bool trace_enable; + vm_page_t ma; /* fake msi page */ }; static void *conf_base; @@ -321,6 +331,10 @@ static msi_release_msi_t gicv3_its_release_msi; static msi_alloc_msix_t gicv3_its_alloc_msix; static msi_release_msix_t gicv3_its_release_msix; static msi_map_msi_t gicv3_its_map_msi; +#ifdef IOMMU +static msi_iommu_init_t gicv3_iommu_init; +static msi_iommu_deinit_t gicv3_iommu_deinit; +#endif static void its_cmd_movi(device_t, struct gicv3_its_irqsrc *); static void its_cmd_mapc(device_t, struct its_col *, uint8_t); @@ -352,6 +366,10 @@ static device_method_t gicv3_its_methods[] = { DEVMETHOD(msi_alloc_msix, gicv3_its_alloc_msix), DEVMETHOD(msi_release_msix, gicv3_its_release_msix), DEVMETHOD(msi_map_msi, gicv3_its_map_msi), +#ifdef IOMMU + DEVMETHOD(msi_iommu_init, gicv3_iommu_init), + DEVMETHOD(msi_iommu_deinit, gicv3_iommu_deinit), +#endif /* End */ DEVMETHOD_END @@ -803,8 +821,9 @@ static int gicv3_its_attach(device_t dev) { struct gicv3_its_softc *sc; - uint32_t iidr; int domain, err, i, rid; + uint64_t phys; + uint32_t iidr; sc = device_get_softc(dev); @@ -820,6 +839,11 @@ gicv3_its_attach(device_t dev) return (ENXIO); } + phys = rounddown2(vtophys(rman_get_virtual(sc->sc_its_res)) + + GITS_TRANSLATER, PAGE_SIZE); + sc->ma = malloc(sizeof(struct vm_page), M_DEVBUF, M_WAITOK | M_ZERO); + vm_page_initfake(sc->ma, phys, VM_MEMATTR_DEFAULT); + iidr = gic_its_read_4(sc, GITS_IIDR); for (i = 0; i < nitems(its_quirks); i++) { if ((iidr & its_quirks[i].iidr_mask) == its_quirks[i].iidr) { @@ -1418,6 +1442,33 @@ gicv3_its_map_msi(device_t dev, device_t child, struct return (0); } + +#ifdef IOMMU +static int +gicv3_iommu_init(device_t dev, device_t child, struct iommu_domain **domain) +{ + struct gicv3_its_softc *sc; + struct iommu_ctx *ctx; + int error; + + sc = device_get_softc(dev); + ctx = iommu_get_dev_ctx(child); + error = iommu_map_msi(ctx, PAGE_SIZE, GITS_TRANSLATER, + IOMMU_MAP_ENTRY_WRITE, IOMMU_MF_CANWAIT, &sc->ma); + *domain = iommu_get_ctx_domain(ctx); + + return (error); +} + +static void +gicv3_iommu_deinit(device_t dev, device_t child) +{ + struct iommu_ctx *ctx; + + ctx = iommu_get_dev_ctx(child); + iommu_unmap_msi(ctx); +} +#endif /* * Commands handling.