Commit fa49364c authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/dma: Move public interfaces to linux/iommu.h 



The iommu-dma layer is now mostly encapsulated by iommu_dma_ops, with
only a couple more public interfaces left pertaining to MSI integration.
Since these depend on the main IOMMU API header anyway, move their
declarations there, taking the opportunity to update the half-baked
comments to proper kerneldoc along the way.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/9cd99738f52094e6bed44bfee03fa4f288d20695.1660668998.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent de9f8a91

arch/arm64/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/gfp.h>

#include <linux/cache.h>

#include <linux/dma-map-ops.h>

#include <linux/dma-iommu.h>

#include <linux/iommu.h>

#include <xen/xen.h>



#include <asm/cacheflush.h>

drivers/iommu/dma-iommu.c

+13 −2
Original line number Diff line number Diff line
@@ -1633,6 +1633,13 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, 
	return NULL;

}



/**

 * iommu_dma_prepare_msi() - Map the MSI page in the IOMMU domain

 * @desc: MSI descriptor, will store the MSI page

 * @msi_addr: MSI target address to be mapped

 *

 * Return: 0 on success or negative error code if the mapping failed.

 */

int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)

{

	struct device *dev = msi_desc_to_dev(desc);
@@ -1661,8 +1668,12 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr) 
	return 0;

}



void iommu_dma_compose_msi_msg(struct msi_desc *desc,

			       struct msi_msg *msg)

/**

 * iommu_dma_compose_msi_msg() - Apply translation to an MSI message

 * @desc: MSI descriptor prepared by iommu_dma_prepare_msi()

 * @msg: MSI message containing target physical address

 */

void iommu_dma_compose_msi_msg(struct msi_desc *desc, struct msi_msg *msg)

{

	struct device *dev = msi_desc_to_dev(desc);

	const struct iommu_domain *domain = iommu_get_domain_for_dev(dev);

drivers/irqchip/irq-gic-v2m.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define pr_fmt(fmt) "GICv2m: " fmt



#include <linux/acpi.h>

#include <linux/dma-iommu.h>

#include <linux/iommu.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/kernel.h>

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/cpu.h>

#include <linux/crash_dump.h>

#include <linux/delay.h>

#include <linux/dma-iommu.h>

#include <linux/efi.h>

#include <linux/interrupt.h>

#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/irqdomain.h>

#include <linux/list.h>

drivers/irqchip/irq-gic-v3-mbi.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#define pr_fmt(fmt) "GICv3: " fmt



#include <linux/dma-iommu.h>

#include <linux/iommu.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/kernel.h>