From nobody Wed Oct 8 10:05:52 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 605CB1A3178 for ; Mon, 30 Jun 2025 03:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255300; cv=none; b=DfYMkXXbyYmeiyFj5NCcmvj58uJmEl/tZN8VBE+VntHgrK+0vbMYR3FpR4Rx8aGIpRLF8AAPM6H8mm/VY7nzXZ/sqD7vAaEg4a9V14tGizQL6nMBzPJLxWODNlBbxoL+5dlGo2c3VCLX2cCpOGe/VAzsEOzyoiEY0V6qwmv+i8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255300; c=relaxed/simple; bh=fwxTxw/IithfFhab2fYNL+Cl2HAGRBMBxCnz+GtiM0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K2UqDmlGIE1zkqFN2H/05A8GbmntvsvQ21rtNDANmesPPzpbTfpDl+3iBv2u9LNaDWiytPqZQZdr+DjPzF9OhdBet66MuEEJpnWqegv9mp2xa7sDrSDN2uLLNktvin1YQnXgLeYTYdYZAaBkeD9CpBH9m6+MKkH1Ixw9kmkhOIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=pELs2oFz; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="pELs2oFz" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7481600130eso2119932b3a.3 for ; Sun, 29 Jun 2025 20:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1751255297; x=1751860097; 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=cd938LqQ6TovIsziaOnI1VCnbrkIjPi1GGwl9SOQNDg=; b=pELs2oFzgX9d4QpF2ENyTbGS1brPOHvt+z19GbrCtivwUdmz1N17JxYvrg4LKYF7rH z0iMg+2tRMnzrYogcPj724UkES38t1XRhh00WxyadSFu/MD++GMbUCIt+M8iaAHS/NWW zlJCOleY32wLVkUG1pyXxN6WCsSkx7SRbgGNLVtQ6nGawOlW8llmcJTbb0AvGXqqnuTR NzejG3wQrifIU6TYBdPIq++njkaN9iw4ImhjKEP9tVqWKyRFtPhiZ6hTK17jaxqgVkKV 03Apoy1Y2ZihP39Gnn6AteSV97CNEgLkOu5DkcSYQOkqBUxFMNJGc11yCga3JaF2vy5W /OKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751255297; x=1751860097; 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=cd938LqQ6TovIsziaOnI1VCnbrkIjPi1GGwl9SOQNDg=; b=FGe6vTTQvfdjMCFMy2amdJtx8BylYx2zur7qZbn7J4xRe5HwuCWZ6Wzybzt3g2q0fZ +2BxWaG3lMd90+3JwNXbXi4NVanx2zFdiKhO/ISM5VdyxqkZnzrOBzHfOOBqdKLkM4xe ldKgP0mK3x/pOfnTRwkkvpi380mN3mHKL9By7Ct1DIOlVYcf3ac4P6u8aAXDE1l2uEij 4TgS2d6JJPhDuo5VN18uoxOQEXQdhhv27d3xZB+gIHFc57SiRUeP7e80Ax3Mm9rDN+6g YKMHkxu46jO1Zax2W6yPM8X8ORxxvJZtyZ6QNfPAfLBCuEWnWa/5uYbPsPV/p5usTdtV ZIyw== X-Gm-Message-State: AOJu0YzzI+FQxZfzQVdpyjnyHDo39S8+/z2vRi5cKYD/tixQyfqLeMbE 4hX4lTQpjsrq0QTyNTHQz0oBbbfTq+Zlqo1TR48nFe8udBV01cdhHbnEbPV7weAiPYgKaBh66S9 Thf4s X-Gm-Gg: ASbGncsWA22dAzdNuysoO7wu051FD0k5bC72/lvvXaotUaf5vZD37MjeT92hhrezNnY HrG6fdf7HpKjtM1DT/503lqqMxGCRouVr4LRN3onzjnbe/RfEtyqR3NjUYRdL+1zKLgwZRae4hB qYEUQ9fwJ5tQttApyALNOzmzS8G3v52J4SWONDirwoctCw4DdT/8LJPVR5nbybrYd2A4UKAECcm Cizq1gCttZnUuX+8Ch3w80E/76CpZZRz4RCBpdp9rsS+Gp9RER5uvGpvxNhSbq2NCRUBoondHpE VpL5XTu3buQlVHPBFS0IOX8cJ9zQq/tJE6s+QphvXTMrFWlON1sjUVLjZ7W1EiC5UEm0SzvD X-Google-Smtp-Source: AGHT+IF9oW5i1PG6Q2243XdYrcRyCBo+0zkLnrBFxaU/G5a2hikqLwZpk2FjJPCbAEta6A4qsX9nFA== X-Received: by 2002:a05:6a00:2e98:b0:748:311a:8aef with SMTP id d2e1a72fcca58-74af6fcd65bmr17205554b3a.12.1751255297040; Sun, 29 Jun 2025 20:48:17 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.195.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af57efaecsm7837862b3a.161.2025.06.29.20.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 20:48:16 -0700 (PDT) From: Sunil V L To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux.dev Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , "Rafael J . Wysocki" , Len Brown , Tomasz Jeznach , Joerg Roedel , Will Deacon , Robin Murphy , Anup Patel , Atish Patra , Andrew Jones , Sunil V L Subject: [PATCH v3 1/3] ACPI: RISC-V: Add support for RIMT Date: Mon, 30 Jun 2025 09:18:01 +0530 Message-ID: <20250630034803.1611262-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630034803.1611262-1-sunilvl@ventanamicro.com> References: <20250630034803.1611262-1-sunilvl@ventanamicro.com> 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" RISC-V IO Mapping Table (RIMT) is a static ACPI table to communicate IOMMU information to the OS. The spec is available at [1]. The changes at high level are, a) Initialize data structures required for IOMMU/device configuration using the data from RIMT. Provide APIs required for device configuration. b) Provide an API for IOMMU drivers to register the fwnode with RIMT data structures. This API will create a fwnode for PCIe IOMMU. [1] - https://github.com/riscv-non-isa/riscv-acpi-rimt Signed-off-by: Sunil V L --- MAINTAINERS | 1 + arch/riscv/Kconfig | 1 + drivers/acpi/Kconfig | 4 + drivers/acpi/riscv/Kconfig | 7 + drivers/acpi/riscv/Makefile | 1 + drivers/acpi/riscv/init.c | 2 + drivers/acpi/riscv/init.h | 1 + drivers/acpi/riscv/rimt.c | 523 ++++++++++++++++++++++++++++++++++++ include/linux/acpi_rimt.h | 26 ++ 9 files changed, 566 insertions(+) create mode 100644 drivers/acpi/riscv/Kconfig create mode 100644 drivers/acpi/riscv/rimt.c create mode 100644 include/linux/acpi_rimt.h diff --git a/MAINTAINERS b/MAINTAINERS index 4bac4ea21b64..c8aac26707af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -345,6 +345,7 @@ L: linux-acpi@vger.kernel.org L: linux-riscv@lists.infradead.org S: Maintained F: drivers/acpi/riscv/ +F: include/linux/acpi_rimt.h =20 ACPI PCC(Platform Communication Channel) MAILBOX DRIVER M: Sudeep Holla diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 36061f4732b7..96d64e0a7b97 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -16,6 +16,7 @@ config RISCV select ACPI_MCFG if (ACPI && PCI) select ACPI_PPTT if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI + select ACPI_RIMT if ACPI select ACPI_SPCR_TABLE if ACPI select ARCH_DMA_DEFAULT_COHERENT select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 7bc40c2735ac..4381803c308c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -546,6 +546,10 @@ if ARM64 source "drivers/acpi/arm64/Kconfig" endif =20 +if RISCV +source "drivers/acpi/riscv/Kconfig" +endif + config ACPI_PPTT bool =20 diff --git a/drivers/acpi/riscv/Kconfig b/drivers/acpi/riscv/Kconfig new file mode 100644 index 000000000000..046296a18d00 --- /dev/null +++ b/drivers/acpi/riscv/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# ACPI Configuration for RISC-V +# + +config ACPI_RIMT + bool diff --git a/drivers/acpi/riscv/Makefile b/drivers/acpi/riscv/Makefile index a96fdf1e2cb8..1284a076fa88 100644 --- a/drivers/acpi/riscv/Makefile +++ b/drivers/acpi/riscv/Makefile @@ -2,3 +2,4 @@ obj-y +=3D rhct.o init.o irq.o obj-$(CONFIG_ACPI_PROCESSOR_IDLE) +=3D cpuidle.o obj-$(CONFIG_ACPI_CPPC_LIB) +=3D cppc.o +obj-$(CONFIG_ACPI_RIMT) +=3D rimt.o diff --git a/drivers/acpi/riscv/init.c b/drivers/acpi/riscv/init.c index 673e4d5dd752..7c00f7995e86 100644 --- a/drivers/acpi/riscv/init.c +++ b/drivers/acpi/riscv/init.c @@ -10,4 +10,6 @@ void __init acpi_arch_init(void) { riscv_acpi_init_gsi_mapping(); + if (IS_ENABLED(CONFIG_ACPI_RIMT)) + riscv_acpi_rimt_init(); } diff --git a/drivers/acpi/riscv/init.h b/drivers/acpi/riscv/init.h index 0b9a07e4031f..1680aa2aaf23 100644 --- a/drivers/acpi/riscv/init.h +++ b/drivers/acpi/riscv/init.h @@ -2,3 +2,4 @@ #include =20 void __init riscv_acpi_init_gsi_mapping(void); +void __init riscv_acpi_rimt_init(void); diff --git a/drivers/acpi/riscv/rimt.c b/drivers/acpi/riscv/rimt.c new file mode 100644 index 000000000000..8cb6f5cf39e2 --- /dev/null +++ b/drivers/acpi/riscv/rimt.c @@ -0,0 +1,523 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024-2025, Ventana Micro Systems Inc + * Author: Sunil V L + * + */ + +#include +#include +#include +#include +#include +#include +#include "init.h" + +struct rimt_fwnode { + struct list_head list; + struct acpi_rimt_node *rimt_node; + struct fwnode_handle *fwnode; +}; + +static LIST_HEAD(rimt_fwnode_list); +static DEFINE_SPINLOCK(rimt_fwnode_lock); + +#define RIMT_TYPE_MASK(type) (1 << (type)) +#define RIMT_IOMMU_TYPE BIT(0) + +/* Root pointer to the mapped RIMT table */ +static struct acpi_table_header *rimt_table; + +/** + * rimt_set_fwnode() - Create rimt_fwnode and use it to register + * iommu data in the rimt_fwnode_list + * + * @rimt_node: RIMT table node associated with the IOMMU + * @fwnode: fwnode associated with the RIMT node + * + * Returns: 0 on success + * <0 on failure + */ +static inline int rimt_set_fwnode(struct acpi_rimt_node *rimt_node, + struct fwnode_handle *fwnode) +{ + struct rimt_fwnode *np; + + np =3D kzalloc(sizeof(*np), GFP_ATOMIC); + + if (WARN_ON(!np)) + return -ENOMEM; + + INIT_LIST_HEAD(&np->list); + np->rimt_node =3D rimt_node; + np->fwnode =3D fwnode; + + spin_lock(&rimt_fwnode_lock); + list_add_tail(&np->list, &rimt_fwnode_list); + spin_unlock(&rimt_fwnode_lock); + + return 0; +} + +/** + * rimt_get_fwnode() - Retrieve fwnode associated with an RIMT node + * + * @node: RIMT table node to be looked-up + * + * Returns: fwnode_handle pointer on success, NULL on failure + */ +static inline struct fwnode_handle *rimt_get_fwnode(struct acpi_rimt_node = *node) +{ + struct rimt_fwnode *curr; + struct fwnode_handle *fwnode =3D NULL; + + spin_lock(&rimt_fwnode_lock); + list_for_each_entry(curr, &rimt_fwnode_list, list) { + if (curr->rimt_node =3D=3D node) { + fwnode =3D curr->fwnode; + break; + } + } + spin_unlock(&rimt_fwnode_lock); + + return fwnode; +} + +static acpi_status rimt_match_node_callback(struct acpi_rimt_node *node, + void *context) +{ + struct device *dev =3D context; + acpi_status status =3D AE_NOT_FOUND; + + if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_IOMMU) { + struct acpi_rimt_iommu *iommu_node =3D (struct acpi_rimt_iommu *)&node->= node_data; + + if (dev_is_pci(dev)) { + struct pci_dev *pdev; + u16 bdf; + + pdev =3D to_pci_dev(dev); + bdf =3D PCI_DEVID(pdev->bus->number, pdev->devfn); + if ((pci_domain_nr(pdev->bus) =3D=3D iommu_node->pcie_segment_number) && + bdf =3D=3D iommu_node->pcie_bdf) { + status =3D AE_OK; + } else { + status =3D AE_NOT_FOUND; + } + } else { + struct platform_device *pdev =3D to_platform_device(dev); + struct resource *res; + + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res && res->start =3D=3D iommu_node->base_address) + status =3D AE_OK; + else + status =3D AE_NOT_FOUND; + } + } else if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX) { + struct acpi_rimt_pcie_rc *pci_rc; + struct pci_bus *bus; + + bus =3D to_pci_bus(dev); + pci_rc =3D (struct acpi_rimt_pcie_rc *)node->node_data; + + /* + * It is assumed that PCI segment numbers maps one-to-one + * with root complexes. Each segment number can represent only + * one root complex. + */ + status =3D pci_rc->pcie_segment_number =3D=3D pci_domain_nr(bus) ? + AE_OK : AE_NOT_FOUND; + } else if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PLAT_DEVICE) { + struct acpi_buffer buf =3D { ACPI_ALLOCATE_BUFFER, NULL }; + struct acpi_device *adev; + struct acpi_rimt_platform_device *ncomp; + struct device *plat_dev =3D dev; + + /* + * Walk the device tree to find a device with an + * ACPI companion; there is no point in scanning + * RIMT for a device matching a platform device if + * the device does not have an ACPI companion to + * start with. + */ + do { + adev =3D ACPI_COMPANION(plat_dev); + if (adev) + break; + + plat_dev =3D plat_dev->parent; + } while (plat_dev); + + if (!adev) + return status; + + status =3D acpi_get_name(adev->handle, ACPI_FULL_PATHNAME, &buf); + if (ACPI_FAILURE(status)) { + dev_warn(plat_dev, "Can't get device full path name\n"); + return status; + } + + ncomp =3D (struct acpi_rimt_platform_device *)node->node_data; + status =3D !strcmp(ncomp->device_name, buf.pointer) ? + AE_OK : AE_NOT_FOUND; + acpi_os_free(buf.pointer); + } + + return status; +} + +static struct acpi_rimt_node *rimt_scan_node(enum acpi_rimt_node_type type, + void *context) +{ + struct acpi_rimt_node *rimt_node, *rimt_end; + struct acpi_table_rimt *rimt; + int i; + + if (!rimt_table) + return NULL; + + /* Get the first RIMT node */ + rimt =3D (struct acpi_table_rimt *)rimt_table; + rimt_node =3D ACPI_ADD_PTR(struct acpi_rimt_node, rimt, + rimt->node_offset); + rimt_end =3D ACPI_ADD_PTR(struct acpi_rimt_node, rimt_table, + rimt_table->length); + + for (i =3D 0; i < rimt->num_nodes; i++) { + if (WARN_TAINT(rimt_node >=3D rimt_end, TAINT_FIRMWARE_WORKAROUND, + "RIMT node pointer overflows, bad table!\n")) + return NULL; + + if (rimt_node->type =3D=3D type && + ACPI_SUCCESS(rimt_match_node_callback(rimt_node, context))) + return rimt_node; + + rimt_node =3D ACPI_ADD_PTR(struct acpi_rimt_node, rimt_node, + rimt_node->length); + } + + return NULL; +} + +static bool rimt_pcie_rc_supports_ats(struct acpi_rimt_node *node) +{ + struct acpi_rimt_pcie_rc *pci_rc; + + pci_rc =3D (struct acpi_rimt_pcie_rc *)node->node_data; + return pci_rc->flags & ACPI_RIMT_PCIE_ATS_SUPPORTED; +} + +static int rimt_iommu_xlate(struct device *dev, struct acpi_rimt_node *nod= e, u32 deviceid) +{ + struct fwnode_handle *rimt_fwnode; + + if (!node) + return -ENODEV; + + rimt_fwnode =3D rimt_get_fwnode(node); + + /* + * The IOMMU drivers may not be probed yet. + * Defer the IOMMU configuration + */ + if (!rimt_fwnode) + return -EPROBE_DEFER; + + return acpi_iommu_fwspec_init(dev, deviceid, rimt_fwnode); +} + +struct rimt_pci_alias_info { + struct device *dev; + struct acpi_rimt_node *node; + const struct iommu_ops *ops; +}; + +static int rimt_id_map(struct acpi_rimt_id_mapping *map, u8 type, u32 rid_= in, u32 *rid_out) +{ + if (rid_in < map->source_id_base || + (rid_in > map->source_id_base + map->num_ids)) + return -ENXIO; + + *rid_out =3D map->dest_id_base + (rid_in - map->source_id_base); + return 0; +} + +static struct acpi_rimt_node *rimt_node_get_id(struct acpi_rimt_node *node, + u32 *id_out, int index) +{ + struct acpi_rimt_platform_device *plat_node; + struct acpi_rimt_pcie_rc *pci_node; + u32 id_mapping_offset, num_id_mapping; + struct acpi_rimt_id_mapping *map; + struct acpi_rimt_node *parent; + + if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX) { + pci_node =3D (struct acpi_rimt_pcie_rc *)&node->node_data; + id_mapping_offset =3D pci_node->id_mapping_offset; + num_id_mapping =3D pci_node->num_id_mappings; + } else if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PLAT_DEVICE) { + plat_node =3D (struct acpi_rimt_platform_device *)&node->node_data; + id_mapping_offset =3D plat_node->id_mapping_offset; + num_id_mapping =3D plat_node->num_id_mappings; + } else { + return NULL; + } + + if (!id_mapping_offset || !num_id_mapping || index >=3D num_id_mapping) + return NULL; + + map =3D ACPI_ADD_PTR(struct acpi_rimt_id_mapping, node, + id_mapping_offset + index * sizeof(*map)); + + /* Firmware bug! */ + if (!map->dest_offset) { + pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n", + node, node->type); + return NULL; + } + + parent =3D ACPI_ADD_PTR(struct acpi_rimt_node, rimt_table, map->dest_offs= et); + + if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PLAT_DEVICE || + node->type =3D=3D ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX) { + *id_out =3D map->dest_offset; + return parent; + } + + return NULL; +} + +static struct acpi_rimt_node *rimt_node_map_id(struct acpi_rimt_node *node, + u32 id_in, u32 *id_out, + u8 type_mask) +{ + struct acpi_rimt_pcie_rc *pci_node; + struct acpi_rimt_platform_device *plat_node; + u32 id =3D id_in; + u32 id_mapping_offset, num_id_mapping; + + /* Parse the ID mapping tree to find specified node type */ + while (node) { + struct acpi_rimt_id_mapping *map; + int i, rc =3D 0; + u32 map_id =3D id; + + if (RIMT_TYPE_MASK(node->type) & type_mask) { + if (id_out) + *id_out =3D id; + return node; + } + + if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX) { + pci_node =3D (struct acpi_rimt_pcie_rc *)&node->node_data; + id_mapping_offset =3D pci_node->id_mapping_offset; + num_id_mapping =3D pci_node->num_id_mappings; + } else if (node->type =3D=3D ACPI_RIMT_NODE_TYPE_PLAT_DEVICE) { + plat_node =3D (struct acpi_rimt_platform_device *)&node->node_data; + id_mapping_offset =3D plat_node->id_mapping_offset; + num_id_mapping =3D plat_node->num_id_mappings; + } else { + goto fail_map; + } + + if (!id_mapping_offset || !num_id_mapping) + goto fail_map; + + map =3D ACPI_ADD_PTR(struct acpi_rimt_id_mapping, node, + id_mapping_offset); + + /* Firmware bug! */ + if (!map->dest_offset) { + pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n", + node, node->type); + goto fail_map; + } + + /* Do the ID translation */ + for (i =3D 0; i < num_id_mapping; i++, map++) { + rc =3D rimt_id_map(map, node->type, map_id, &id); + if (!rc) + break; + } + + if (i =3D=3D num_id_mapping) + goto fail_map; + + node =3D ACPI_ADD_PTR(struct acpi_rimt_node, rimt_table, + rc ? 0 : map->dest_offset); + } + +fail_map: + /* Map input ID to output ID unchanged on mapping failure */ + if (id_out) + *id_out =3D id_in; + + return NULL; +} + +static struct acpi_rimt_node *rimt_node_map_platform_id(struct acpi_rimt_n= ode *node, u32 *id_out, + u8 type_mask, int index) +{ + struct acpi_rimt_node *parent; + u32 id; + + parent =3D rimt_node_get_id(node, &id, index); + if (!parent) + return NULL; + + if (!(RIMT_TYPE_MASK(parent->type) & type_mask)) + parent =3D rimt_node_map_id(parent, id, id_out, type_mask); + else + if (id_out) + *id_out =3D id; + + return parent; +} + +static int rimt_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) +{ + struct rimt_pci_alias_info *info =3D data; + struct acpi_rimt_node *parent; + u32 deviceid; + + parent =3D rimt_node_map_id(info->node, alias, &deviceid, RIMT_IOMMU_TYPE= ); + return rimt_iommu_xlate(info->dev, parent, deviceid); +} + +/* + * RISC-V supports IOMMU as a PCI device or a platform device. + * When it is a platform device, there should be a namespace device as + * well along with RIMT. To create the link between RIMT information and + * the platform device, the IOMMU driver should register itself with the + * RIMT module. This is true for PCI based IOMMU as well. + */ +int rimt_iommu_register(struct device *dev) +{ + struct fwnode_handle *rimt_fwnode; + struct acpi_rimt_node *node; + + node =3D rimt_scan_node(ACPI_RIMT_NODE_TYPE_IOMMU, dev); + if (!node) { + pr_err("Could not find IOMMU node in RIMT\n"); + return -ENODEV; + } + + if (dev_is_pci(dev)) { + rimt_fwnode =3D acpi_alloc_fwnode_static(); + if (!rimt_fwnode) + return -ENOMEM; + + rimt_fwnode->dev =3D dev; + if (!dev->fwnode) + dev->fwnode =3D rimt_fwnode; + + rimt_set_fwnode(node, rimt_fwnode); + } else { + rimt_set_fwnode(node, dev->fwnode); + } + + return 0; +} + +#ifdef CONFIG_IOMMU_API + +static int rimt_plat_iommu_map(struct device *dev, struct acpi_rimt_node *= node) +{ + struct acpi_rimt_node *parent; + int err =3D -ENODEV, i =3D 0; + u32 deviceid =3D 0; + + do { + parent =3D rimt_node_map_platform_id(node, &deviceid, + RIMT_IOMMU_TYPE, + i++); + + if (parent) + err =3D rimt_iommu_xlate(dev, parent, deviceid); + } while (parent && !err); + + return err; +} + +static int rimt_plat_iommu_map_id(struct device *dev, + struct acpi_rimt_node *node, + const u32 *in_id) +{ + struct acpi_rimt_node *parent; + u32 deviceid; + + parent =3D rimt_node_map_id(node, *in_id, &deviceid, RIMT_IOMMU_TYPE); + if (parent) + return rimt_iommu_xlate(dev, parent, deviceid); + + return -ENODEV; +} + +/** + * rimt_iommu_configure_id - Set-up IOMMU configuration for a device. + * + * @dev: device to configure + * @id_in: optional input id const value pointer + * + * Returns: 0 on success, <0 on failure + */ +int rimt_iommu_configure_id(struct device *dev, const u32 *id_in) +{ + struct acpi_rimt_node *node; + int err =3D -ENODEV; + + if (dev_is_pci(dev)) { + struct iommu_fwspec *fwspec; + struct pci_bus *bus =3D to_pci_dev(dev)->bus; + struct rimt_pci_alias_info info =3D { .dev =3D dev }; + + node =3D rimt_scan_node(ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX, &bus->dev= ); + if (!node) + return -ENODEV; + + info.node =3D node; + err =3D pci_for_each_dma_alias(to_pci_dev(dev), + rimt_pci_iommu_init, &info); + + fwspec =3D dev_iommu_fwspec_get(dev); + if (fwspec && rimt_pcie_rc_supports_ats(node)) + fwspec->flags |=3D IOMMU_FWSPEC_PCI_RC_ATS; + } else { + node =3D rimt_scan_node(ACPI_RIMT_NODE_TYPE_PLAT_DEVICE, dev); + if (!node) + return -ENODEV; + + err =3D id_in ? rimt_plat_iommu_map_id(dev, node, id_in) : + rimt_plat_iommu_map(dev, node); + } + + return err; +} + +#else +int rimt_iommu_configure_id(struct device *dev, const u32 *id_in) +{ + return -ENODEV; +} +#endif + +void __init riscv_acpi_rimt_init(void) +{ + acpi_status status; + + /* rimt_table will be used at runtime after the rimt init, + * so we don't need to call acpi_put_table() to release + * the RIMT table mapping. + */ + status =3D acpi_get_table(ACPI_SIG_RIMT, 0, &rimt_table); + if (ACPI_FAILURE(status)) { + if (status !=3D AE_NOT_FOUND) { + const char *msg =3D acpi_format_exception(status); + + pr_err("Failed to get table, %s\n", msg); + } + + return; + } +} diff --git a/include/linux/acpi_rimt.h b/include/linux/acpi_rimt.h new file mode 100644 index 000000000000..ce4d136d4f81 --- /dev/null +++ b/include/linux/acpi_rimt.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2024-2025, Ventana Micro Systems Inc. + * Author: Sunil V L + */ + +#ifndef _ACPI_RIMT_H +#define _ACPI_RIMT_H + +#ifdef CONFIG_ACPI_RIMT +int rimt_iommu_configure_id(struct device *dev, const u32 *id_in); + +int rimt_iommu_register(struct device *dev); +#else +static inline int rimt_iommu_register(struct device *dev) +{ + return -ENODEV; +} + +static inline int rimt_iommu_configure_id(struct device *dev, const u32 *i= d_in) +{ + return -ENODEV; +} +#endif + +#endif /* _ACPI_RIMT_H */ --=20 2.43.0 From nobody Wed Oct 8 10:05:52 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 A0C2F1C84D5 for ; Mon, 30 Jun 2025 03:48:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255305; cv=none; b=s0STLpv51yax/8MMv41bpQjFdX54egmIS9+q9WPvlArsBi7j+HhkM2b40PKyzlwsSlJBTfbxg96BmpT8EIZ3/yttKl9JnFP4rhbsW44FDIRR3AxAHH/D9M6QfoRvEn5bcM52LgsLnKyjNnJHv8yDvL/K8CwSCzHoUAwTgwfPYx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255305; c=relaxed/simple; bh=rcXB8sUVYbgV/LLd1eTDWsHjfWUpMTfAU5sX2LEsSqU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iNOw7bpDbEbt7hRa/BB/YE3Q7Xx84tGRo2dt504OGe2VyFqQej5NSOx8pwWmtpI/j9m/GTQS5Otgq4gL0ElPcOs/t7/DtieVuOeRihRplL5A2y4lIhuK01bHVkOqwqjFnlIXVME1PRv7BjvWdb43IioS1vuFj11+W2u3hqidCuU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=nGQu5xHB; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="nGQu5xHB" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-742c7a52e97so4179976b3a.3 for ; Sun, 29 Jun 2025 20:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1751255302; x=1751860102; 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=ri1e7xvqfD1xJqzMHYa8cxstKVT8liDfwJUs4Nyy/QU=; b=nGQu5xHBdZu4RrFpUhYeQ/5dMhpGrfKrQP2iW+7NPkBOchXxwuZD5CPD2c9zPVDozB wosV4xwdpBqfw3Z3eoPEffFj1H0OdoFKSKTotfdKi5rqIZLaJPMwOadlseplTD8D2Fti 5H1ND4pVynUNR0RGuQv6KKWtH1Q/4IoMjBgdhb13pNNEznd/FDCsHUrHMU5zzkeRbI0O 0oJaWz8f0iS77bnyUeJDnoxFJuPdsoo4K9zixFatCgt8VjRNnbSKseQE3VHBI4k83zDO BdT9Sy1VotZWjOItxHlNPAmJgxkrU2I9fgqiWlyjCMmLkDWPTtiAGK3Eb0DVWw496NHo FFxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751255302; x=1751860102; 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=ri1e7xvqfD1xJqzMHYa8cxstKVT8liDfwJUs4Nyy/QU=; b=FGF235qU9RIPzraN0L9eS8dmhOAvqNHbyb3yO2SS+JLlnI3d5XkQKIeztN53djW8kh 3QhMvMnZ5xveZ2ett9DrNSC9EBK7hAdic48JbpZaLTElftejC3+ZHooUPhXHgXg7gC0+ CKZHBKeV8PDqpOtRt7phIM/Wnvc24JRa38JyGxbf/lhtfuM8UsiOXDzpCXitkzKRfCIi lS+lmqkGTBeI4bkPpE5ZEfFLWoGINDjFasP06WSsepnW9RYO0rsnDcAArsA3kum3oPke RTzsbi6bmtcDxfOWX6ouCCP5Qv/rW8xnLK7rzVwoiikfWUCg8GUrWNDsrAbXCSE3M5tk OBdw== X-Gm-Message-State: AOJu0YyV+w6oIJVTYKB3W13X0tuBEs8pCjXdlA1KQyHngwWhvirfBmFd 8gnRjWWxvIvZlZTisVHkMpVKYo2WeViECCyiQRO7ZzJTaxp/Oa4jvpgrZ/GtJ0+HA3g5Ba/gUsP mLFkc X-Gm-Gg: ASbGncs02IuxomSUHH/4PzKLZITYyCzrUQq4FhbMlJ3i8ZAmFcvhqu8ixn+65NsV6LV TSNrxdTsLjlWS8nZHCFiOS5hV3aW4aHiYxsCNeXCSV29+BZ+JebtsFvHW81uDsZENkQM1rvBeyp G8pIhjYJJb7YmKeEjfui6H8e4XCWUZhz86SrCueMeQNaZg1NUuvVcNoCrb+aZuujP637Vv4IqGG Z8QYRT3UvQapv6HY5xq0jjpksSom3ksUmsxBtEwD1u9tud4+9RIckInoJE0Xzl+rLv00odBnRyN suClSvI4jdt9/x0U6Uq+hy4nkKqh17xFHM3ob+/G7TRbccmiqFGgHKRvyT4Z6PRBhpaXVBd3 X-Google-Smtp-Source: AGHT+IG71WwVUzest/mJtvn+9x2w5xMiAsY0zQAJe8GnER+ZaxhJXmmKNzdMlkrBD48ocwYkdyfatg== X-Received: by 2002:a05:6a00:1813:b0:746:2591:e531 with SMTP id d2e1a72fcca58-74af6f081c9mr17099430b3a.12.1751255302416; Sun, 29 Jun 2025 20:48:22 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.195.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af57efaecsm7837862b3a.161.2025.06.29.20.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 20:48:21 -0700 (PDT) From: Sunil V L To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux.dev Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , "Rafael J . Wysocki" , Len Brown , Tomasz Jeznach , Joerg Roedel , Will Deacon , Robin Murphy , Anup Patel , Atish Patra , Andrew Jones , Sunil V L , "Rafael J . Wysocki" Subject: [PATCH v3 2/3] ACPI: scan: Add support for RISC-V in acpi_iommu_configure_id() Date: Mon, 30 Jun 2025 09:18:02 +0530 Message-ID: <20250630034803.1611262-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630034803.1611262-1-sunilvl@ventanamicro.com> References: <20250630034803.1611262-1-sunilvl@ventanamicro.com> 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" acpi_iommu_configure_id() currently supports only IORT (ARM) and VIOT. Add support for RISC-V as well. Signed-off-by: Sunil V L Acked-by: Rafael J. Wysocki --- drivers/acpi/scan.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index fb1fe9f3b1a3..70f57d58fd61 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -1628,8 +1629,12 @@ static int acpi_iommu_configure_id(struct device *de= v, const u32 *id_in) } =20 err =3D iort_iommu_configure_id(dev, id_in); - if (err && err !=3D -EPROBE_DEFER) - err =3D viot_iommu_configure(dev); + if (err && err !=3D -EPROBE_DEFER) { + err =3D rimt_iommu_configure_id(dev, id_in); + if (err && err !=3D -EPROBE_DEFER) + err =3D viot_iommu_configure(dev); + } + mutex_unlock(&iommu_probe_device_lock); =20 return err; --=20 2.43.0 From nobody Wed Oct 8 10:05:52 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 C0C671DED77 for ; Mon, 30 Jun 2025 03:48:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255310; cv=none; b=BsqLkOEAZ+kAy7Dzlthh0Wcid95tZIwNzlw9B3V/55LipAvdp7KjA/3F0tlIL1CKG5zNYefsiVG1kUSR3tqeBafV0A/HZRHBhyFwE3Cgi6OTBzEpEeAmKN29arhWQroRwTgb9NBZwPBTPuSkBr+Y43HwlbAzWqhoKPyD7oUcfkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751255310; c=relaxed/simple; bh=zBDL8jl2yYKCOKeT2sHBQjAT4aZWYWRMcZe2xu7lPsQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JUiliojstdRp7Rhd5aLkQ8nMyqDiHpTOun58ana5nyAe8rGSOLgaBD/b6KIuvrgT27RySUaDs6xR4Tq63o/7AOzt1JSH8/9VVZ+diBl1WngPAFZvmATCJVw/dwA4BqoBc/yKzq84GGPMlgB8xdv9tXJ8dwaZxcw7j3i/3b1hx1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=S/eNlpek; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="S/eNlpek" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-747fc7506d4so1407173b3a.0 for ; Sun, 29 Jun 2025 20:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1751255307; x=1751860107; 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=FFQsxLCkN/yrCHNlyEV/dF68pPJedJM8kd/qOCB51Kk=; b=S/eNlpekPy0hj6/Z5XwIYAJf6mYX1syJVcYTP60MjttTTDOqqnwiJ7xZgXLG58XTCT +V7yQGv/zzbSDHvIe3Y5hySJs0ZMqquBf5jREQ0Exg5utfi/59uO2nG1o3uNWNYyXdwM gPaB0zCcpLoPzyTOhcZbOpkDU1THPqN64qArEvfv4Le1RUwAjz6cNYGcjHaqnvBXH1DW 8w44zKXQPqIakgJqLogb3BPBCcr5xB23cC2zBzxIvol0mxIlYk8CnLdAaQdLQW7oO9kp jH57FILayuDEWxkfJc87xMNlvZsCMmuO2j5SeqC1V/ylQ3ogXPdT1xv59tXj0/tKYMLQ 9+bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751255307; x=1751860107; 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=FFQsxLCkN/yrCHNlyEV/dF68pPJedJM8kd/qOCB51Kk=; b=dZt9LW8Gby5oTB3YEfqnaSo8XKgCnOPnJErzinTdRG5n2lKRaFTF9sAJhXX9unrO+z neyVSP49OzP2xUkM89riOVrZE5iAHnWH/sAetpUf+Gfa/dISOQPa8cpjowithp9UXaSa P3s6QlrRN92+nUQHra9zeVNTYQSizJyc1o8mAU0T83B1qGY591iXCj4+NAc37sQl844K KYhnUSqq2F6xPSF3dvBxclut1Lj9zQvS9/wbyFavM1rLBubOBqxYtgQBiob1mvpNMwAM GUEYTJNoiZaH7DAOmpLYRzpK7tkfMgtaehyTW/JHQBSmC7eDKbrPtQWnuFSVyMNJjsSL pVDg== X-Gm-Message-State: AOJu0YwHIW5XOVLR0t/mBki+nFyDefyw/cB6Kpiz5tFQ7DpNmgTzs79T mnHsJ/Gj1iinUuqjuXi/brqBG9iPdgGUU0WIb/cl3PRxMNHGpSeZXAfMRBH08mWWxNmdRTKQDbQ BPXoE X-Gm-Gg: ASbGncs1ht/9JNIav7V7VGlZ07Ux14Wxm0pMzqyhZwanx+gqAMrNVj9X7fUGUpqhxq6 8+ieNBxaE/GbRy29DR8PqhgSL9P2cOcT7lDeWlWq83tnhYk75RaSsYGoUmbtbedNZB2WGTJ8mCK EYF56Y9juezGIRg1nwbsOb3Il9N3hDoq7sg/PRkIhdqrr1sFWh60V6kVUVqhZFtPggYCiNhv1eH 9ytCDwBWXtobQwQvc6+d1pOEfBWqB5bFJpTdfCxJ9D5C6AN5q+eYyBhfNzyisjX650BpY4QLu0M nxc+OlQ9eDCKwU5u2I4jYJiJLf7vpeuXW5IiMOfR3W83hzWkKBDb36khKbkNQt3leRFW1NN1 X-Google-Smtp-Source: AGHT+IHpHBjPFAAATJQptsjtLS2j6ZPZrkAWrRRMr3WRaNURjmZvw7lQa5uyyPBco66LK582kKThmA== X-Received: by 2002:a05:6a00:b4b:b0:73d:fa54:afb9 with SMTP id d2e1a72fcca58-74af6eab8cbmr16901576b3a.7.1751255307612; Sun, 29 Jun 2025 20:48:27 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.195.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af57efaecsm7837862b3a.161.2025.06.29.20.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 20:48:27 -0700 (PDT) From: Sunil V L To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux.dev Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , "Rafael J . Wysocki" , Len Brown , Tomasz Jeznach , Joerg Roedel , Will Deacon , Robin Murphy , Anup Patel , Atish Patra , Andrew Jones , Sunil V L Subject: [PATCH v3 3/3] iommu/riscv: Add ACPI support Date: Mon, 30 Jun 2025 09:18:03 +0530 Message-ID: <20250630034803.1611262-4-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630034803.1611262-1-sunilvl@ventanamicro.com> References: <20250630034803.1611262-1-sunilvl@ventanamicro.com> 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" RISC-V IO Mapping Table (RIMT) provides the information about the IOMMU to the OS in ACPI. Add support for ACPI in RISC-V IOMMU drivers by using RIMT data. The changes at high level are, a) Register the IOMMU with RIMT data structures. b) Enable probing of platform IOMMU in ACPI way using the ACPIID defined for the RISC-V IOMMU in the BRS spec [1]. Configure the MSI domain if the platform IOMMU uses MSIs. [1] - https://github.com/riscv-non-isa/riscv-brs/blob/main/acpi-id.adoc Signed-off-by: Sunil V L Reviewed-by: Andrew Jones --- drivers/iommu/riscv/iommu-platform.c | 17 ++++++++++++++++- drivers/iommu/riscv/iommu.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/riscv/iommu-platform.c b/drivers/iommu/riscv/iom= mu-platform.c index 725e919b97ef..83a28c83f991 100644 --- a/drivers/iommu/riscv/iommu-platform.c +++ b/drivers/iommu/riscv/iommu-platform.c @@ -10,6 +10,8 @@ * Tomasz Jeznach */ =20 +#include +#include #include #include #include @@ -46,6 +48,7 @@ static int riscv_iommu_platform_probe(struct platform_dev= ice *pdev) enum riscv_iommu_igs_settings igs; struct device *dev =3D &pdev->dev; struct riscv_iommu_device *iommu =3D NULL; + struct irq_domain *msi_domain; struct resource *res =3D NULL; int vec, ret; =20 @@ -76,8 +79,13 @@ static int riscv_iommu_platform_probe(struct platform_de= vice *pdev) switch (igs) { case RISCV_IOMMU_CAPABILITIES_IGS_BOTH: case RISCV_IOMMU_CAPABILITIES_IGS_MSI: - if (is_of_node(dev->fwnode)) + if (is_of_node(dev_fwnode(dev))) { of_msi_configure(dev, to_of_node(dev->fwnode)); + } else { + msi_domain =3D irq_find_matching_fwnode(imsic_acpi_get_fwnode(dev), + DOMAIN_BUS_PLATFORM_MSI); + dev_set_msi_domain(dev, msi_domain); + } =20 if (!dev_get_msi_domain(dev)) { dev_warn(dev, "failed to find an MSI domain\n"); @@ -150,6 +158,12 @@ static const struct of_device_id riscv_iommu_of_match[= ] =3D { {}, }; =20 +static const struct acpi_device_id riscv_iommu_acpi_match[] =3D { + { "RSCV0004", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, riscv_iommu_acpi_match); + static struct platform_driver riscv_iommu_platform_driver =3D { .probe =3D riscv_iommu_platform_probe, .remove =3D riscv_iommu_platform_remove, @@ -158,6 +172,7 @@ static struct platform_driver riscv_iommu_platform_driv= er =3D { .name =3D "riscv,iommu", .of_match_table =3D riscv_iommu_of_match, .suppress_bind_attrs =3D true, + .acpi_match_table =3D riscv_iommu_acpi_match, }, }; =20 diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c index bb57092ca901..45a263c9e0d5 100644 --- a/drivers/iommu/riscv/iommu.c +++ b/drivers/iommu/riscv/iommu.c @@ -12,6 +12,8 @@ =20 #define pr_fmt(fmt) "riscv-iommu: " fmt =20 +#include +#include #include #include #include @@ -1651,6 +1653,14 @@ int riscv_iommu_init(struct riscv_iommu_device *iomm= u) goto err_iodir_off; } =20 + if (!acpi_disabled) { + rc =3D rimt_iommu_register(iommu->dev); + if (rc) { + dev_err_probe(iommu->dev, rc, "cannot register iommu with RIMT\n"); + goto err_remove_sysfs; + } + } + rc =3D iommu_device_register(&iommu->iommu, &riscv_iommu_ops, iommu->dev); if (rc) { dev_err_probe(iommu->dev, rc, "cannot register iommu interface\n"); --=20 2.43.0