From patchwork Thu Oct 9 09:10:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingchang Lu X-Patchwork-Id: 5057321 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 672AC9F295 for ; Thu, 9 Oct 2014 09:59:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA16F2017D for ; Thu, 9 Oct 2014 09:59:17 +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 C58D6201BC for ; Thu, 9 Oct 2014 09:59:15 +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 1XcASi-0003tp-Tf; Thu, 09 Oct 2014 09:56:44 +0000 Received: from mail-bn1bon0118.outbound.protection.outlook.com ([157.56.111.118] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XcASf-0003rA-Mm for linux-arm-kernel@lists.infradead.org; Thu, 09 Oct 2014 09:56:42 +0000 Received: from BN3PR0301CA0081.namprd03.prod.outlook.com (25.160.152.177) by BLUPR03MB471.namprd03.prod.outlook.com (10.141.78.145) with Microsoft SMTP Server (TLS) id 15.0.1049.19; Thu, 9 Oct 2014 09:56:17 +0000 Received: from BN1BFFO11FD047.protection.gbl (2a01:111:f400:7c10::1:191) by BN3PR0301CA0081.outlook.office365.com (2a01:111:e400:401e::49) with Microsoft SMTP Server (TLS) id 15.0.1049.19 via Frontend Transport; Thu, 9 Oct 2014 09:56:16 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD047.mail.protection.outlook.com (10.58.145.2) with Microsoft SMTP Server (TLS) id 15.0.1039.16 via Frontend Transport; Thu, 9 Oct 2014 09:56:17 +0000 Received: from rock.ap.freescale.net (rock.ap.freescale.net [10.193.20.106]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s999uAfV019570; Thu, 9 Oct 2014 02:56:11 -0700 From: Jingchang Lu To: Subject: [PATCH] serial: of-serial: fix up PM ops on no_console_suspend Date: Thu, 9 Oct 2014 17:10:52 +0800 Message-ID: <1412845852-26157-1-git-send-email-jingchang.lu@freescale.com> X-Mailer: git-send-email 1.8.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(81156004)(87936001)(85852003)(106466001)(89996001)(99396003)(87286001)(105606002)(88136002)(4396001)(50226001)(80022003)(46102003)(97736003)(47776003)(21056001)(20776003)(36756003)(77156001)(62966002)(33646002)(64706001)(110136001)(104016003)(85306004)(86362001)(93916002)(229853001)(2351001)(107046002)(104166001)(50466002)(26826002)(120916001)(6806004)(95666004)(19580395003)(44976005)(84676001)(92566001)(92726001)(50986999)(76482002)(69596002)(31966008)(102836001)(19580405001)(68736004)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB471; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB471; X-Exchange-Antispam-Report-Test: UriScan:; X-Forefront-PRVS: 0359162B6D Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=jingchang.lu@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141009_025641_884590_A4458803 X-CRM114-Status: UNSURE ( 8.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: arnd@arndb.de, Joseph Lo , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Jingchang Lu , linux-arm-kernel@lists.infradead.org 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Mandatorily disabling the uart clock will cause register access hung on "no_console_suspend". This patch add condition check on it and only disable the clock with console_suspend_enabled true. Signed-off-by: Joseph Lo Signed-off-by: Jingchang Lu --- drivers/tty/serial/of_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 8bc2563..a765399 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -246,7 +246,7 @@ static int of_serial_suspend(struct device *dev) struct of_serial_info *info = dev_get_drvdata(dev); serial8250_suspend_port(info->line); - if (info->clk) + if (info->clk && console_suspend_enabled) clk_disable_unprepare(info->clk); return 0; @@ -256,7 +256,7 @@ static int of_serial_resume(struct device *dev) { struct of_serial_info *info = dev_get_drvdata(dev); - if (info->clk) + if (info->clk && console_suspend_enabled) clk_prepare_enable(info->clk); serial8250_resume_port(info->line);