From patchwork Mon Oct 13 07:37:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingchang Lu X-Patchwork-Id: 5074671 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 883CF9F30B for ; Mon, 13 Oct 2014 08:25:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B95E9201EC for ; Mon, 13 Oct 2014 08:25:55 +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 E4B73201C7 for ; Mon, 13 Oct 2014 08:25:54 +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 1Xdauq-0007JC-3W; Mon, 13 Oct 2014 08:23:40 +0000 Received: from mail-bn1on0136.outbound.protection.outlook.com ([157.56.110.136] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xdaun-0007H3-Dy for linux-arm-kernel@lists.infradead.org; Mon, 13 Oct 2014 08:23:38 +0000 Received: from CO2PR03CA0018.namprd03.prod.outlook.com (10.141.194.145) by DM2PR03MB477.namprd03.prod.outlook.com (10.141.85.19) with Microsoft SMTP Server (TLS) id 15.0.1049.19; Mon, 13 Oct 2014 08:23:13 +0000 Received: from BN1AFFO11FD042.protection.gbl (2a01:111:f400:7c10::164) by CO2PR03CA0018.outlook.office365.com (2a01:111:e400:1414::17) with Microsoft SMTP Server (TLS) id 15.0.1049.19 via Frontend Transport; Mon, 13 Oct 2014 08:23:12 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (TLS) id 15.0.1039.16 via Frontend Transport; Mon, 13 Oct 2014 08:23:11 +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 s9D8N3XF010913; Mon, 13 Oct 2014 01:23:04 -0700 From: Jingchang Lu To: Subject: [PATCHv2] serial: of-serial: fix up PM ops on no_console_suspend and port type Date: Mon, 13 Oct 2014 15:37:00 +0800 Message-ID: <1413185820-5920-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)(189002)(199003)(20776003)(47776003)(80022003)(46102003)(31966008)(4396001)(86362001)(84676001)(50226001)(64706001)(92726001)(93916002)(21056001)(50986999)(26826002)(50466002)(102836001)(48376002)(62966002)(6806004)(68736004)(19580405001)(99396003)(44976005)(77156001)(19580395003)(97736003)(36756003)(69596002)(120916001)(85306004)(76482002)(95666004)(110136001)(106466001)(105606002)(92566001)(107046002)(81156004)(104016003)(33646002)(229853001)(89996001)(2351001)(87936001)(88136002)(87286001)(85852003)(104166001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB477; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB477; X-Forefront-PRVS: 03630A6A4A 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-20141013_012337_648864_F1086CDB X-CRM114-Status: GOOD ( 10.71 ) X-Spam-Score: -0.3 (/) Cc: devicetree@vger.kernel.org, peter@hurleysoftware.com, arnd@arndb.de, 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 This patch fixes commit 2dea53bf57783f243c892e99c10c6921e956aa7e, "serial: of-serial: add PM suspend/resume support", which disables the uart clock on suspend, but also causes a hardware hang on register access if no_console_suspend command line option is used. Also, not every of_serial device is an 8250 port, so the serial8250 suspend/resume functions should only be applied to a real 8250 port. Signed-off-by: Jingchang Lu --- changes in v2: add switch selection on uart type. drivers/tty/serial/of_serial.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 8bc2563..b525383 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -245,9 +245,24 @@ 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) - clk_disable_unprepare(info->clk); + switch(info->type) { +#ifdef CONFIG_SERIAL_8250 + case PORT_8250 ... PORT_MAX_8250: + { + struct uart_8250_port port8250; + port8250 = serial8250_get_port(info->line); + + serial8250_suspend_port(info->line); + if (info->clk && + (!uart_console(port8250) || + (uart_console(port8250) && console_suspend_enabled))) + clk_disable_unprepare(info->clk); + break; + } +#endif + default: + break; + } return 0; } @@ -256,10 +271,25 @@ static int of_serial_resume(struct device *dev) { struct of_serial_info *info = dev_get_drvdata(dev); - if (info->clk) - clk_prepare_enable(info->clk); + switch(info->type) { +#ifdef CONFIG_SERIAL_8250 + case PORT_8250 ... PORT_MAX_8250: + { + struct uart_8250_port port8250; + port8250 = serial8250_get_port(info->line); + + if (info->clk && + (!uart_console(port8250) || + (uart_console(port8250) && console_suspend_enabled))) + clk_prepare_enable(info->clk); - serial8250_resume_port(info->line); + serial8250_resume_port(info->line); + break; + } +#endif + default: + break; + } return 0; }