From patchwork Tue Feb 16 14:57:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 62043 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1712090lbl; Tue, 16 Feb 2016 06:58:04 -0800 (PST) X-Received: by 10.66.144.134 with SMTP id sm6mr26470712pab.158.1455634671816; Tue, 16 Feb 2016 06:57:51 -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.57.51; Tue, 16 Feb 2016 06:57:51 -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 S932163AbcBPO5u (ORCPT + 4 others); Tue, 16 Feb 2016 09:57:50 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:22655 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932221AbcBPO5s (ORCPT ); Tue, 16 Feb 2016 09:57:48 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O2N00GD1AW6NT30@mailout1.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 16 Feb 2016 14:57:42 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-8b-56c338e630a3 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 44.96.16778.6E833C65; Tue, 16 Feb 2016 14:57:42 +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:42 +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 07/11] iommu: exynos: refactor init config code Date: Tue, 16 Feb 2016 15:57:00 +0100 Message-id: <1455634624-18130-8-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/xq7rPLA6HGVz5pGqxccZ6VotJ9yew WCzYb23ROXsDu8XrF4YW/Y9fM1tsenyN1WLG+X1MFmuP3GV34PR4cnAek8emVZ1sHpuX1HtM vrGc0aNvyypGj8+b5ALYorhsUlJzMstSi/TtErgyuja1sxac5a74MucsYwPjHs4uRk4OCQET iffnbrND2GISF+6tZ+ti5OIQEljKKLF36hFGCKeJSeLJ4+tgVWwChhJdb7vYQGwRgXyJF3v/ soAUMQv8YpQ419nOBJIQFrCXWLH1MyuIzSKgKrHqwlewZl4BD4mvF7ewQqyTk/j/cgVQPQcH p4CnxM3PcSBhIaCSo7smsExg5F3AyLCKUTS1NLmgOCk911CvODG3uDQvXS85P3cTIyTcvuxg XHzM6hCjAAejEg8vh8ehMCHWxLLiytxDjBIczEoivP9eAYV4UxIrq1KL8uOLSnNSiw8xSnOw KInzzt31PkRIID2xJDU7NbUgtQgmy8TBKdXAmHB8Dv+/G9U23Vo3eXSf/JR6Ou1frtl9USu1 xVOb1z39patpt6mm3HfLsoccX47sDE/IXnZtjlBZi/yH9rJ3oX/PWc1f9KvLoLZchfX2v2XB z8uWnJ9g+FbBqvN3CMPzq5/XxrV4L350WpHz8OtTt5eFzzmmG2tVsv2VzfcJqaz/J4i4qDaW XVBiKc5INNRiLipOBADpY6USMwIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch rewrites sysmmu_init_config function to make it easier to read and understand. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 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 3a577a4..15787a1 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -383,24 +383,17 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) static void __sysmmu_init_config(struct sysmmu_drvdata *data) { - unsigned int cfg = CFG_LRU | CFG_QOS(15); - unsigned int ver; - - ver = MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION)); - if (MMU_MAJ_VER(ver) == 3) { - if (MMU_MIN_VER(ver) >= 2) { - cfg |= CFG_FLPDCACHE; - if (MMU_MIN_VER(ver) == 3) { - cfg |= CFG_ACGEN; - cfg &= ~CFG_LRU; - } else { - cfg |= CFG_SYSSEL; - } - } - } + unsigned int cfg; + + data->version = MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION)); + if (data->version <= MAKE_MMU_VER(3, 1)) + cfg = CFG_LRU | CFG_QOS(15); + else if (data->version <= MAKE_MMU_VER(3, 2)) + cfg = CFG_LRU | CFG_QOS(15) | CFG_FLPDCACHE | CFG_SYSSEL; + else + cfg = CFG_QOS(15) | CFG_FLPDCACHE | CFG_ACGEN; __raw_writel(cfg, data->sfrbase + REG_MMU_CFG); - data->version = ver; } static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data)