From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbcEDLkz (ORCPT ); Wed, 4 May 2016 07:40:55 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38063 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175AbcEDLkd (ORCPT ); Wed, 4 May 2016 07:40:33 -0400 From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com, yehuday@marvell.com Subject: [PATCH v9 8/8] iommu/arm-smmu: get/put the msi cookie Date: Wed, 4 May 2016 11:40:07 +0000 Message-Id: <1462362007-2753-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462362007-2753-1-git-send-email-eric.auger@linaro.org> References: <1462362007-2753-1-git-send-email-eric.auger@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For IOMMU_DOMAIN_UNMANAGED type we now also get the msi cookie in both arm-smmu and arm-smmu-v3. This initializes resources for MSI doorbell mapping. Signed-off-by: Eric Auger --- drivers/iommu/arm-smmu-v3.c | 16 ++++++++++++---- drivers/iommu/arm-smmu.c | 15 +++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index bf222b5..b5d9826 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -1411,15 +1412,21 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) return NULL; if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&smmu_domain->domain)) { - kfree(smmu_domain); - return NULL; - } + iommu_get_dma_cookie(&smmu_domain->domain)) + goto err; + + if (type == IOMMU_DOMAIN_UNMANAGED && + iommu_get_msi_cookie(&smmu_domain->domain)) + goto err; + smmu_domain->domain.msi_geometry = msi_geometry; mutex_init(&smmu_domain->init_mutex); spin_lock_init(&smmu_domain->pgtbl_lock); return &smmu_domain->domain; +err: + kfree(smmu_domain); + return NULL; } static int arm_smmu_bitmap_alloc(unsigned long *map, int span) @@ -1445,6 +1452,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_device *smmu = smmu_domain->smmu; + iommu_put_msi_cookie(domain); iommu_put_dma_cookie(domain); free_io_pgtable_ops(smmu_domain->pgtbl_ops); diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 55f429d..0908985 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -990,10 +991,12 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) return NULL; if (type == IOMMU_DOMAIN_DMA && - iommu_get_dma_cookie(&smmu_domain->domain)) { - kfree(smmu_domain); - return NULL; - } + iommu_get_dma_cookie(&smmu_domain->domain)) + goto err; + + if (type == IOMMU_DOMAIN_UNMANAGED && + iommu_get_msi_cookie(&smmu_domain->domain)) + goto err; smmu_domain->domain.msi_geometry = msi_geometry; @@ -1001,6 +1004,9 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) spin_lock_init(&smmu_domain->pgtbl_lock); return &smmu_domain->domain; +err: + kfree(smmu_domain); + return NULL; } static void arm_smmu_domain_free(struct iommu_domain *domain) @@ -1011,6 +1017,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) * Free the domain resources. We assume that all devices have * already been detached. */ + iommu_put_msi_cookie(domain); iommu_put_dma_cookie(domain); arm_smmu_destroy_domain_context(domain); kfree(smmu_domain); -- 1.9.1