From nobody Wed Nov 27 10:39:28 2024 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 003ED1EABCC for ; Thu, 10 Oct 2024 19:48:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728589720; cv=none; b=fw3quSyM0PZjmBbTUBzxhUNNyhrpRTqT+RKqtwe3IyfbSjlazis9feDEcmc6oGezJLxT9qOTyMvjIVo33FwsUPXWlWLVppSG5HhssFQlcyizM9LL2rf5bGGWzUDv6goETslmTCjpFMmrSU3cv1gg6neJNcQo3p02GUqEbpBp3ts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728589720; c=relaxed/simple; bh=J1uO1T79mJ6JRTI/UFPSNoT/vN6g2iDXkoED29n7Fgc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u3RMfPPknys+OsBHh9xpcPmA1h1o77Xw05UuoJJoF7UwqrtSvluoZC028WDsVAxUiHxTTKAjsnPOT8LStaHMuB5z+o1yln1ktaYR9vn/Kuzp3s9OxlSH9Ny+S1SE9SfzDrWbEjwwSi/4dTPq2dVN8MOwurh/pKSQ/rpCXY1cybw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=o9tjwi8W; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="o9tjwi8W" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2e2e2d09decso517634a91.1 for ; Thu, 10 Oct 2024 12:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1728589717; x=1729194517; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=inOXGNy811U5FqK2/VotX//GxEBcUKG77bY0K5QQOuo=; b=o9tjwi8WqtR3xF+bpJk9dIivRj0+XGRGVpn+p7cLimqkkVlYRvVry1ZF+wQ3QNXxxf YDIIfXoaOSl4JHmNLdZ/esT+hbZdAhYq3KMIZT8SvkuvDptAD6EqyVnw9TRkRFZ7FCSd OMBu9Zq73CaSoRLLbOOU/MfT+cFaUM+P12fa9LNrtbn0x/KqnwwUd0Mr81kgdyPCv7eJ hzVB/ejrR6zHK7bLau5sv6ibtMzzUIchhYuc70TUurgHdrd698MJwVdm/n6STMcms/EF T81WmwDEOOfRzX5ORhhJ/jQX72Lykn9mJKEoMRqo1GBjyXRzL7yjwrYXqH2GhiLAFhSw qs+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728589717; x=1729194517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=inOXGNy811U5FqK2/VotX//GxEBcUKG77bY0K5QQOuo=; b=lRthDNCWBva+UApRJG3+MkZuXWJ8h2vR+S3jTPIfGdaPqQhlcgKHRFYLDj+UuOe4gM Q+Eq43iKSTPstKRfYx2IaMEk2OxHaEN/f9sK16TMMjIPIY61lVN6tjiENPz3PY7Ss48v a+S9E9MgM9c0jfIQrgnbgqsXHcykES6657Vt/R8l0dNYtp8dpPj+CSCAAe41R1ZMpN4q XmYaSAYXw9yqs/BCJKjPP3FBlzyboUg+LA4atiuQW9L2cM6IZ3a62wqzLGCGysHixH6J KonvWTk180/rXz2YPNUr0s8yciLTQdn/Kzq250R/iH+ELaAtr3iSkz1BgvRgAneMk7pO Ytmw== X-Forwarded-Encrypted: i=1; AJvYcCUYDaBevmFUw4sZQIeq8SheOztAeLVcDhQtT3zO8FOqHoTIR2wCYP1dW+QwU/DVv9z3BnkMAffb1WTH8BU=@vger.kernel.org X-Gm-Message-State: AOJu0YyS60+HQ59XB4Q2zdLlVH/ovFCS+WcZ9aqLQYUeYeZoRxbz3S8Z /iHwL2lN9Iwu87OfIW4UnXWujYt0SmSuYDYBFdbwRDu1AHyaWnD0WaZfYGOwZfw= X-Google-Smtp-Source: AGHT+IEvCxThMKkwqYPOr50P5kaZbIeDGjTrwU/A/ZuI8evBCMsw3GPV2x4BECG5FjfYzstLRiS43A== X-Received: by 2002:a17:90a:8d01:b0:2c9:6abd:ca64 with SMTP id 98e67ed59e1d1-2e2f0ae762fmr478149a91.9.1728589717311; Thu, 10 Oct 2024 12:48:37 -0700 (PDT) Received: from tjeznach.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e2e6ef1ad0sm749135a91.49.2024.10.10.12.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 12:48:36 -0700 (PDT) From: Tomasz Jeznach To: Joerg Roedel , Will Deacon , Robin Murphy , Paul Walmsley Cc: Palmer Dabbelt , Albert Ou , Anup Patel , Sunil V L , Nick Kossifidis , Sebastien Boeuf , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, iommu@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux@rivosinc.com, Tomasz Jeznach , Lu Baolu , Zong Li Subject: [PATCH v9 5/7] iommu/riscv: Device directory management. Date: Thu, 10 Oct 2024 12:48:08 -0700 Message-Id: <8709f4dc344508ac3d63bafc54da6f37dd326b0e.1728579958.git.tjeznach@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce device context allocation and device directory tree management including capabilities discovery sequence, as described in Chapter 2.1 of the RISC-V IOMMU Architecture Specification. Device directory mode will be auto detected using DDTP WARL property, using highest mode supported by the driver and hardware. If none supported can be configured, driver will fall back to global pass-through. First level DDTP page can be located in I/O (detected using DDTP WARL) and system memory. Only simple identity and blocking protection domains are supported by this implementation. Co-developed-by: Nick Kossifidis Signed-off-by: Nick Kossifidis Reviewed-by: Lu Baolu Reviewed-by: Zong Li Signed-off-by: Tomasz Jeznach --- drivers/iommu/riscv/iommu.c | 398 +++++++++++++++++++++++++++++++++++- drivers/iommu/riscv/iommu.h | 5 + 2 files changed, 392 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c index c54088bf138f..d702c8f6ddf7 100644 --- a/drivers/iommu/riscv/iommu.c +++ b/drivers/iommu/riscv/iommu.c @@ -16,15 +16,168 @@ #include #include #include +#include #include #include =20 +#include "../iommu-pages.h" #include "iommu-bits.h" #include "iommu.h" =20 /* Timeouts in [us] */ #define RISCV_IOMMU_DDTP_TIMEOUT 50000 =20 +/* RISC-V IOMMU PPN <> PHYS address conversions, PHYS <=3D> PPN[53:10] */ +#define phys_to_ppn(pa) (((pa) >> 2) & (((1ULL << 44) - 1) << 10)) +#define ppn_to_phys(pn) (((pn) << 2) & (((1ULL << 44) - 1) << 12)) + +#define dev_to_iommu(dev) \ + iommu_get_iommu_dev(dev, struct riscv_iommu_device, iommu) + +/* Device resource-managed allocations */ +struct riscv_iommu_devres { + void *addr; + int order; +}; + +static void riscv_iommu_devres_pages_release(struct device *dev, void *res) +{ + struct riscv_iommu_devres *devres =3D res; + + iommu_free_pages(devres->addr, devres->order); +} + +static int riscv_iommu_devres_pages_match(struct device *dev, void *res, v= oid *p) +{ + struct riscv_iommu_devres *devres =3D res; + struct riscv_iommu_devres *target =3D p; + + return devres->addr =3D=3D target->addr; +} + +static void *riscv_iommu_get_pages(struct riscv_iommu_device *iommu, int o= rder) +{ + struct riscv_iommu_devres *devres; + void *addr; + + addr =3D iommu_alloc_pages_node(dev_to_node(iommu->dev), + GFP_KERNEL_ACCOUNT, order); + if (unlikely(!addr)) + return NULL; + + devres =3D devres_alloc(riscv_iommu_devres_pages_release, + sizeof(struct riscv_iommu_devres), GFP_KERNEL); + + if (unlikely(!devres)) { + iommu_free_pages(addr, order); + return NULL; + } + + devres->addr =3D addr; + devres->order =3D order; + + devres_add(iommu->dev, devres); + + return addr; +} + +static void riscv_iommu_free_pages(struct riscv_iommu_device *iommu, void = *addr) +{ + struct riscv_iommu_devres devres =3D { .addr =3D addr }; + + devres_release(iommu->dev, riscv_iommu_devres_pages_release, + riscv_iommu_devres_pages_match, &devres); +} + +/* Lookup and initialize device context info structure. */ +static struct riscv_iommu_dc *riscv_iommu_get_dc(struct riscv_iommu_device= *iommu, + unsigned int devid) +{ + const bool base_format =3D !(iommu->caps & RISCV_IOMMU_CAPABILITIES_MSI_F= LAT); + unsigned int depth; + unsigned long ddt, old, new; + void *ptr; + u8 ddi_bits[3] =3D { 0 }; + u64 *ddtp =3D NULL; + + /* Make sure the mode is valid */ + if (iommu->ddt_mode < RISCV_IOMMU_DDTP_IOMMU_MODE_1LVL || + iommu->ddt_mode > RISCV_IOMMU_DDTP_IOMMU_MODE_3LVL) + return NULL; + + /* + * Device id partitioning for base format: + * DDI[0]: bits 0 - 6 (1st level) (7 bits) + * DDI[1]: bits 7 - 15 (2nd level) (9 bits) + * DDI[2]: bits 16 - 23 (3rd level) (8 bits) + * + * For extended format: + * DDI[0]: bits 0 - 5 (1st level) (6 bits) + * DDI[1]: bits 6 - 14 (2nd level) (9 bits) + * DDI[2]: bits 15 - 23 (3rd level) (9 bits) + */ + if (base_format) { + ddi_bits[0] =3D 7; + ddi_bits[1] =3D 7 + 9; + ddi_bits[2] =3D 7 + 9 + 8; + } else { + ddi_bits[0] =3D 6; + ddi_bits[1] =3D 6 + 9; + ddi_bits[2] =3D 6 + 9 + 9; + } + + /* Make sure device id is within range */ + depth =3D iommu->ddt_mode - RISCV_IOMMU_DDTP_IOMMU_MODE_1LVL; + if (devid >=3D (1 << ddi_bits[depth])) + return NULL; + + /* Get to the level of the non-leaf node that holds the device context */ + for (ddtp =3D iommu->ddt_root; depth-- > 0;) { + const int split =3D ddi_bits[depth]; + /* + * Each non-leaf node is 64bits wide and on each level + * nodes are indexed by DDI[depth]. + */ + ddtp +=3D (devid >> split) & 0x1FF; + + /* + * Check if this node has been populated and if not + * allocate a new level and populate it. + */ + do { + ddt =3D READ_ONCE(*(unsigned long *)ddtp); + if (ddt & RISCV_IOMMU_DDTE_V) { + ddtp =3D __va(ppn_to_phys(ddt)); + break; + } + + ptr =3D riscv_iommu_get_pages(iommu, 0); + if (!ptr) + return NULL; + + new =3D phys_to_ppn(__pa(ptr)) | RISCV_IOMMU_DDTE_V; + old =3D cmpxchg_relaxed((unsigned long *)ddtp, ddt, new); + + if (old =3D=3D ddt) { + ddtp =3D (u64 *)ptr; + break; + } + + /* Race setting DDT detected, re-read and retry. */ + riscv_iommu_free_pages(iommu, ptr); + } while (1); + } + + /* + * Grab the node that matches DDI[depth], note that when using base + * format the device context is 4 * 64bits, and the extended format + * is 8 * 64bits, hence the (3 - base_format) below. + */ + ddtp +=3D (devid & ((64 << base_format) - 1)) << (3 - base_format); + + return (struct riscv_iommu_dc *)ddtp; +} + /* * This is best effort IOMMU translation shutdown flow. * Disable IOMMU without waiting for hardware response. @@ -37,10 +190,201 @@ static void riscv_iommu_disable(struct riscv_iommu_de= vice *iommu) riscv_iommu_writel(iommu, RISCV_IOMMU_REG_PQCSR, 0); } =20 +#define riscv_iommu_read_ddtp(iommu) ({ \ + u64 ddtp; \ + riscv_iommu_readq_timeout((iommu), RISCV_IOMMU_REG_DDTP, ddtp, \ + !(ddtp & RISCV_IOMMU_DDTP_BUSY), 10, \ + RISCV_IOMMU_DDTP_TIMEOUT); \ + ddtp; }) + +static int riscv_iommu_iodir_alloc(struct riscv_iommu_device *iommu) +{ + u64 ddtp; + unsigned int mode; + + ddtp =3D riscv_iommu_read_ddtp(iommu); + if (ddtp & RISCV_IOMMU_DDTP_BUSY) + return -EBUSY; + + /* + * It is optional for the hardware to report a fixed address for device + * directory root page when DDT.MODE is OFF or BARE. + */ + mode =3D FIELD_GET(RISCV_IOMMU_DDTP_IOMMU_MODE, ddtp); + if (mode =3D=3D RISCV_IOMMU_DDTP_IOMMU_MODE_BARE || + mode =3D=3D RISCV_IOMMU_DDTP_IOMMU_MODE_OFF) { + /* Use WARL to discover hardware fixed DDT PPN */ + riscv_iommu_writeq(iommu, RISCV_IOMMU_REG_DDTP, + FIELD_PREP(RISCV_IOMMU_DDTP_IOMMU_MODE, mode)); + ddtp =3D riscv_iommu_read_ddtp(iommu); + if (ddtp & RISCV_IOMMU_DDTP_BUSY) + return -EBUSY; + + iommu->ddt_phys =3D ppn_to_phys(ddtp); + if (iommu->ddt_phys) + iommu->ddt_root =3D devm_ioremap(iommu->dev, + iommu->ddt_phys, PAGE_SIZE); + if (iommu->ddt_root) + memset(iommu->ddt_root, 0, PAGE_SIZE); + } + + if (!iommu->ddt_root) { + iommu->ddt_root =3D riscv_iommu_get_pages(iommu, 0); + iommu->ddt_phys =3D __pa(iommu->ddt_root); + } + + if (!iommu->ddt_root) + return -ENOMEM; + + return 0; +} + +/* + * Discover supported DDT modes starting from requested value, + * configure DDTP register with accepted mode and root DDT address. + * Accepted iommu->ddt_mode is updated on success. + */ +static int riscv_iommu_iodir_set_mode(struct riscv_iommu_device *iommu, + unsigned int ddtp_mode) +{ + struct device *dev =3D iommu->dev; + u64 ddtp, rq_ddtp; + unsigned int mode, rq_mode =3D ddtp_mode; + + ddtp =3D riscv_iommu_read_ddtp(iommu); + if (ddtp & RISCV_IOMMU_DDTP_BUSY) + return -EBUSY; + + /* Disallow state transition from xLVL to xLVL. */ + mode =3D FIELD_GET(RISCV_IOMMU_DDTP_IOMMU_MODE, ddtp); + if (mode !=3D RISCV_IOMMU_DDTP_IOMMU_MODE_BARE && + mode !=3D RISCV_IOMMU_DDTP_IOMMU_MODE_OFF && + rq_mode !=3D RISCV_IOMMU_DDTP_IOMMU_MODE_BARE && + rq_mode !=3D RISCV_IOMMU_DDTP_IOMMU_MODE_OFF) + return -EINVAL; + + do { + rq_ddtp =3D FIELD_PREP(RISCV_IOMMU_DDTP_IOMMU_MODE, rq_mode); + if (rq_mode > RISCV_IOMMU_DDTP_IOMMU_MODE_BARE) + rq_ddtp |=3D phys_to_ppn(iommu->ddt_phys); + + riscv_iommu_writeq(iommu, RISCV_IOMMU_REG_DDTP, rq_ddtp); + ddtp =3D riscv_iommu_read_ddtp(iommu); + if (ddtp & RISCV_IOMMU_DDTP_BUSY) { + dev_err(dev, "timeout when setting ddtp (ddt mode: %u, read: %llx)\n", + rq_mode, ddtp); + return -EBUSY; + } + + /* Verify IOMMU hardware accepts new DDTP config. */ + mode =3D FIELD_GET(RISCV_IOMMU_DDTP_IOMMU_MODE, ddtp); + + if (rq_mode =3D=3D mode) + break; + + /* Hardware mandatory DDTP mode has not been accepted. */ + if (rq_mode < RISCV_IOMMU_DDTP_IOMMU_MODE_1LVL && rq_ddtp !=3D ddtp) { + dev_err(dev, "DDTP update failed hw: %llx vs %llx\n", + ddtp, rq_ddtp); + return -EINVAL; + } + + /* + * Mode field is WARL, an IOMMU may support a subset of + * directory table levels in which case if we tried to set + * an unsupported number of levels we'll readback either + * a valid xLVL or off/bare. If we got off/bare, try again + * with a smaller xLVL. + */ + if (mode < RISCV_IOMMU_DDTP_IOMMU_MODE_1LVL && + rq_mode > RISCV_IOMMU_DDTP_IOMMU_MODE_1LVL) { + dev_dbg(dev, "DDTP hw mode %u vs %u\n", mode, rq_mode); + rq_mode--; + continue; + } + + /* + * We tried all supported modes and IOMMU hardware failed to + * accept new settings, something went very wrong since off/bare + * and at least one xLVL must be supported. + */ + dev_err(dev, "DDTP hw mode %u, failed to set %u\n", + mode, ddtp_mode); + return -EINVAL; + } while (1); + + iommu->ddt_mode =3D mode; + if (mode !=3D ddtp_mode) + dev_dbg(dev, "DDTP hw mode %u, requested %u\n", mode, ddtp_mode); + + return 0; +} + +#define RISCV_IOMMU_FSC_BARE 0 + +/* + * Update IODIR for the device. + * + * During the execution of riscv_iommu_probe_device(), IODIR entries are + * allocated for the device's identifiers. Device context invalidation + * becomes necessary only if one of the updated entries was previously + * marked as valid, given that invalid device context entries are not + * cached by the IOMMU hardware. + * In this implementation, updating a valid device context while the + * device is not quiesced might be disruptive, potentially causing + * interim translation faults. + */ +static void riscv_iommu_iodir_update(struct riscv_iommu_device *iommu, + struct device *dev, u64 fsc, u64 ta) +{ + struct iommu_fwspec *fwspec =3D dev_iommu_fwspec_get(dev); + struct riscv_iommu_dc *dc; + u64 tc; + int i; + + /* Device context invalidation ignored for now. */ + + /* + * For device context with DC_TC_PDTV =3D 0, translation attributes valid= bit + * is stored as DC_TC_V bit (both sharing the same location at BIT(0)). + */ + for (i =3D 0; i < fwspec->num_ids; i++) { + dc =3D riscv_iommu_get_dc(iommu, fwspec->ids[i]); + tc =3D READ_ONCE(dc->tc); + tc |=3D ta & RISCV_IOMMU_DC_TC_V; + + WRITE_ONCE(dc->fsc, fsc); + WRITE_ONCE(dc->ta, ta & RISCV_IOMMU_PC_TA_PSCID); + /* Update device context, write TC.V as the last step. */ + dma_wmb(); + WRITE_ONCE(dc->tc, tc); + } +} + +static int riscv_iommu_attach_blocking_domain(struct iommu_domain *iommu_d= omain, + struct device *dev) +{ + struct riscv_iommu_device *iommu =3D dev_to_iommu(dev); + + riscv_iommu_iodir_update(iommu, dev, RISCV_IOMMU_FSC_BARE, 0); + + return 0; +} + +static struct iommu_domain riscv_iommu_blocking_domain =3D { + .type =3D IOMMU_DOMAIN_BLOCKED, + .ops =3D &(const struct iommu_domain_ops) { + .attach_dev =3D riscv_iommu_attach_blocking_domain, + } +}; + static int riscv_iommu_attach_identity_domain(struct iommu_domain *iommu_d= omain, struct device *dev) { - /* Global pass-through already enabled, do nothing for now. */ + struct riscv_iommu_device *iommu =3D dev_to_iommu(dev); + + riscv_iommu_iodir_update(iommu, dev, RISCV_IOMMU_FSC_BARE, RISCV_IOMMU_PC= _TA_V); + return 0; } =20 @@ -72,6 +416,9 @@ static struct iommu_device *riscv_iommu_probe_device(str= uct device *dev) { struct iommu_fwspec *fwspec =3D dev_iommu_fwspec_get(dev); struct riscv_iommu_device *iommu; + struct riscv_iommu_dc *dc; + u64 tc; + int i; =20 if (!fwspec || !fwspec->iommu_fwnode->dev || !fwspec->num_ids) return ERR_PTR(-ENODEV); @@ -80,12 +427,37 @@ static struct iommu_device *riscv_iommu_probe_device(s= truct device *dev) if (!iommu) return ERR_PTR(-ENODEV); =20 + /* + * IOMMU hardware operating in fail-over BARE mode will provide + * identity translation for all connected devices anyway... + */ + if (iommu->ddt_mode <=3D RISCV_IOMMU_DDTP_IOMMU_MODE_BARE) + return ERR_PTR(-ENODEV); + + /* + * Allocate and pre-configure device context entries in + * the device directory. Do not mark the context valid yet. + */ + tc =3D 0; + if (iommu->caps & RISCV_IOMMU_CAPABILITIES_AMO_HWAD) + tc |=3D RISCV_IOMMU_DC_TC_SADE; + for (i =3D 0; i < fwspec->num_ids; i++) { + dc =3D riscv_iommu_get_dc(iommu, fwspec->ids[i]); + if (!dc) + return ERR_PTR(-ENODEV); + if (READ_ONCE(dc->tc) & RISCV_IOMMU_DC_TC_V) + dev_warn(dev, "already attached to IOMMU device directory\n"); + WRITE_ONCE(dc->tc, tc); + } + return &iommu->iommu; } =20 static const struct iommu_ops riscv_iommu_ops =3D { .of_xlate =3D riscv_iommu_of_xlate, .identity_domain =3D &riscv_iommu_identity_domain, + .blocked_domain =3D &riscv_iommu_blocking_domain, + .release_domain =3D &riscv_iommu_blocking_domain, .def_domain_type =3D riscv_iommu_device_domain_type, .device_group =3D riscv_iommu_device_group, .probe_device =3D riscv_iommu_probe_device, @@ -131,6 +503,7 @@ void riscv_iommu_remove(struct riscv_iommu_device *iomm= u) { iommu_device_unregister(&iommu->iommu); iommu_device_sysfs_remove(&iommu->iommu); + riscv_iommu_iodir_set_mode(iommu, RISCV_IOMMU_DDTP_IOMMU_MODE_OFF); } =20 int riscv_iommu_init(struct riscv_iommu_device *iommu) @@ -141,19 +514,20 @@ int riscv_iommu_init(struct riscv_iommu_device *iommu) if (rc) return dev_err_probe(iommu->dev, rc, "unexpected device state\n"); =20 - /* - * Placeholder for a complete IOMMU device initialization. For now, - * only bare minimum: enable global identity mapping mode and register sy= sfs. - */ - riscv_iommu_writeq(iommu, RISCV_IOMMU_REG_DDTP, - FIELD_PREP(RISCV_IOMMU_DDTP_IOMMU_MODE, - RISCV_IOMMU_DDTP_IOMMU_MODE_BARE)); + rc =3D riscv_iommu_iodir_alloc(iommu); + if (rc) + return rc; + + rc =3D riscv_iommu_iodir_set_mode(iommu, RISCV_IOMMU_DDTP_IOMMU_MODE_MAX); + if (rc) + return rc; =20 rc =3D iommu_device_sysfs_add(&iommu->iommu, NULL, NULL, "riscv-iommu@%s", dev_name(iommu->dev)); - if (rc) - return dev_err_probe(iommu->dev, rc, - "cannot register sysfs interface\n"); + if (rc) { + dev_err_probe(iommu->dev, rc, "cannot register sysfs interface\n"); + goto err_iodir_off; + } =20 rc =3D iommu_device_register(&iommu->iommu, &riscv_iommu_ops, iommu->dev); if (rc) { @@ -165,5 +539,7 @@ int riscv_iommu_init(struct riscv_iommu_device *iommu) =20 err_remove_sysfs: iommu_device_sysfs_remove(&iommu->iommu); +err_iodir_off: + riscv_iommu_iodir_set_mode(iommu, RISCV_IOMMU_DDTP_IOMMU_MODE_OFF); return rc; } diff --git a/drivers/iommu/riscv/iommu.h b/drivers/iommu/riscv/iommu.h index 700e33dc2446..f1696926582c 100644 --- a/drivers/iommu/riscv/iommu.h +++ b/drivers/iommu/riscv/iommu.h @@ -34,6 +34,11 @@ struct riscv_iommu_device { /* available interrupt numbers, MSI or WSI */ unsigned int irqs[RISCV_IOMMU_INTR_COUNT]; unsigned int irqs_count; + + /* device directory */ + unsigned int ddt_mode; + dma_addr_t ddt_phys; + u64 *ddt_root; }; =20 int riscv_iommu_init(struct riscv_iommu_device *iommu); --=20 2.34.1