From patchwork Tue Feb 16 14:57:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 62048 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1712216lbl; Tue, 16 Feb 2016 06:58:17 -0800 (PST) X-Received: by 10.98.12.133 with SMTP id 5mr31794525pfm.20.1455634686009; Tue, 16 Feb 2016 06:58:06 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 70si51706761pfk.205.2016.02.16.06.58.05; Tue, 16 Feb 2016 06:58:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-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-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755150AbcBPO5x (ORCPT + 4 others); Tue, 16 Feb 2016 09:57:53 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:16910 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730AbcBPO5p (ORCPT ); Tue, 16 Feb 2016 09:57:45 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O2N00IDNAW7K330@mailout3.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 16 Feb 2016 14:57:43 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-8e-56c338e735c3 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 45.96.16778.7E833C65; Tue, 16 Feb 2016 14:57:43 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O2N00BHIAVXJJA0@eusync3.samsung.com>; Tue, 16 Feb 2016 14:57:43 +0000 (GMT) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Joerg Roedel , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH 08/11] iommu: exynos: unify code for fldp cache invalidation Date: Tue, 16 Feb 2016 15:57:01 +0100 Message-id: <1455634624-18130-9-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1455634624-18130-1-git-send-email-m.szyprowski@samsung.com> References: <1455634624-18130-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsVy+t/xq7rPLQ6HGXz9z2KxccZ6VotJ9yew WCzYb23ROXsDu8XrF4YW/Y9fM1tsenyN1WLG+X1MFmuP3GV34PR4cnAek8emVZ1sHpuX1HtM vrGc0aNvyypGj8+b5ALYorhsUlJzMstSi/TtErgyfu2ZwV5wg6vi9o+nzA2MzZxdjJwcEgIm EkdfH2OBsMUkLtxbz9bFyMUhJLCUUeLz409QThOTxMe+++wgVWwChhJdb7vYQGwRgXyJF3v/ soAUMQv8YpQ419nOBJIQFvCRaNl1jBXEZhFQlfix9TDYCl4BD4kfP2eyQqyTk/j/cgVQPQcH p4CnxM3PcSBhIaCSo7smsExg5F3AyLCKUTS1NLmgOCk911CvODG3uDQvXS85P3cTIyTcvuxg XHzM6hCjAAejEg8vh8ehMCHWxLLiytxDjBIczEoivP9eAYV4UxIrq1KL8uOLSnNSiw8xSnOw KInzzt31PkRIID2xJDU7NbUgtQgmy8TBKdXAqLy06mJXlv+Nj3EX6zmXv7oUdDqjpXZGzLM9 GwN963Mu8mtsUpq8/qOaw+6fBou2zD/5NcNPprN6+6q0uvNX1YRtv9kYi8/4emZLS/aha+1P EiblJ27fOv3iMYvumVJ3N9n/f9adm9+S5n9jXUHh1fMahl8NQjJ3WX/dYrRO9NcS5gXXH59Y t1GJpTgj0VCLuag4EQDdLkUOMwIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch simplifies the code for handling of flpdcache invalidation. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 15787a1..e42a76c 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -440,13 +440,6 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable, return ret; } -static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, - sysmmu_iova_t iova) -{ - if (data->version == MAKE_MMU_VER(3, 3)) - __raw_writel(iova | 0x1, data->sfrbase + REG_MMU_FLUSH_ENTRY); -} - static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, sysmmu_iova_t iova) { @@ -455,8 +448,10 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, clk_enable(data->clk_master); spin_lock_irqsave(&data->lock, flags); - if (is_sysmmu_active(data)) - __sysmmu_tlb_invalidate_flpdcache(data, iova); + if (is_sysmmu_active(data)) { + if (data->version >= MAKE_MMU_VER(3, 3)) + __sysmmu_tlb_invalidate_entry(data, iova, 1); + } spin_unlock_irqrestore(&data->lock, flags); clk_disable(data->clk_master);