From patchwork Thu Apr 28 08:15:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 66866 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp75592qge; Thu, 28 Apr 2016 01:15:54 -0700 (PDT) X-Received: by 10.28.14.2 with SMTP id 2mr11707826wmo.14.1461831351155; Thu, 28 Apr 2016 01:15:51 -0700 (PDT) Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com. [2a00:1450:400c:c09::234]) by mx.google.com with ESMTPS id ch4si9299920wjb.189.2016.04.28.01.15.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 01:15:51 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) client-ip=2a00:1450:400c:c09::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x234.google.com with SMTP id g17so27718582wme.1 for ; Thu, 28 Apr 2016 01:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=66Jc6C2dE0cc5iCOAGqTeuOVX+KyAvUJr1xSBfU7CqE=; b=LWYEY80J640kuh+vMl+BvN0/6EeChrn/KO+R8/y94VWf40tYl1X5ihGDD2TMfvaZyF BjUj/wk3IiUgeATrziUcn9Oat5s6OwLxDHS2LJK7kL9MGDVo81OEu+M2KhY1c48/hJCx fDrbh+NSO0qJbeDg+xGbX9z84yUvmD2uHgs4w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=66Jc6C2dE0cc5iCOAGqTeuOVX+KyAvUJr1xSBfU7CqE=; b=QaE+IrE89eNjcplgz1y+lyoeSxN5K4P7CBaQnjtp7i1DgUS16Zgph5AZOhiuZ6TZTD GMJiux5pNQHFQYbdDYxKIhPDQvnhVLUsC/VBO0LBluFzHiX/dZI2g42hZusJ25zIMeAb IYoQvVaXUBksHP9j38O974spi02RXvz198hhkVtVt0jfGFcfLsEDlygQniECrhNGuLgQ DJgVSnrLktSQByKIetaaEWELFPPtOqc2jC6pGLK3by6uuF6XS7BYDLCgKubjkxZUU/JY J3KZpTLBRPoDO1sM4UaF46yhkJ78tuyiaBLkQ8kd4JmOz5zu9hlFkpndEA9Lw7JdstE7 0L0w== X-Gm-Message-State: AOPr4FVTAe/9JwhA+vndprA/kV4kGqXZ8qxMLi9bX9fMcKdBOJ7587CtF9SBnZXYNPBn3guIESg= X-Received: by 10.194.23.226 with SMTP id p2mr13563303wjf.131.1461831350917; Thu, 28 Apr 2016 01:15:50 -0700 (PDT) Return-Path: Received: from new-host-46.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id h8sm12749860wmd.2.2016.04.28.01.15.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 01:15:49 -0700 (PDT) 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 Subject: [PATCH v8 8/8] iommu/arm-smmu: get/put the msi cookie Date: Thu, 28 Apr 2016 08:15:23 +0000 Message-Id: <1461831323-5480-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461831323-5480-1-git-send-email-eric.auger@linaro.org> References: <1461831323-5480-1-git-send-email-eric.auger@linaro.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(-) -- 1.9.1 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);