Merge tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[deliverable/linux.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index d3e5e9abe3b6cc36f4b488491ad38e24f0a4bf8b..a57e9b7498953bb9ebf947695caea46d73e2bfeb 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -117,6 +117,7 @@ struct kmem_cache *amd_iommu_irq_cache;
 
 static void update_domain(struct protection_domain *domain);
 static int alloc_passthrough_domain(void);
+static int protection_domain_init(struct protection_domain *domain);
 
 /****************************************************************************
  *
@@ -1881,12 +1882,9 @@ static struct dma_ops_domain *dma_ops_domain_alloc(void)
        if (!dma_dom)
                return NULL;
 
-       spin_lock_init(&dma_dom->domain.lock);
-
-       dma_dom->domain.id = domain_id_alloc();
-       if (dma_dom->domain.id == 0)
+       if (protection_domain_init(&dma_dom->domain))
                goto free_dma_dom;
-       INIT_LIST_HEAD(&dma_dom->domain.dev_list);
+
        dma_dom->domain.mode = PAGE_MODE_2_LEVEL;
        dma_dom->domain.pt_root = (void *)get_zeroed_page(GFP_KERNEL);
        dma_dom->domain.flags = PD_DMA_OPS_MASK;
@@ -2916,6 +2914,18 @@ static void protection_domain_free(struct protection_domain *domain)
        kfree(domain);
 }
 
+static int protection_domain_init(struct protection_domain *domain)
+{
+       spin_lock_init(&domain->lock);
+       mutex_init(&domain->api_lock);
+       domain->id = domain_id_alloc();
+       if (!domain->id)
+               return -ENOMEM;
+       INIT_LIST_HEAD(&domain->dev_list);
+
+       return 0;
+}
+
 static struct protection_domain *protection_domain_alloc(void)
 {
        struct protection_domain *domain;
@@ -2924,12 +2934,8 @@ static struct protection_domain *protection_domain_alloc(void)
        if (!domain)
                return NULL;
 
-       spin_lock_init(&domain->lock);
-       mutex_init(&domain->api_lock);
-       domain->id = domain_id_alloc();
-       if (!domain->id)
+       if (protection_domain_init(domain))
                goto out_err;
-       INIT_LIST_HEAD(&domain->dev_list);
 
        add_domain_to_list(domain);