From patchwork Thu Sep 13 16:42:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Murphy X-Patchwork-Id: 146634 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp812604ljw; Thu, 13 Sep 2018 09:42:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbMBU8IWbnKmZjEESyWOIby/XgFcAnv9zh/E0QOokRVca4Qf38N/oYyMAGtbk0zMA4sEVId X-Received: by 2002:a17:902:ba83:: with SMTP id k3-v6mr7868550pls.251.1536856970956; Thu, 13 Sep 2018 09:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536856970; cv=none; d=google.com; s=arc-20160816; b=fkFJU4k8IOUgafeDB6nbcAk03lo/FgXsScQ8IaFxVqU3dx5Nfpy6N4XkzYP5y5D6QO lbOGqxky5PQ8f61U51LHwTGMtIc5a0D1iQK1ga1PnCC6p/bxljz8zUuleqJonK3lHBl8 PBtcAwrGPxveRJpL9K4SjI8xVuc/iXhmy8pexNgTa1JmP9Fi6P34ymJXo4AtS0FQzygx eihD+tgUxZmgvbxBDBx5tX6eU5V388CvkkJaHoEyW+oHwP4mb+hDOYhiZlvlInb+vAmI grZqUNg04uh0hc/nwzVxZD/F7uIPWUsO/cF2oeXR7+5zyJoqQG4QR+WYhnZGtvpFwo4q 9nLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ufOysDayhCv8ZRLRyWmygAPRHXY2m3YhIpRsoagW8Xk=; b=crLze3wVFSMHEo0AMDR4u596Hz2GOoz38IJizZ5u85RGOTbMxc0xVlFigIrLS1hAAh 0476Kn8o9FyYq4zPPiiqqrqhT7gUuYKYLDMoKGQVU88o9COYwDcbpmS3hfd3nYNYabk8 5OE7GgyPW5NF9C6MDDkvM47CIG5dfaU5UJ8Jpy6WEzNi0RB7HegJEKE/JK5A6gc9ZqOr sDCe5bQkjvO4/YRJd0jishqQdO0lT7iNrqYdPRXdP/fZa/ZstgbOWIqltSCujH8Q/z6k g0z2NsOseR5YYnKakiV7KwspOuaB3nJvgk/7rfZXsiQPQN93GwAJkLsfIwErnQl6bW/E 05ow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2-v6si5118969plm.202.2018.09.13.09.42.50; Thu, 13 Sep 2018 09:42:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728380AbeIMVxG (ORCPT + 32 others); Thu, 13 Sep 2018 17:53:06 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:51144 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbeIMVxE (ORCPT ); Thu, 13 Sep 2018 17:53:04 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 65AD080D; Thu, 13 Sep 2018 09:42:47 -0700 (PDT) Received: from e110467-lin.cambridge.arm.com (e110467-lin.emea.arm.com [10.4.12.131]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9AC603F703; Thu, 13 Sep 2018 09:42:45 -0700 (PDT) From: Robin Murphy To: joro@8bytes.org, will.deacon@arm.com, thunder.leizhen@huawei.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linuxarm@huawei.com, guohanjun@huawei.com, huawei.libin@huawei.com, john.garry@huawei.com Subject: [PATCH v6 5/7] iommu/arm-smmu-v3: Add support for non-strict mode Date: Thu, 13 Sep 2018 17:42:22 +0100 Message-Id: <9804a057ac2fcd4d7a5c3878a7e6daa33751c9fc.1536856828.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.19.0.dirty In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhen Lei Dynamically choose strict or non-strict mode for page table config based on the iommu domain type. Signed-off-by: Zhen Lei [rm: convert to domain attribute] Signed-off-by: Robin Murphy --- drivers/iommu/arm-smmu-v3.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) -- 2.19.0.dirty diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index f10c852479fc..e2f0e4a3374d 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -612,6 +612,7 @@ struct arm_smmu_domain { struct mutex init_mutex; /* Protects smmu pointer */ struct io_pgtable_ops *pgtbl_ops; + bool non_strict; enum arm_smmu_domain_stage stage; union { @@ -1633,6 +1634,9 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) if (smmu->features & ARM_SMMU_FEAT_COHERENCY) pgtbl_cfg.quirks = IO_PGTABLE_QUIRK_NO_DMA; + if (smmu_domain->non_strict) + pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; + pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain); if (!pgtbl_ops) return -ENOMEM; @@ -1934,13 +1938,17 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, { struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - if (domain->type != IOMMU_DOMAIN_UNMANAGED) - return -EINVAL; - switch (attr) { case DOMAIN_ATTR_NESTING: + if (domain->type != IOMMU_DOMAIN_UNMANAGED) + return -EINVAL; *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); return 0; + case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE: + if (domain->type != IOMMU_DOMAIN_DMA) + return -EINVAL; + *(int *)data = smmu_domain->non_strict; + return 0; default: return -ENODEV; } @@ -1952,13 +1960,15 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, int ret = 0; struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - if (domain->type != IOMMU_DOMAIN_UNMANAGED) - return -EINVAL; - mutex_lock(&smmu_domain->init_mutex); switch (attr) { case DOMAIN_ATTR_NESTING: + if (domain->type != IOMMU_DOMAIN_UNMANAGED) { + ret = -EINVAL; + goto out_unlock; + } + if (smmu_domain->smmu) { ret = -EPERM; goto out_unlock; @@ -1970,6 +1980,17 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, smmu_domain->stage = ARM_SMMU_DOMAIN_S1; break; + case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE: + if (domain->type != IOMMU_DOMAIN_DMA) { + ret = -EINVAL; + goto out_unlock; + } + + smmu_domain->non_strict = *(int *)data; + if (smmu_domain->pgtbl_ops) + io_pgtable_set_non_strict(smmu_domain->pgtbl_ops, + smmu_domain->non_strict); + break; default: ret = -ENODEV; }