Commit e5d8be74 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu: Move IOMMU_DOMAIN_BLOCKED global statics to ops->blocked_domain 



Following the pattern of identity domains, just assign the BLOCKED domain
global statics to a value in ops. Update the core code to use the global
static directly.

Update powerpc to use the new scheme and remove its empty domain_alloc
callback.

Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Acked-by: default avatarSven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/1-v2-bff223cf6409+282-dart_paging_jgg@nvidia.com


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

arch/powerpc/kernel/iommu.c

+1 −8
Original line number Diff line number Diff line
@@ -1333,13 +1333,6 @@ static bool spapr_tce_iommu_capable(struct device *dev, enum iommu_cap cap) 
	return false;

}



static struct iommu_domain *spapr_tce_iommu_domain_alloc(unsigned int type)

{

	if (type != IOMMU_DOMAIN_BLOCKED)

		return NULL;

	return &spapr_tce_blocked_domain;

}



static struct iommu_device *spapr_tce_iommu_probe_device(struct device *dev)

{

	struct pci_dev *pdev;
@@ -1374,8 +1367,8 @@ static struct iommu_group *spapr_tce_iommu_device_group(struct device *dev) 


static const struct iommu_ops spapr_tce_iommu_ops = {

	.default_domain = &spapr_tce_platform_domain,

	.blocked_domain = &spapr_tce_blocked_domain,

	.capable = spapr_tce_iommu_capable,

	.domain_alloc = spapr_tce_iommu_domain_alloc,

	.probe_device = spapr_tce_iommu_probe_device,

	.release_device = spapr_tce_iommu_release_device,

	.device_group = spapr_tce_iommu_device_group,

drivers/iommu/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -2086,6 +2086,8 @@ static struct iommu_domain *__iommu_domain_alloc(const struct iommu_ops *ops, 


	if (alloc_type == IOMMU_DOMAIN_IDENTITY && ops->identity_domain)

		return ops->identity_domain;

	else if (alloc_type == IOMMU_DOMAIN_BLOCKED && ops->blocked_domain)

		return ops->blocked_domain;

	else if (type & __IOMMU_DOMAIN_PAGING && ops->domain_alloc_paging)

		domain = ops->domain_alloc_paging(dev);

	else if (ops->domain_alloc)

include/linux/iommu.h

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ struct iommu_iotlb_gather { 
 * @owner: Driver module providing these ops

 * @identity_domain: An always available, always attachable identity

 *                   translation.

 * @blocked_domain: An always available, always attachable blocking

 *                  translation.

 * @default_domain: If not NULL this will always be set as the default domain.

 *                  This should be an IDENTITY/BLOCKED/PLATFORM domain.

 *                  Do not use in new drivers.
@@ -303,6 +305,7 @@ struct iommu_ops { 
	unsigned long pgsize_bitmap;

	struct module *owner;

	struct iommu_domain *identity_domain;

	struct iommu_domain *blocked_domain;

	struct iommu_domain *default_domain;

};