From patchwork Mon May 4 08:16:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 6324031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4D6D9F374 for ; Mon, 4 May 2015 08:22:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED754202EB for ; Mon, 4 May 2015 08:22:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E5D2D202E9 for ; Mon, 4 May 2015 08:22:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpBbQ-0004KU-CA; Mon, 04 May 2015 08:19:48 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpBZF-0002xb-CW for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2015 08:17:36 +0000 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 <0NNT007X4GCHWY50@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2015 09:17:05 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-4c-55472b01ce39 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 57.C6.04846.10B27455; Mon, 4 May 2015 09:17:05 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNT008X3GC52F50@eusync1.samsung.com>; Mon, 04 May 2015 09:17:05 +0100 (BST) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 05/25] iommu: exynos: don't read version register on every tlb operation Date: Mon, 04 May 2015 10:16:00 +0200 Message-id: <1430727380-10912-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1430727380-10912-1-git-send-email-m.szyprowski@samsung.com> References: <1430727380-10912-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e/4ZV1GbfdQg/azKhZ/Jx1jt5i4cjKz xaT7E1gsFuy3trj2ewabRefsDewWL+5dZLHof/ya2eJs0xt2i86JS9gtvlx5yGSx6fE1VosZ 5/cxWaw9cpfd4tT1z2wW/3oPMlr837OD3eLIw93sFjMmv2SzWLXrD6PF7d98Fi8/nmBxEPN4 cnAek8eaeWsYPX7/msTo8Xd2K7PHzll32T1md8xk9di8Qstj06pONo/NS+o9bv97zOwx+cZy Ro8rJ5pYPXqb37F59G1ZxejxeZNcAH8Ul01Kak5mWWqRvl0CV8bT+YEFXcIVEy7NZm9gvMvf xcjJISFgInF/wi1WCFtM4sK99WxdjFwcQgJLGSXalm+BcpqYJGb0nmUEqWITMJToetvFBmKL CORLvNj7lwXEZhZ4zyox5VsgiC0sECux62oXE4jNIqAq8bpjMZjNK+Ah8eHbVxaIbXIS/1+u AItzCnhKvGvfDnaFEFDNmdbNrBMYeRcwMqxiFE0tTS4oTkrPNdQrTswtLs1L10vOz93ECImj LzsYFx+zOsQowMGoxMO7QNY9VIg1say4MvcQowQHs5II75OPbqFCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeefueh8iJJCeWJKanZpakFoEk2Xi4JRqYJxc6aFWHHxP2H91tfa/I1lR7z4YXe+Y urh8dR6r7DkXG9nZByNvnn+5/eJUyct+OSG3/xxMfzHjyMLqA184HX+f/PSj9XHyO8/iZcs8 Tmz6fFkx3pmzl61vyqfLKyfGR54I1sqL6lOMOdin/cjmnOeHrVyXBXfeUxI9yPlrkm0Y452J RYz5/2KVWIozEg21mIuKEwGLtbNjnwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150504_011733_627965_4ACD23B9 X-CRM114-Status: GOOD ( 13.11 ) X-Spam-Score: -5.0 (-----) Cc: Rob Herring , Thierry Reding , Shaik Ameer Basha , Joonyoung Shim , Arnd Bergmann , Inki Dae , Seung-Woo Kim , Joerg Roedel , Will Deacon , Tomasz Figa , linaro-mm-sig@lists.linaro.org, Kyungmin Park , Kukjin Kim , Laurent Pinchart , Olof Johansson , Javier Martinez Canillas , Cho KyongHo , David Wodhouse , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes reading of REG_MMU_VERSION register on every tlb operation and caches SYSMMU version in driver's internal data. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 3e898504a7c4..3861485f0689 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -213,6 +213,7 @@ struct sysmmu_drvdata { spinlock_t lock; struct iommu_domain *domain; phys_addr_t pgtable; + int version; }; static struct exynos_iommu_domain *to_exynos_domain(struct iommu_domain *dom) @@ -244,11 +245,6 @@ static void sysmmu_unblock(void __iomem *sfrbase) __raw_writel(CTRL_ENABLE, sfrbase + REG_MMU_CTRL); } -static unsigned int __raw_sysmmu_version(struct sysmmu_drvdata *data) -{ - return MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION)); -} - static bool sysmmu_block(void __iomem *sfrbase) { int i = 120; @@ -408,7 +404,7 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data) unsigned int cfg = CFG_LRU | CFG_QOS(15); unsigned int ver; - ver = __raw_sysmmu_version(data); + 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; @@ -422,6 +418,7 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data) } __raw_writel(cfg, data->sfrbase + REG_MMU_CFG); + data->version = ver; } static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data) @@ -531,7 +528,7 @@ static bool exynos_sysmmu_disable(struct device *dev) static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, sysmmu_iova_t iova) { - if (__raw_sysmmu_version(data) == MAKE_MMU_VER(3, 3)) + if (data->version == MAKE_MMU_VER(3, 3)) __raw_writel(iova | 0x1, data->sfrbase + REG_MMU_FLUSH_ENTRY); } @@ -580,7 +577,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, sysmmu_iova_t iova, * 1MB page can be cached in one of all sets. * 64KB page can be one of 16 consecutive sets. */ - if (MMU_MAJ_VER(__raw_sysmmu_version(data)) == 2) + if (MMU_MAJ_VER(data->version) == 2) num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); if (sysmmu_block(data->sfrbase)) {