Commit d86724d4 authored by Yi Liu's avatar Yi Liu Committed by Jason Gunthorpe
Browse files

iommu/vt-d: Make domain attach helpers to be extern 

This makes the helpers visible to nested.c.

Link: https://lore.kernel.org/r/20231026044216.64964-6-yi.l.liu@intel.com


Suggested-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 111bf85c

drivers/iommu/intel/iommu.c

+6 −9
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ static LIST_HEAD(dmar_satc_units); 
#define for_each_rmrr_units(rmrr) \

	list_for_each_entry(rmrr, &dmar_rmrr_units, list)



static void device_block_translation(struct device *dev);

static void intel_iommu_domain_free(struct iommu_domain *domain);



int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON);
@@ -561,7 +560,7 @@ static unsigned long domain_super_pgsize_bitmap(struct dmar_domain *domain) 
}



/* Some capabilities may be different across iommus */

static void domain_update_iommu_cap(struct dmar_domain *domain)

void domain_update_iommu_cap(struct dmar_domain *domain)

{

	domain_update_iommu_coherency(domain);

	domain->iommu_superpage = domain_update_iommu_superpage(domain, NULL);
@@ -1779,8 +1778,7 @@ static struct dmar_domain *alloc_domain(unsigned int type) 
	return domain;

}



static int domain_attach_iommu(struct dmar_domain *domain,

			       struct intel_iommu *iommu)

int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)

{

	struct iommu_domain_info *info, *curr;

	unsigned long ndomains;
@@ -1829,8 +1827,7 @@ static int domain_attach_iommu(struct dmar_domain *domain, 
	return ret;

}



static void domain_detach_iommu(struct dmar_domain *domain,

				struct intel_iommu *iommu)

void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)

{

	struct iommu_domain_info *info;
@@ -3975,7 +3972,7 @@ static void dmar_remove_one_dev_info(struct device *dev) 
 * all DMA requests without PASID from the device are blocked. If the page

 * table has been set, clean up the data structures.

 */

static void device_block_translation(struct device *dev)

void device_block_translation(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu = info->iommu;
@@ -4128,7 +4125,7 @@ static void intel_iommu_domain_free(struct iommu_domain *domain) 
		domain_exit(to_dmar_domain(domain));

}



static int prepare_domain_attach_device(struct iommu_domain *domain,

int prepare_domain_attach_device(struct iommu_domain *domain,

				 struct device *dev)

{

	struct dmar_domain *dmar_domain = to_dmar_domain(domain);

drivers/iommu/intel/iommu.h

+7 −0
Original line number Diff line number Diff line
@@ -878,6 +878,13 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc, 
 */

#define QI_OPT_WAIT_DRAIN		BIT(0)



int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu);

void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu);

void device_block_translation(struct device *dev);

int prepare_domain_attach_device(struct iommu_domain *domain,

				 struct device *dev);

void domain_update_iommu_cap(struct dmar_domain *domain);



int dmar_ir_support(void);



void *alloc_pgtable_page(int node, gfp_t gfp);