Skip to content

Commit 16e32c3

Browse files
Julien GrallMarc Zyngier
authored andcommitted
iommu/dma-iommu: Remove iommu_dma_map_msi_msg()
A recent change split iommu_dma_map_msi_msg() in two new functions. The function was still implemented to avoid modifying all the callers at once. Now that all the callers have been reworked, iommu_dma_map_msi_msg() can be removed. Signed-off-by: Julien Grall <[email protected]> Reviewed-by: Robin Murphy <[email protected]> Reviewed-by: Eric Auger <[email protected]> Acked-by: Joerg Roedel <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent 7310397 commit 16e32c3

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

drivers/iommu/dma-iommu.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -935,23 +935,3 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
935935
msg->address_lo &= cookie_msi_granule(domain->iova_cookie) - 1;
936936
msg->address_lo += lower_32_bits(msi_page->iova);
937937
}
938-
939-
void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg)
940-
{
941-
struct msi_desc *desc = irq_get_msi_desc(irq);
942-
phys_addr_t msi_addr = (u64)msg->address_hi << 32 | msg->address_lo;
943-
944-
if (WARN_ON(iommu_dma_prepare_msi(desc, msi_addr))) {
945-
/*
946-
* We're called from a void callback, so the best we can do is
947-
* 'fail' by filling the message with obviously bogus values.
948-
* Since we got this far due to an IOMMU being present, it's
949-
* not like the existing address would have worked anyway...
950-
*/
951-
msg->address_hi = ~0U;
952-
msg->address_lo = ~0U;
953-
msg->data = ~0U;
954-
} else {
955-
iommu_dma_compose_msi_msg(desc, msg);
956-
}
957-
}

include/linux/dma-iommu.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr);
8484
void iommu_dma_compose_msi_msg(struct msi_desc *desc,
8585
struct msi_msg *msg);
8686

87-
void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
8887
void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
8988

9089
#else
@@ -124,10 +123,6 @@ static inline void iommu_dma_compose_msi_msg(struct msi_desc *desc,
124123
{
125124
}
126125

127-
static inline void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg)
128-
{
129-
}
130-
131126
static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list)
132127
{
133128
}

0 commit comments

Comments
 (0)