From patchwork Thu Oct 20 07:22:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9386097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07802607F0 for ; Thu, 20 Oct 2016 07:25:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E951929B1F for ; Thu, 20 Oct 2016 07:25:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD74229B21; Thu, 20 Oct 2016 07:25:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6221529B1F for ; Thu, 20 Oct 2016 07:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753960AbcJTHXj (ORCPT ); Thu, 20 Oct 2016 03:23:39 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:23917 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751012AbcJTHXh (ORCPT ); Thu, 20 Oct 2016 03:23:37 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OFC00E3V4J9UF70@mailout2.w1.samsung.com>; Thu, 20 Oct 2016 08:23:33 +0100 (BST) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20161020072333eucas1p11dd621319fcc0d544a357cc3505dac7d~-LJMUhJhc1037610376eucas1p1i; Thu, 20 Oct 2016 07:23:33 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 2A.FC.28332.4F078085; Thu, 20 Oct 2016 08:23:32 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20161020072332eucas1p1d980c1659979bd5bc2918bfc9d40a415~-LJLjkYqy0760807608eucas1p1U; Thu, 20 Oct 2016 07:23:32 +0000 (GMT) X-AuditID: cbfec7f4-f791c6d000006eac-c6-580870f4e409 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 10.BD.10494.0D078085; Thu, 20 Oct 2016 08:22:56 +0100 (BST) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OFC0074C4J1JF30@eusync2.samsung.com>; Thu, 20 Oct 2016 08:23:31 +0100 (BST) From: Marek Szyprowski To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Joerg Roedel , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , "Rafael J. Wysocki" , Mark Brown , "Luis R. Rodriguez" , Greg Kroah-Hartman , Tomeu Vizoso , Lukas Wunner , Kevin Hilman , Tobias Jakobi , Tomasz Figa Subject: [PATCH v5 2/7] iommu/exynos: Remove dead code Date: Thu, 20 Oct 2016 09:22:48 +0200 Message-id: <1476948173-21093-3-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1476948173-21093-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0hTYRjHfXfOzs6Wk8Mm9eItWK2i0hQs3jTCpA8n+mCQkBhYS09qObVN TSXCS97mNc201LA0M6+pY9i0tGVbtXJekhbhpbylIkrug+GFnGd++/14/s//5YGXxERPuU5k ZHQco4iWRUkIAa7R/+t3t8SSQZ7mMXfUVt7KRaW/pgiUXtNKoOLxIhxV9/iinIpXPFQ4uYCh 6Y5JDjKZtnRYW0mglfw+gMpNbznoz6wzau4b5SFz0TRAX4xDXJTZuMxFDdp1gAqahwg/MT31 7gmH7hytBfTrx6M8ur0hh6B7qpp4dIn5BaA39TxaPZKF0wXqBkCvtLvR5Vka7oVdwYJTYUxU ZAKjOHb6qiBitdgldkCa+LHXTKSAdTcV4JOQ8oYa3TjO8m44MNZKqICAFFHPAew0fbDJCoDq rDV8Z2Npos02qAPw7+IPwEoKB35VLQBriqC8oGpRtZ1ypFIBtGTXcqyCUb9xmJn6bDslpk5A kzadsDJOSeFMXd42CykaLg93YOx7bvCTvoRrZT51DnY15WPWIkjN8eCbpoKtVnJLXGF7ry1/ Fmor73NZFsN5g5rHsgscLsm13VAIYFrGEZbLAexfFLLsC98bBrd3McoBFmvKMLZeCLMzRWyE hl05FlvNGTg/tGy7vhLA1fFeUARcqoFdA3Bk4pXycEbp7aGUyZXx0eEeoTHydrD1cYybBksn qNH76ABFAom9MKKfFyTiyhKUSXIdgCQmcRReCyWDRMIwWVIyo4i5ooiPYpQ64Ezikj3C7upv l0RUuCyOuckwsYxiZ8oh+U4pIBm2/Dz/uTcvwr9bbJfaUfFoaTPke5mq/kDCXp9J14AHt7Om Dk3dHTl6K0kqbbzTotHe8zRPzNiLjIOyNkvuxYB671k02aNB/Mshbf4OVfuFJWllTvzgDYfA tePJ4kRybkZ+suCGUSuYfakJ7GhaDt8ojcvYp75e4TdkeGiaOSjBlREyr8OYQin7D23CH4U0 AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsVy+t/xK7oXCjgiDKZOFrXYOGM9q8XUh0/Y LJoXr2ezmHR/AovFgv3WFp2zN7Bb9D9+zWzxdPNjJovz54Hcy7vmsFl87j3CaDHj/D4mixfP pS3WHrnLbnFjwlNGizOnL7FatK3+wGqxatcfRou+tZfYHIQ9nhycx+Sx4+4SRo+ds+6ye2xa 1cnmsX/uGnaPyTeWM3r8O8buseVqO4tH35ZVjB6fN8l5zGjfxhrAHeVmk5GamJJapJCal5yf kpmXbqsUGuKma6GkkJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jB+TZAouqFac OHCDrYHxj1wXIyeHhICJxPsHG9kgbDGJC/fWA9lcHEICSxglvvf/hXKamCROPvjDClLFJmAo 0fW2CywhItDIKLFt60R2EIdZ4BmLxIIf28BmCQuYSZzf1QxmswioSjxb1gNm8wp4SHy4vJkZ Yp+cxMljk8Gmcgp4Suxe0wsWFwKqeb9xHeMERt4FjAyrGEVSS4tz03OLjfSKE3OLS/PS9ZLz czcxAqNv27GfW3Ywdr0LPsQowMGoxMObcY49Qog1say4MvcQowQHs5II77Ecjggh3pTEyqrU ovz4otKc1OJDjKZAR01klhJNzgcmhrySeEMTQ3NLQyNjCwtzIyMlcd6pH66ECwmkJ5akZqem FqQWwfQxcXBKNTDq9Nrx24aFHZfgc5z/fWfEu8og/spnvMoHumIb8uKCwqbw/0uLM5r1kz/6 hnD6Qu315l25HLl3pKV7rzkee/dp3aLLbAvEjA4XqKxVTbC79Plb/vKHq57K9DS1/e49ab2E kasw5EPr30OHT115E6hSzqqxiluiUslCTsggcPLER1URzbZ1jEosxRmJhlrMRcWJACmymqrU AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161020072332eucas1p1d980c1659979bd5bc2918bfc9d40a415 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20161020072332eucas1p1d980c1659979bd5bc2918bfc9d40a415 X-RootMTR: 20161020072332eucas1p1d980c1659979bd5bc2918bfc9d40a415 References: <1476948173-21093-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP __sysmmu_enable/disable functions were designed to do ref-count based operations, but current code always calls them only once, so the code for checking the conditions and invalid conditions can be simply removed without any influence to the driver operation. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 65 ++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 48 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 8ba0d6049a63..4056228b8e5f 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -460,9 +460,6 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) __sysmmu_disable_nocount(data); dev_dbg(data->sysmmu, "Disabled\n"); - } else { - dev_dbg(data->sysmmu, "%d times left to disable\n", - data->activations); } spin_unlock_irqrestore(&data->lock, flags); @@ -508,29 +505,18 @@ static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data) static int __sysmmu_enable(struct sysmmu_drvdata *data, phys_addr_t pgtable, struct exynos_iommu_domain *domain) { - int ret = 0; unsigned long flags; spin_lock_irqsave(&data->lock, flags); if (set_sysmmu_active(data)) { data->pgtable = pgtable; data->domain = domain; - __sysmmu_enable_nocount(data); - dev_dbg(data->sysmmu, "Enabled\n"); - } else { - ret = (pgtable == data->pgtable) ? 1 : -EBUSY; - - dev_dbg(data->sysmmu, "already enabled\n"); } - - if (WARN_ON(ret < 0)) - set_sysmmu_inactive(data); /* decrement count */ - spin_unlock_irqrestore(&data->lock, flags); - return ret; + return 0; } static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, @@ -793,8 +779,8 @@ static void exynos_iommu_domain_free(struct iommu_domain *iommu_domain) spin_lock_irqsave(&domain->lock, flags); list_for_each_entry_safe(data, next, &domain->clients, domain_node) { - if (__sysmmu_disable(data)) - data->master = NULL; + __sysmmu_disable(data); + data->master = NULL; list_del_init(&data->domain_node); } @@ -829,31 +815,23 @@ static void exynos_iommu_detach_device(struct iommu_domain *iommu_domain, phys_addr_t pagetable = virt_to_phys(domain->pgtable); struct sysmmu_drvdata *data, *next; unsigned long flags; - bool found = false; if (!has_sysmmu(dev) || owner->domain != iommu_domain) return; spin_lock_irqsave(&domain->lock, flags); list_for_each_entry_safe(data, next, &domain->clients, domain_node) { - if (data->master == dev) { - if (__sysmmu_disable(data)) { - data->master = NULL; - list_del_init(&data->domain_node); - } - pm_runtime_put(data->sysmmu); - found = true; - } + __sysmmu_disable(data); + data->master = NULL; + list_del_init(&data->domain_node); + pm_runtime_put(data->sysmmu); } spin_unlock_irqrestore(&domain->lock, flags); owner->domain = NULL; - if (found) - dev_dbg(dev, "%s: Detached IOMMU with pgtable %pa\n", - __func__, &pagetable); - else - dev_err(dev, "%s: No IOMMU is attached\n", __func__); + dev_dbg(dev, "%s: Detached IOMMU with pgtable %pa\n", __func__, + &pagetable); } static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, @@ -864,7 +842,6 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, struct sysmmu_drvdata *data; phys_addr_t pagetable = virt_to_phys(domain->pgtable); unsigned long flags; - int ret = -ENODEV; if (!has_sysmmu(dev)) return -ENODEV; @@ -874,27 +851,19 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, list_for_each_entry(data, &owner->controllers, owner_node) { pm_runtime_get_sync(data->sysmmu); - ret = __sysmmu_enable(data, pagetable, domain); - if (ret >= 0) { - data->master = dev; + __sysmmu_enable(data, pagetable, domain); + data->master = dev; - spin_lock_irqsave(&domain->lock, flags); - list_add_tail(&data->domain_node, &domain->clients); - spin_unlock_irqrestore(&domain->lock, flags); - } - } - - if (ret < 0) { - dev_err(dev, "%s: Failed to attach IOMMU with pgtable %pa\n", - __func__, &pagetable); - return ret; + spin_lock_irqsave(&domain->lock, flags); + list_add_tail(&data->domain_node, &domain->clients); + spin_unlock_irqrestore(&domain->lock, flags); } owner->domain = iommu_domain; - dev_dbg(dev, "%s: Attached IOMMU with pgtable %pa %s\n", - __func__, &pagetable, (ret == 0) ? "" : ", again"); + dev_dbg(dev, "%s: Attached IOMMU with pgtable %pa\n", __func__, + &pagetable); - return ret; + return 0; } static sysmmu_pte_t *alloc_lv2entry(struct exynos_iommu_domain *domain,