Commit 16e32c3c authored by Julien Grall's avatar Julien Grall Committed by Marc Zyngier
Browse files

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: default avatarJulien Grall <julien.grall@arm.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 73103975

drivers/iommu/dma-iommu.c

+0 −20
Original line number Diff line number Diff line
@@ -935,23 +935,3 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc, 
	msg->address_lo &= cookie_msi_granule(domain->iova_cookie) - 1;

	msg->address_lo += lower_32_bits(msi_page->iova);

}
 


void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg)

{

	struct msi_desc *desc = irq_get_msi_desc(irq);

	phys_addr_t msi_addr = (u64)msg->address_hi << 32 | msg->address_lo;



	if (WARN_ON(iommu_dma_prepare_msi(desc, msi_addr))) {

		/*

		 * We're called from a void callback, so the best we can do is

		 * 'fail' by filling the message with obviously bogus values.

		 * Since we got this far due to an IOMMU being present, it's

		 * not like the existing address would have worked anyway...

		 */

		msg->address_hi = ~0U;

		msg->address_lo = ~0U;

		msg->data = ~0U;

	} else {

		iommu_dma_compose_msi_msg(desc, msg);

	}

}

include/linux/dma-iommu.h

+0 −5
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr); 
void iommu_dma_compose_msi_msg(struct msi_desc *desc,

			       struct msi_msg *msg);



void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);

void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);



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

}



static inline void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg)

{

}



static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE