mirror of
https://github.com/torvalds/linux
synced 2024-10-07 11:53:31 +00:00
iommu/dart: Convert to domain_alloc_paging()
Since the IDENTITY and BLOCKED behaviors were moved to global statics all that remains is the paging domain. Rename to apple_dart_attach_dev_paging() and remove the left over type check. Reviewed-by: Janne Grunau <j@jannau.net> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Acked-by: Sven Peter <sven@svenpeter.dev> Link: https://lore.kernel.org/r/7-v2-bff223cf6409+282-dart_paging_jgg@nvidia.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
17ef8d6876
commit
9c3ef90c4c
|
@ -651,8 +651,8 @@ static int apple_dart_domain_add_streams(struct apple_dart_domain *domain,
|
|||
true);
|
||||
}
|
||||
|
||||
static int apple_dart_attach_dev(struct iommu_domain *domain,
|
||||
struct device *dev)
|
||||
static int apple_dart_attach_dev_paging(struct iommu_domain *domain,
|
||||
struct device *dev)
|
||||
{
|
||||
int ret, i;
|
||||
struct apple_dart_stream_map *stream_map;
|
||||
|
@ -748,13 +748,10 @@ static void apple_dart_release_device(struct device *dev)
|
|||
kfree(cfg);
|
||||
}
|
||||
|
||||
static struct iommu_domain *apple_dart_domain_alloc(unsigned int type)
|
||||
static struct iommu_domain *apple_dart_domain_alloc_paging(struct device *dev)
|
||||
{
|
||||
struct apple_dart_domain *dart_domain;
|
||||
|
||||
if (type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_UNMANAGED)
|
||||
return NULL;
|
||||
|
||||
dart_domain = kzalloc(sizeof(*dart_domain), GFP_KERNEL);
|
||||
if (!dart_domain)
|
||||
return NULL;
|
||||
|
@ -975,7 +972,7 @@ static void apple_dart_get_resv_regions(struct device *dev,
|
|||
static const struct iommu_ops apple_dart_iommu_ops = {
|
||||
.identity_domain = &apple_dart_identity_domain,
|
||||
.blocked_domain = &apple_dart_blocked_domain,
|
||||
.domain_alloc = apple_dart_domain_alloc,
|
||||
.domain_alloc_paging = apple_dart_domain_alloc_paging,
|
||||
.probe_device = apple_dart_probe_device,
|
||||
.release_device = apple_dart_release_device,
|
||||
.device_group = apple_dart_device_group,
|
||||
|
@ -985,7 +982,7 @@ static const struct iommu_ops apple_dart_iommu_ops = {
|
|||
.pgsize_bitmap = -1UL, /* Restricted during dart probe */
|
||||
.owner = THIS_MODULE,
|
||||
.default_domain_ops = &(const struct iommu_domain_ops) {
|
||||
.attach_dev = apple_dart_attach_dev,
|
||||
.attach_dev = apple_dart_attach_dev_paging,
|
||||
.map_pages = apple_dart_map_pages,
|
||||
.unmap_pages = apple_dart_unmap_pages,
|
||||
.flush_iotlb_all = apple_dart_flush_iotlb_all,
|
||||
|
|
Loading…
Reference in a new issue