[RFC PATCH v3 07/14] iommu/riscv: Prepare MSI table updates for interrupt remapping
Andrew Jones
andrew.jones at oss.qualcomm.com
Mon Sep 28 07:31:06 PDT 2026
Guest interrupt-file mappings require interrupt-remapping code to
install or remove the MSI page-table pointer and address extraction
fields in every device context attached to a domain. Devices joining an
active MSI domain also need their device contexts initialized, so check
for an active MSI domain at attach time.
Add helpers to publish those fields to bonded devices and to invalidate
one or all MSI PTE translations. These helpers will be used by the IRQ
bypass implementation.
The per-device nr_forwarded_irqs counter is insufficient to detect
active MSI tables for the domain, so we introduce another counter which
is domain-wide. Like info->nr_forwarded_irqs, later patches which
introduce interrupt remapping support will manage the newly introduced
nr_forwarded_irqs counter.
Signed-off-by: Andrew Jones <andrew.jones at oss.qualcomm.com>
---
drivers/iommu/riscv/iommu.c | 65 +++++++++++++++++++++++++++++++++++++
drivers/iommu/riscv/iommu.h | 5 +++
2 files changed, 70 insertions(+)
diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c
index 86d5795a12dd..db4539fbcb95 100644
--- a/drivers/iommu/riscv/iommu.c
+++ b/drivers/iommu/riscv/iommu.c
@@ -1189,6 +1189,28 @@ static void riscv_iommu_iotlb_inval(struct riscv_iommu_domain *domain,
rcu_read_unlock();
}
+void riscv_iommu_msi_table_inval(struct riscv_iommu_msi_table *msi_table, unsigned long addr)
+{
+ struct iommu_iotlb_gather gather = {
+ .start = addr,
+ .end = addr + SZ_4K - 1,
+ .pt.leaf_levels_bitmap = 1,
+ };
+ struct riscv_iommu_domain *domain;
+
+ domain = container_of(msi_table, struct riscv_iommu_domain, msi_table);
+ riscv_iommu_iotlb_inval(domain, &gather);
+}
+
+void riscv_iommu_msi_table_inval_all(struct riscv_iommu_msi_table *msi_table)
+{
+ struct iommu_iotlb_gather gather = { 0 };
+ struct riscv_iommu_domain *domain;
+
+ domain = container_of(msi_table, struct riscv_iommu_domain, msi_table);
+ riscv_iommu_iotlb_inval(domain, &gather);
+}
+
#define RISCV_IOMMU_FSC_BARE 0
/*
* This function sends IOTINVAL commands as required by the RISC-V
@@ -1311,6 +1333,11 @@ static void riscv_iommu_iodir_update(struct device *dev, struct riscv_iommu_dc *
WRITE_ONCE(dc->fsc, new_dc->fsc);
WRITE_ONCE(dc->ta, new_dc->ta & RISCV_IOMMU_PC_TA_PSCID);
WRITE_ONCE(dc->iohgatp, new_dc->iohgatp);
+ if (iommu->caps & RISCV_IOMMU_CAPABILITIES_MSI_FLAT) {
+ WRITE_ONCE(dc->msiptp, new_dc->msiptp);
+ WRITE_ONCE(dc->msi_addr_mask, new_dc->msi_addr_mask);
+ WRITE_ONCE(dc->msi_addr_pattern, new_dc->msi_addr_pattern);
+ }
/* Update device context, write TC.V as the last step. */
dma_wmb();
WRITE_ONCE(dc->tc, tc);
@@ -1329,6 +1356,40 @@ static void riscv_iommu_iodir_update(struct device *dev, struct riscv_iommu_dc *
riscv_iommu_cmd_sync(iommu, RISCV_IOMMU_IOTINVAL_TIMEOUT);
}
+static void riscv_iommu_msi_table_set_dc(struct riscv_iommu_msi_table *msi_table,
+ struct riscv_iommu_dc *dc, bool activate)
+{
+ if (activate) {
+ dc->msiptp = virt_to_pfn(msi_table->root) |
+ FIELD_PREP(RISCV_IOMMU_DC_MSIPTP_MODE,
+ RISCV_IOMMU_DC_MSIPTP_MODE_FLAT);
+ dc->msi_addr_mask = msi_table->msi_addr_mask;
+ dc->msi_addr_pattern = msi_table->msi_addr_pattern;
+ } else {
+ dc->msiptp = 0;
+ dc->msi_addr_mask = 0;
+ dc->msi_addr_pattern = 0;
+ }
+}
+
+void riscv_iommu_msi_table_update(struct riscv_iommu_msi_table *msi_table, bool activate)
+{
+ struct riscv_iommu_domain *domain;
+ struct riscv_iommu_bond *bond;
+
+ /* The MSI table lock excludes bond updates for this domain. */
+ lockdep_assert_held(&msi_table->lock);
+
+ domain = container_of(msi_table, struct riscv_iommu_domain, msi_table);
+
+ list_for_each_entry(bond, &domain->bonds, list) {
+ struct riscv_iommu_info *info = dev_iommu_priv_get(bond->dev);
+
+ riscv_iommu_msi_table_set_dc(msi_table, &info->dc, activate);
+ riscv_iommu_iodir_update(bond->dev, &info->dc);
+ }
+}
+
/*
* IOVA page translation tree management.
*/
@@ -1514,6 +1575,10 @@ static int riscv_iommu_attach_paging_domain(struct iommu_domain *iommu_domain,
kfree(bond);
return -EBUSY;
}
+
+ if (domain->msi_table.nr_forwarded_irqs)
+ riscv_iommu_msi_table_set_dc(&domain->msi_table, &dc, true);
+
info->dc = dc;
riscv_iommu_bond_link(domain, bond);
riscv_iommu_iodir_update(dev, &info->dc);
diff --git a/drivers/iommu/riscv/iommu.h b/drivers/iommu/riscv/iommu.h
index 2876703a6698..deb57b6a6c4b 100644
--- a/drivers/iommu/riscv/iommu.h
+++ b/drivers/iommu/riscv/iommu.h
@@ -71,6 +71,7 @@ struct riscv_iommu_device {
struct riscv_iommu_msi_table {
/* Protects attachment, interrupt forwarding state, and MSI PTE updates. */
raw_spinlock_t lock;
+ unsigned int nr_forwarded_irqs;
unsigned int nr_ptes;
struct riscv_iommu_msipte *root;
u64 msi_addr_mask;
@@ -81,6 +82,10 @@ 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);
+void riscv_iommu_msi_table_inval(struct riscv_iommu_msi_table *msi_table, unsigned long addr);
+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);
+
#define riscv_iommu_readl(iommu, addr) \
readl_relaxed((iommu)->reg + (addr))
--
2.43.0
More information about the linux-riscv
mailing list