From patchwork Thu Jul 12 06:18:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 141785 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1131900ljj; Wed, 11 Jul 2018 23:19:19 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcsqbnW1uWTkepg912y4PvMv7MApeKJIwUPYEgbCYHuR67f9jvsYwn18rwdDzodBkakXBmL X-Received: by 2002:aa7:88d3:: with SMTP id p19-v6mr992540pfo.160.1531376359680; Wed, 11 Jul 2018 23:19:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531376359; cv=none; d=google.com; s=arc-20160816; b=cKZHRPsfPYQu7Roa/rvhPZFjJ3t7Yz9aqfpWG9oh9S4G8fXQ8o3LRdjsdDh4P8mz78 FGVk7t5bjs0oMakUKuYEsHwv2+GMdEj2Wij10xaAvYEHQg4X0hig46Gew5qfK93O51k+ BH7EOFUyHWvfkfFGa/rEBbivoybNhea13wABAMJykTWPz4X2q4GDPmIFDA87jwWtTo1w oO8mNc1rSwbvLPjEaZOr4cyRjm5lfU7Hk39jm0vJjmP34mJ2WWHuTpxxzCPI7sBUfkJk v749I4MyHf0ExYxdbpud33iSC1PFW6y0uq+Jq04BpXlt0D8agPXYeyEWeD8mW+iP5ZyS 6qUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=Y2+p1O9jEqtldX4F8u9tfk07x9I2K98fNte2KfG2HT0=; b=GGVv1v3xzjNNKcynTQJgTzh56gXuf/5551uXSBFTmprTGb7wUG0WEHUAxGco1/Rqb+ zAaEHrl97tmrNuyIgcjd8WjjyPkrAqa6gPgoYuc9iKFVF8WJ7Hjg/AsHRUAKRDS1gS9T FvMs14jJ0pYAyh2PJ1/Y92Lmm4PzKd8qYIbpNwwM66IroFb35GxNbLfo+5vkuTCXCy+V sxk6UegZply7IzaNeclHmW819tFLLZEQ2EzzfRBtQm8AZwdAwgB1/H7nPQum5bG0BfDn lzJoNvrFSROleAaQZqkJ08GJKvDmwTLvdZdBRd8OakIGV1JEFfpZxmdHhTjt2v4yYk23 MiAA== 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 e10-v6si21178286pge.48.2018.07.11.23.19.19; Wed, 11 Jul 2018 23:19:19 -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 S1728250AbeGLG1U (ORCPT + 27 others); Thu, 12 Jul 2018 02:27:20 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:48763 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726584AbeGLG1S (ORCPT ); Thu, 12 Jul 2018 02:27:18 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 8D210874C7C9A; Thu, 12 Jul 2018 14:19:12 +0800 (CST) Received: from localhost (10.177.23.164) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.382.0; Thu, 12 Jul 2018 14:19:06 +0800 From: Zhen Lei To: Jean-Philippe Brucker , Robin Murphy , Will Deacon , Joerg Roedel , linux-arm-kernel , iommu , linux-kernel CC: Zhen Lei Subject: [PATCH v3 5/6] iommu/arm-smmu-v3: add support for non-strict mode Date: Thu, 12 Jul 2018 14:18:31 +0800 Message-ID: <1531376312-2192-6-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1531376312-2192-1-git-send-email-thunder.leizhen@huawei.com> References: <1531376312-2192-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. Add IOMMU_CAP_NON_STRICT capability. 2. Dynamic choose strict or non-strict mode base on the iommu domain type. Signed-off-by: Zhen Lei --- drivers/iommu/arm-smmu-v3.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.8.3 diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 4402187..4a198a0 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1440,6 +1440,8 @@ static bool arm_smmu_capable(enum iommu_cap cap) return true; case IOMMU_CAP_NOEXEC: return true; + case IOMMU_CAP_NON_STRICT: + return true; default: return false; } @@ -1767,7 +1769,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, if (!ops) return 0; - return ops->unmap(ops, iova, size); + return ops->unmap(ops, iova | IOMMU_DOMAIN_STRICT_MODE(domain), size); } static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) @@ -1782,7 +1784,7 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain) { struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu; - if (smmu) + if (smmu && (IOMMU_DOMAIN_STRICT_MODE(domain) == IOMMU_STRICT)) __arm_smmu_tlb_sync(smmu); }