Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0119e87 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu: Introduce new 'struct iommu_device' 



This struct represents one hardware iommu in the iommu core
code. For now it only has the iommu-ops associated with it,
but that will be extended soon.

The register/unregister interface is also added, as well as
making use of it in the Intel and AMD IOMMU drivers.

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

drivers/iommu/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct timer_list queue_timer; 
 * Domain for untranslated devices - only allocated

 * if iommu=pt passed on kernel cmd line.

 */

static const struct iommu_ops amd_iommu_ops;

const struct iommu_ops amd_iommu_ops;



static ATOMIC_NOTIFIER_HEAD(ppr_notifier);

int amd_iommu_max_glx_val = -1;
@@ -3217,7 +3217,7 @@ static void amd_iommu_apply_dm_region(struct device *dev, 
	WARN_ON_ONCE(reserve_iova(&dma_dom->iovad, start, end) == NULL);

}



static const struct iommu_ops amd_iommu_ops = {

const struct iommu_ops amd_iommu_ops = {

	.capable = amd_iommu_capable,

	.domain_alloc = amd_iommu_domain_alloc,

	.domain_free  = amd_iommu_domain_free,

drivers/iommu/amd_iommu_init.c

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ 
 * out of it.

 */



extern const struct iommu_ops amd_iommu_ops;



/*

 * structure describing one IOMMU in the ACPI table. Typically followed by one

 * or more ivhd_entrys.
@@ -1639,6 +1641,9 @@ static int iommu_init_pci(struct amd_iommu *iommu) 
					       amd_iommu_groups, "ivhd%d",

					       iommu->index);



	iommu_device_set_ops(&iommu->iommu, &amd_iommu_ops);

	iommu_device_register(&iommu->iommu);



	return pci_enable_device(iommu->dev);

}

drivers/iommu/amd_iommu_types.h

+3 −0
Original line number Diff line number Diff line
@@ -538,6 +538,9 @@ struct amd_iommu { 
	/* IOMMU sysfs device */

	struct device *iommu_dev;



	/* Handle for IOMMU core code */

	struct iommu_device iommu;



	/*

	 * We can't rely on the BIOS to restore all values on reinit, so we

	 * need to stash them

drivers/iommu/dmar.c

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ static unsigned long dmar_seq_ids[BITS_TO_LONGS(DMAR_UNITS_SUPPORTED)]; 
static int alloc_iommu(struct dmar_drhd_unit *drhd);

static void free_iommu(struct intel_iommu *iommu);



extern const struct iommu_ops intel_iommu_ops;



static void dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)

{

	/*
@@ -1084,6 +1086,12 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 
			err = PTR_ERR(iommu->iommu_dev);

			goto err_unmap;

		}



		iommu_device_set_ops(&iommu->iommu, &intel_iommu_ops);



		err = iommu_device_register(&iommu->iommu);

		if (err)

			goto err_unmap;

	}



	drhd->iommu = iommu;
@@ -1102,6 +1110,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 
static void free_iommu(struct intel_iommu *iommu)

{

	iommu_device_destroy(iommu->iommu_dev);

	iommu_device_unregister(&iommu->iommu);



	if (iommu->irq) {

		if (iommu->pr_irq) {

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped); 
static DEFINE_SPINLOCK(device_domain_lock);

static LIST_HEAD(device_domain_list);



static const struct iommu_ops intel_iommu_ops;

const struct iommu_ops intel_iommu_ops;



static bool translation_pre_enabled(struct intel_iommu *iommu)

{
@@ -5292,7 +5292,7 @@ struct intel_iommu *intel_svm_device_to_iommu(struct device *dev) 
}

#endif /* CONFIG_INTEL_IOMMU_SVM */



static const struct iommu_ops intel_iommu_ops = {

const struct iommu_ops intel_iommu_ops = {

	.capable	= intel_iommu_capable,

	.domain_alloc	= intel_iommu_domain_alloc,

	.domain_free	= intel_iommu_domain_free,