[RFC PATCH v3 10/14] iommu/riscv: Add IRQ domain for interrupt remapping
Andrew Jones
andrew.jones at oss.qualcomm.com
Mon Sep 28 07:31:09 PDT 2026
Create a per-IOMMU MSI parent irqdomain as the hierarchy hook for
future interrupt remapping. The remapping tables will be owned by the
attached paging domain since the MSI mappings live in its MSI table.
The IRQ domain is created lazily from probe_device(), installed on
eligible devices for their managed lifetime, and removed with the
physical IOMMU. This is only the initial skeleton: it does not remap
interrupts yet, and non-paging IOMMU domains will fall back to the raw
IMSIC physical address when remapping is added.
Signed-off-by: Andrew Jones <andrew.jones at oss.qualcomm.com>
---
drivers/iommu/riscv/Makefile | 1 +
drivers/iommu/riscv/iommu-ir.c | 148 ++++++++++++++++++++++++
drivers/iommu/riscv/iommu.c | 25 ++--
drivers/iommu/riscv/iommu.h | 36 ++++++
drivers/irqchip/irq-riscv-imsic-state.c | 6 +
include/linux/irqchip/riscv-imsic.h | 8 ++
6 files changed, 213 insertions(+), 11 deletions(-)
create mode 100644 drivers/iommu/riscv/iommu-ir.c
diff --git a/drivers/iommu/riscv/Makefile b/drivers/iommu/riscv/Makefile
index b5929f9f23e6..891810146fce 100644
--- a/drivers/iommu/riscv/Makefile
+++ b/drivers/iommu/riscv/Makefile
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += iommu.o iommu-platform.o
obj-$(CONFIG_RISCV_IOMMU_PCI) += iommu-pci.o
+obj-$(CONFIG_RISCV_IMSIC) += iommu-ir.o
diff --git a/drivers/iommu/riscv/iommu-ir.c b/drivers/iommu/riscv/iommu-ir.c
new file mode 100644
index 000000000000..c5603cb9f258
--- /dev/null
+++ b/drivers/iommu/riscv/iommu-ir.c
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * IOMMU Interrupt Remapping
+ *
+ * Copyright (c) 2026 Qualcomm Technologies, Inc.
+ */
+#include <linux/cleanup.h>
+#include <linux/irqchip/riscv-imsic.h>
+#include <linux/msi.h>
+#include <linux/slab.h>
+
+#include "iommu.h"
+
+static struct irq_chip riscv_iommu_ir_irq_chip = {
+ .name = "IOMMU-IR",
+ .irq_ack = irq_chip_ack_parent,
+ .irq_mask = irq_chip_mask_parent,
+ .irq_unmask = irq_chip_unmask_parent,
+ .irq_set_affinity = irq_chip_set_affinity_parent,
+};
+
+static int riscv_iommu_ir_irq_domain_alloc_irqs(struct irq_domain *irqdomain,
+ unsigned int irq_base, unsigned int nr_irqs,
+ void *arg)
+{
+ int ret;
+
+ ret = irq_domain_alloc_irqs_parent(irqdomain, irq_base, nr_irqs, arg);
+ if (ret)
+ return ret;
+
+ for (unsigned int i = 0; i < nr_irqs; i++) {
+ ret = irq_domain_set_hwirq_and_chip(irqdomain, irq_base + i,
+ irq_base + i,
+ &riscv_iommu_ir_irq_chip, NULL);
+ if (ret) {
+ irq_domain_free_irqs_parent(irqdomain, irq_base, nr_irqs);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static const struct irq_domain_ops riscv_iommu_ir_irq_domain_ops = {
+ .alloc = riscv_iommu_ir_irq_domain_alloc_irqs,
+ .free = irq_domain_free_irqs_parent,
+};
+
+static const struct msi_parent_ops riscv_iommu_ir_msi_parent_ops = {
+ .prefix = "IR-",
+ .supported_flags = MSI_GENERIC_FLAGS_MASK |
+ MSI_FLAG_PCI_MSIX,
+ .required_flags = MSI_FLAG_USE_DEF_DOM_OPS |
+ MSI_FLAG_USE_DEF_CHIP_OPS |
+ MSI_FLAG_PCI_MSI_MASK_PARENT,
+ .chip_flags = MSI_CHIP_FLAG_SET_ACK,
+ .init_dev_msi_info = msi_parent_init_dev_msi_info,
+};
+
+static struct irq_domain *riscv_iommu_ir_irq_domain_create(struct riscv_iommu_device *iommu,
+ struct irq_domain *irqparent)
+{
+ char *fwname __free(kfree) = NULL;
+ struct irq_domain *irqdomain;
+ struct fwnode_handle *fn;
+
+ fwname = kasprintf(GFP_KERNEL, "IOMMU-IR-%s", dev_name(iommu->dev));
+ if (!fwname)
+ return ERR_PTR(-ENOMEM);
+
+ fn = irq_domain_alloc_named_fwnode(fwname);
+ if (!fn)
+ return ERR_PTR(-ENOMEM);
+
+ irqdomain = irq_domain_create_hierarchy(irqparent, 0, 0, fn,
+ &riscv_iommu_ir_irq_domain_ops, iommu);
+ if (!irqdomain) {
+ irq_domain_free_fwnode(fn);
+ return ERR_PTR(-ENOMEM);
+ }
+
+ /*
+ * The RISC-V IOMMU doesn't validate MSI data, so we can't set
+ * IRQ_DOMAIN_FLAG_ISOLATED_MSI. The means VFIO requires its
+ * allow_unsafe_interrupts module parameter.
+ */
+ irqdomain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
+ irqdomain->msi_parent_ops = &riscv_iommu_ir_msi_parent_ops;
+ irq_domain_update_bus_token(irqdomain, DOMAIN_BUS_MSI_REMAP);
+
+ return irqdomain;
+}
+
+void riscv_iommu_ir_irq_domain_remove(struct riscv_iommu_device *iommu)
+{
+ struct irq_domain *irqdomain = iommu->irqdomain;
+ struct fwnode_handle *fn;
+
+ if (!irqdomain)
+ return;
+
+ fn = irqdomain->fwnode;
+ irq_domain_remove(irqdomain);
+ iommu->irqdomain = NULL;
+ irq_domain_free_fwnode(fn);
+}
+
+int riscv_iommu_ir_probe_device(struct riscv_iommu_device *iommu, struct device *dev,
+ struct riscv_iommu_info *info)
+{
+ struct irq_domain *msi_parent = dev_get_msi_domain(iommu->dev);
+ struct irq_domain *irqdomain;
+
+ info->old_msi_parent = NULL;
+
+ if (iommu->fctl & RISCV_IOMMU_FCTL_WSI)
+ msi_parent = imsic_get_base_domain();
+ else if (!imsic_dev_has_imsic_msi_parent(iommu->dev))
+ return 0;
+
+ if (!msi_parent || dev_get_msi_domain(dev) != msi_parent)
+ return 0;
+
+ irqdomain = iommu->irqdomain;
+ if (!irqdomain) {
+ irqdomain = riscv_iommu_ir_irq_domain_create(iommu, msi_parent);
+ if (IS_ERR(irqdomain))
+ return PTR_ERR(irqdomain);
+ iommu->irqdomain = irqdomain;
+ } else if (irqdomain->parent != msi_parent) {
+ return 0;
+ }
+
+ if (!device_link_add(dev, iommu->dev, DL_FLAG_AUTOREMOVE_SUPPLIER))
+ return -ENODEV;
+
+ info->old_msi_parent = msi_parent;
+ dev_set_msi_domain(dev, irqdomain);
+
+ return 0;
+}
+
+void riscv_iommu_ir_release_device(struct device *dev, struct riscv_iommu_info *info)
+{
+ if (info->old_msi_parent)
+ dev_set_msi_domain(dev, info->old_msi_parent);
+}
diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c
index db4539fbcb95..7a8b40d311ea 100644
--- a/drivers/iommu/riscv/iommu.c
+++ b/drivers/iommu/riscv/iommu.c
@@ -869,13 +869,6 @@ PT_IOMMU_CHECK_DOMAIN(struct riscv_iommu_domain, riscvpt.iommu, domain);
#define iommu_domain_to_riscv(iommu_domain) \
container_of(iommu_domain, struct riscv_iommu_domain, domain)
-/* Private IOMMU data for managed devices, dev_iommu_priv_* */
-struct riscv_iommu_info {
- struct riscv_iommu_domain *domain;
- struct riscv_iommu_dc dc;
- unsigned int nr_forwarded_irqs;
-};
-
static struct riscv_iommu_msi_table *riscv_iommu_domain_msi_table(struct iommu_domain *iommu_domain)
{
struct riscv_iommu_domain *domain;
@@ -1465,13 +1458,15 @@ static bool riscv_iommu_iohgatp_supported(struct riscv_iommu_device *iommu,
}
static int riscv_iommu_msi_table_alloc(struct riscv_iommu_domain *domain,
- struct riscv_iommu_device *iommu)
+ struct riscv_iommu_device *iommu,
+ struct riscv_iommu_info *info)
{
struct riscv_iommu_msi_table *msi_table = &domain->msi_table;
struct riscv_iommu_msipte *root;
size_t size;
- if (!(iommu->caps & RISCV_IOMMU_CAPABILITIES_MSI_FLAT))
+ if (!(iommu->caps & RISCV_IOMMU_CAPABILITIES_MSI_FLAT) ||
+ !riscv_iommu_ir_device_enabled(info))
return 0;
guard(mutex)(&domain->mutex);
@@ -1544,7 +1539,7 @@ static int riscv_iommu_attach_paging_domain(struct iommu_domain *iommu_domain,
if (!riscv_iommu_iohgatp_supported(iommu, pt_info.iohgatp_mode))
return -ENODEV;
- ret = riscv_iommu_msi_table_alloc(domain, iommu);
+ ret = riscv_iommu_msi_table_alloc(domain, iommu, info);
if (ret)
return ret;
@@ -1811,8 +1806,8 @@ static struct iommu_device *riscv_iommu_probe_device(struct device *dev)
struct riscv_iommu_device *iommu;
struct riscv_iommu_info *info;
struct riscv_iommu_dc *dc;
+ int i, ret;
u64 tc;
- int i;
if (!fwspec || !fwspec->iommu_fwnode->dev || !fwspec->num_ids)
return ERR_PTR(-ENODEV);
@@ -1847,6 +1842,12 @@ static struct iommu_device *riscv_iommu_probe_device(struct device *dev)
WRITE_ONCE(dc->tc, tc);
}
+ ret = riscv_iommu_ir_probe_device(iommu, dev, info);
+ if (ret) {
+ kfree(info);
+ return ERR_PTR(ret);
+ }
+
dev_iommu_priv_set(dev, info);
return &iommu->iommu;
@@ -1856,6 +1857,7 @@ static void riscv_iommu_release_device(struct device *dev)
{
struct riscv_iommu_info *info = dev_iommu_priv_get(dev);
+ riscv_iommu_ir_release_device(dev, info);
kfree_rcu_mightsleep(info);
}
@@ -1950,6 +1952,7 @@ void riscv_iommu_remove(struct riscv_iommu_device *iommu)
riscv_iommu_iodir_set_mode(iommu, RISCV_IOMMU_DDTP_IOMMU_MODE_OFF);
riscv_iommu_queue_disable(&iommu->cmdq);
riscv_iommu_queue_disable(&iommu->fltq);
+ riscv_iommu_ir_irq_domain_remove(iommu);
}
int riscv_iommu_init(struct riscv_iommu_device *iommu)
diff --git a/drivers/iommu/riscv/iommu.h b/drivers/iommu/riscv/iommu.h
index deb57b6a6c4b..4c1c681ba2a2 100644
--- a/drivers/iommu/riscv/iommu.h
+++ b/drivers/iommu/riscv/iommu.h
@@ -15,6 +15,7 @@
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/iopoll.h>
+#include <linux/irqdomain.h>
#include <linux/sizes.h>
#include "iommu-bits.h"
@@ -23,6 +24,7 @@
#define RISCV_IOMMU_MSI_IOVA_BASE SZ_16M
struct riscv_iommu_device;
+struct riscv_iommu_domain;
struct riscv_iommu_queue {
atomic_t prod; /* unbounded producer allocation index */
@@ -66,6 +68,9 @@ struct riscv_iommu_device {
unsigned int ddt_mode;
dma_addr_t ddt_phys;
u64 *ddt_root;
+
+ /* MSI remapping */
+ struct irq_domain *irqdomain;
};
struct riscv_iommu_msi_table {
@@ -78,6 +83,19 @@ struct riscv_iommu_msi_table {
u64 msi_addr_pattern;
};
+/* Private IOMMU data for managed devices, dev_iommu_priv_* */
+struct riscv_iommu_info {
+ struct riscv_iommu_domain *domain;
+ struct riscv_iommu_dc dc;
+ struct irq_domain *old_msi_parent;
+ unsigned int nr_forwarded_irqs;
+};
+
+static inline bool riscv_iommu_ir_device_enabled(const struct riscv_iommu_info *info)
+{
+ return info->old_msi_parent != NULL;
+}
+
int riscv_iommu_init(struct riscv_iommu_device *iommu);
void riscv_iommu_remove(struct riscv_iommu_device *iommu);
void riscv_iommu_disable(struct riscv_iommu_device *iommu);
@@ -86,6 +104,24 @@ void riscv_iommu_msi_table_inval(struct riscv_iommu_msi_table *msi_table, unsign
void riscv_iommu_msi_table_inval_all(struct riscv_iommu_msi_table *msi_table);
void riscv_iommu_msi_table_update(struct riscv_iommu_msi_table *msi_table, bool activate);
+#ifdef CONFIG_RISCV_IMSIC
+void riscv_iommu_ir_irq_domain_remove(struct riscv_iommu_device *iommu);
+int riscv_iommu_ir_probe_device(struct riscv_iommu_device *iommu, struct device *dev,
+ struct riscv_iommu_info *info);
+void riscv_iommu_ir_release_device(struct device *dev, struct riscv_iommu_info *info);
+#else
+static inline void riscv_iommu_ir_irq_domain_remove(struct riscv_iommu_device *iommu) { }
+static inline int riscv_iommu_ir_probe_device(struct riscv_iommu_device *iommu,
+ struct device *dev,
+ struct riscv_iommu_info *info)
+{
+ info->old_msi_parent = NULL;
+ return 0;
+}
+static inline void riscv_iommu_ir_release_device(struct device *dev,
+ struct riscv_iommu_info *info) { }
+#endif
+
#define riscv_iommu_readl(iommu, addr) \
readl_relaxed((iommu)->reg + (addr))
diff --git a/drivers/irqchip/irq-riscv-imsic-state.c b/drivers/irqchip/irq-riscv-imsic-state.c
index abd1cdb640ea..0e6c86840242 100644
--- a/drivers/irqchip/irq-riscv-imsic-state.c
+++ b/drivers/irqchip/irq-riscv-imsic-state.c
@@ -64,6 +64,12 @@ const struct imsic_global_config *imsic_get_global_config(void)
}
EXPORT_SYMBOL_GPL(imsic_get_global_config);
+struct irq_domain *imsic_get_base_domain(void)
+{
+ return imsic ? imsic->base_domain : NULL;
+}
+EXPORT_SYMBOL_GPL(imsic_get_base_domain);
+
/**
* imsic_dev_has_imsic_msi_parent - Check for an IMSIC MSI parent
* @dev: Device to check
diff --git a/include/linux/irqchip/riscv-imsic.h b/include/linux/irqchip/riscv-imsic.h
index d024a6524baa..02a836ce03b4 100644
--- a/include/linux/irqchip/riscv-imsic.h
+++ b/include/linux/irqchip/riscv-imsic.h
@@ -11,6 +11,8 @@
#include <linux/device.h>
#include <linux/fwnode.h>
+struct irq_domain;
+
#define IMSIC_MMIO_PAGE_SHIFT 12
#define IMSIC_MMIO_PAGE_SZ BIT(IMSIC_MMIO_PAGE_SHIFT)
#define IMSIC_MMIO_PAGE_LE 0x00
@@ -81,6 +83,7 @@ struct imsic_global_config {
#ifdef CONFIG_RISCV_IMSIC
const struct imsic_global_config *imsic_get_global_config(void);
+struct irq_domain *imsic_get_base_domain(void);
bool imsic_dev_has_imsic_msi_parent(struct device *dev);
#else
@@ -90,6 +93,11 @@ static inline const struct imsic_global_config *imsic_get_global_config(void)
return NULL;
}
+static inline struct irq_domain *imsic_get_base_domain(void)
+{
+ return NULL;
+}
+
static inline bool imsic_dev_has_imsic_msi_parent(struct device *dev)
{
return false;
--
2.43.0
More information about the linux-riscv
mailing list