From patchwork Mon Oct 15 13:50:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 10641911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2970D18FD for ; Mon, 15 Oct 2018 14:05:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1735429A2A for ; Mon, 15 Oct 2018 14:05:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B44C29D78; Mon, 15 Oct 2018 14:05:08 +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=-0.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_MUA_MOZILLA,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F210E29A2A for ; Mon, 15 Oct 2018 14:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:References:Message-Id:MIME-Version:Date :Subject:From:To:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: List-Owner; bh=ABQg0TV/CIb10DEi1QA64RvcTgAQXH2LAFJ4F/46hgY=; b=L9Ir/srUBs2V3L REbkxujUkU6SyC6ZdJRt86VnaG1c7tDdvk1GoOiWynV1YFxyy39QNGhoLPUKDHLtqHwL4l5hrbZvm Fp9fdiNwCSsCp2fzgaeqbsJVzIVR/Hfiexh0qi5DXj56f0xFZPpz9vvz76Z8r1WVhFYM4603Xc+kb P3OotpBYuMnDndc65j8QF7mde86LRwMup1fA3SOn9HrYvmyeZVvswsY8ofgCgoyIxQzn/k55+CbHd lVRUMuX6bwq8uoni73ckmthV4F4mhBlvIeMJbnqOU9/dCR8RGTajFW788x3v+gmQMZ3Pk3u08gIdM Kif61lFwdY78/KHt9/2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC3UM-00032p-LR; Mon, 15 Oct 2018 14:04:54 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC3Ti-0002dj-5b for linux-arm-kernel@bombadil.infradead.org; Mon, 15 Oct 2018 14:04:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:Content-Type:Message-Id: Content-Transfer-Encoding:MIME-Version:Date:Subject:From:Cc:To:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Gm0C69trxVMoJDON1Jonkjlvfh9C+/oiS8Qkx4Fi+B8=; b=ABUHRtXv8UUEkzsz+cLJw54EM8 G2iSsJBLYiCABSeT1Ey9vAJa+gojwszaK9PnqfLOxAaeufJC8a0nUgV6Px5vJ8uf1id2pYE8vkwTb JCUyOB1HZlH5HyOZxr1M/Ihv9K3aY3CvpvytWUZMlR8Q2f8HAiu6SWCT5h1zt5GcE8ko0abcPpo46 s6LU1K+Es3pLH7J5xRrIvU10zlwGKsNMBr03sbdWouC4x3y/eQmTh/G0pd4DIoqjcWMlw1EJi7mrm QfjmMwsDsTyxhNlHqgKSpG66e0zSdLgqsecyPxD9ZLid31487H8+9t6/mOAabgkVinsuqGfd41qPW dybCCp4A==; Received: from mailout2.w1.samsung.com ([210.118.77.12]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gC3H7-0004MR-2y for linux-arm-kernel@lists.infradead.org; Mon, 15 Oct 2018 13:51:15 +0000 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181015135056euoutp02b008adb40efae33d0de5a47ce52d167e~dzHZx2MFu1876118761euoutp02G for ; Mon, 15 Oct 2018 13:50:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181015135056euoutp02b008adb40efae33d0de5a47ce52d167e~dzHZx2MFu1876118761euoutp02G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1539611456; bh=Gm0C69trxVMoJDON1Jonkjlvfh9C+/oiS8Qkx4Fi+B8=; h=To:Cc:From:Subject:Date:References:From; b=mwDARhWWW1LMCDDRNP4mFHRHsOxS7FlmYtpo9GWh8Uum6d5a5kkryM3s1cymnnnLW 1RTnbPyZ+B5rNjwsPJ5TYdSTdhQ5Lagrd2ed3fVj+Q3D4KV+u3dQhlfVsoJBy3pOAv 1CCmlYeWQWXbQIiWCTm21BBUu6vFVhpdvG3BrI9o= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181015135056eucas1p23b4dc7c6425e1abd16f52a303d03bd2b~dzHZOOlQC0056600566eucas1p2V; Mon, 15 Oct 2018 13:50:56 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id C5.6C.04294.F3B94CB5; Mon, 15 Oct 2018 14:50:55 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20181015135055eucas1p2fdb917790b3690dd52ee7b9aa19ea677~dzHYfFW2j0676906769eucas1p2c; Mon, 15 Oct 2018 13:50:55 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20181015135055eusmtrp27dd002fe3df5e2f4bcc03a6f388b04c5~dzHYQpVDJ0360603606eusmtrp2s; Mon, 15 Oct 2018 13:50:55 +0000 (GMT) X-AuditID: cbfec7f4-835ff700000010c6-4f-5bc49b3f5cca Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 59.1C.04128.E3B94CB5; Mon, 15 Oct 2018 14:50:55 +0100 (BST) Received: from [106.120.53.102] (unknown [106.120.53.102]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20181015135054eusmtip1da44b949469a0afdf338c5a8aa8c1f1d~dzHX5o-lG0081300813eusmtip1l; Mon, 15 Oct 2018 13:50:54 +0000 (GMT) To: Krzysztof Kozlowski From: Bartlomiej Zolnierkiewicz Subject: [PATCH v2] ARM: SAMSUNG: limit SAMSUNG_PM_DEBUG config option to non-Exynos platforms Date: Mon, 15 Oct 2018 15:50:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsWy7djP87r2s49EG3w5YmSxccZ6Vov+x6+Z Lc6f38BusenxNVaLy7vmsFnMOL+PyeLQ1L2MDuwel69dZPbYtKqTzWPzknqPvi2rGD0+b5IL YI3isklJzcksSy3St0vgypgw4TdzwUfxik/7nzE2ME4U6WLk5JAQMJHo3PuGtYuRi0NIYAWj xKbDa1kgnC+MEm1/VzNCOJ+BMtMWMncxcoC1fL5TAxFfzihx4d8CZgjnPaPEgfN7WUHmigho Slz/+x1sLrPAK0aJhtl7mUASbAJWEhPbVzGC2MICCRKz731mA7FZBFQlpm7sYAHZICoQIdF/ Rh0kzCsgKHFy5hMWEJtZQF5i+9s5YMskBLrZJU4f+8AMUVQmsWXLVUaI61wkFj/gg/hNWOLV 8S3sELaMxP+d85kgeqczSrz5tZQFwlnPKLHmzDEmiCpricPHL7KCDGIG+mD9Ln2IsKPEjmcT oebzSdx4KwhxD5/EpG3ToYHCK9HRJgRRrSaxYdkGNpi1XTtXMkPYHhIty6eD2UICsRIrDq1h nsCoMAvJl7OQfDkL4YYFjMyrGMVTS4tz01OLjfJSy/WKE3OLS/PS9ZLzczcxAhPN6X/Hv+xg 3PUn6RCjAAejEg+vAM+RaCHWxLLiytxDjBIczEoivBIhh6KFeFMSK6tSi/Lji0pzUosPMUpz sCiJ8y6btzFaSCA9sSQ1OzW1ILUIJsvEwSnVwDhlRsLjVKMJhzKW+VZelZJjYxC+4nBd7cbW cLeYrp55zMEWRtsPXHYSSuWcvXJX0FGuC/ffmbPcNp8pmu995drBhVdCd6/VD9GI/lhQvTM1 IUpEU2oJV7et2oeu/gPGrrx7mDm+ORl7mCsvO+/33Ej1tULlXMF0sV+f10UbHG79PuVm/WZ/ VyWW4oxEQy3mouJEAFd0TJkwAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e/4XV372UeiDXpdLTbOWM9q0f/4NbPF +fMb2C02Pb7GanF51xw2ixnn9zFZHJq6l9GB3ePytYvMHptWdbJ5bF5S79G3ZRWjx+dNcgGs UXo2RfmlJakKGfnFJbZK0YYWRnqGlhZ6RiaWeobG5rFWRqZK+nY2Kak5mWWpRfp2CXoZEyb8 Zi74KF7xaf8zxgbGiSJdjBwcEgImEp/v1HQxcnEICSxllNi1qZMFIi4jcXx9WRcjJ5ApLPHn WhcbRM1bRonjHz+xgSREBDQlrv/9zgqSYBZ4xSixZ+J5RpAEm4CVxMT2VWC2sECCxOx7n8Ea eAXsJB4fO8UEYrMIqEpM3djBAmKLCkRI3HoIYfMKCEqcnPkEzGYWUJf4M+8SM4QtL7H97Rzm CYz8s5CUzUJSNgtJ2QJG5lWMIqmlxbnpucVGesWJucWleel6yfm5mxiB8bDt2M8tOxi73gUf YhTgYFTi4RXgORItxJpYVlyZe4hRgoNZSYRXIuRQtBBvSmJlVWpRfnxRaU5q8SFGU6DDJzJL iSbnA2M1ryTe0NTQ3MLS0NzY3NjMQkmc97xBZZSQQHpiSWp2ampBahFMHxMHp1QDo/g/IaGy f9vOP7b1mGAjeFn33dW9p7Uy+i/lOJ9NN+nZcql3ucf6OfpKp3n0FVOYYmP/xzXHl89gsT3d /2d9iPJWvnL9X7rPH9ad8wmy27T/xwrppyceB3N3BEyPL/gVxde7KnHZgfQLWlev6v252bb5 jtQrk6dmj398+H7uj1m/zH71wx8mayixFGckGmoxFxUnAgA1ay4WnQIAAA== Message-Id: <20181015135055eucas1p2fdb917790b3690dd52ee7b9aa19ea677~dzHYfFW2j0676906769eucas1p2c@eucas1p2.samsung.com> X-CMS-MailID: 20181015135055eucas1p2fdb917790b3690dd52ee7b9aa19ea677 X-Msg-Generator: CA X-RootMTR: 20181015135055eucas1p2fdb917790b3690dd52ee7b9aa19ea677 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181015135055eucas1p2fdb917790b3690dd52ee7b9aa19ea677 References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181015_145113_153861_619285A4 X-CRM114-Status: GOOD ( 17.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org, Russell King , Kukjin Kim , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP "Samsung PM Suspend debug" feature (controlled by SAMSUNG_PM_DEBUG config option) is not working properly (debug messages are not displayed after resume) on Exynos platforms because GPIOs restore code is not implemented. Add PLAT_S3C24XX, ARCH_S3C64XX and ARCH_S5PV210 dependencies to SAMSUNG_PM_DEBUG config option to hide it on Exynos platforms. Then convert Exynos code to not require header (use pr_debug() directly instead of S3C_PMDBG() macro and remove redundant s3c_pm_*() calls). Signed-off-by: Bartlomiej Zolnierkiewicz --- v2: - convert Exynos code to not require header Should by applied on top of "[PATCH] ARM: EXYNOS: remove no longer needed s3c_pm_check_*() calls". arch/arm/mach-exynos/suspend.c | 14 ++++---------- arch/arm/plat-samsung/Kconfig | 3 ++- 2 files changed, 6 insertions(+), 11 deletions(-) Index: b/arch/arm/mach-exynos/suspend.c =================================================================== --- a/arch/arm/mach-exynos/suspend.c 2018-10-15 15:11:15.296187842 +0200 +++ b/arch/arm/mach-exynos/suspend.c 2018-10-15 15:22:54.656205454 +0200 @@ -30,8 +30,6 @@ #include #include -#include - #include "common.h" #define REG_TABLE_END (-1U) @@ -490,11 +488,9 @@ static int exynos_suspend_enter(suspend_ { int ret; - s3c_pm_debug_init(); - - S3C_PMDBG("%s: suspending the system...\n", __func__); + pr_debug("%s: suspending the system...\n", __func__); - S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__, + pr_debug("%s: wakeup masks: %08x,%08x\n", __func__, exynos_irqwake_intmask, exynos_get_eint_wake_mask()); if (exynos_irqwake_intmask == -1U @@ -504,7 +500,6 @@ static int exynos_suspend_enter(suspend_ return -EINVAL; } - s3c_pm_save_uarts(); if (pm_data->pm_prepare) pm_data->pm_prepare(); flush_cache_all(); @@ -517,12 +512,11 @@ static int exynos_suspend_enter(suspend_ if (pm_data->pm_resume_prepare) pm_data->pm_resume_prepare(); - s3c_pm_restore_uarts(); - S3C_PMDBG("%s: wakeup stat: %08x\n", __func__, + pr_debug("%s: wakeup stat: %08x\n", __func__, pmu_raw_readl(S5P_WAKEUP_STAT)); - S3C_PMDBG("%s: resuming the system...\n", __func__); + pr_debug("%s: resuming the system...\n", __func__); return 0; } Index: b/arch/arm/plat-samsung/Kconfig =================================================================== --- a/arch/arm/plat-samsung/Kconfig 2018-10-15 15:16:22.804195586 +0200 +++ b/arch/arm/plat-samsung/Kconfig 2018-10-15 15:16:22.800195586 +0200 @@ -238,7 +238,8 @@ comment "Power management" config SAMSUNG_PM_DEBUG bool "Samsung PM Suspend debug" - depends on PM && DEBUG_KERNEL + depends on DEBUG_KERNEL + depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210) depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART help Say Y here if you want verbose debugging from the PM Suspend and