Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbaJMIXT (ORCPT ); Mon, 13 Oct 2014 04:23:19 -0400 Received: from mail-bl2on0127.outbound.protection.outlook.com ([65.55.169.127]:30359 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751937AbaJMIXQ (ORCPT ); Mon, 13 Oct 2014 04:23:16 -0400 From: Jingchang Lu To: CC: , , , , , , Jingchang Lu 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 Content-Type: text/plain X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB477; X-Forefront-PRVS: 03630A6A4A Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=jingchang.lu@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/