Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966913AbWK2LFO (ORCPT ); Wed, 29 Nov 2006 06:05:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S967120AbWK2LFO (ORCPT ); Wed, 29 Nov 2006 06:05:14 -0500 Received: from mail.gmx.net ([213.165.64.20]:60386 "HELO mail.gmx.net") by vger.kernel.org with SMTP id S966913AbWK2LFM (ORCPT ); Wed, 29 Nov 2006 06:05:12 -0500 X-Authenticated: #14349625 Subject: [rfc patch] Re: [patch] PM: suspend/resume debugging should depend on SOFTWARE_SUSPEND From: Mike Galbraith To: "Rafael J. Wysocki" Cc: Linus Torvalds , Pavel Machek , Chuck Ebbert <76306.1226@compuserve.com>, linux-kernel , Andrew Morton In-Reply-To: <1164795696.6147.2.camel@Homer.simpson.net> References: <200611190320_MC3-1-D21B-111C@compuserve.com> <1164463898.6221.24.camel@Homer.simpson.net> <200611251812.53246.rjw@sisk.pl> <1164516833.6543.0.camel@Homer.simpson.net> <1164708110.6021.12.camel@Homer.simpson.net> <1164795696.6147.2.camel@Homer.simpson.net> Content-Type: text/plain Date: Wed, 29 Nov 2006 11:30:31 +0100 Message-Id: <1164796231.6147.12.camel@Homer.simpson.net> Mime-Version: 1.0 X-Mailer: Evolution 2.6.0 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1908 Lines: 66 On Wed, 2006-11-29 at 11:21 +0100, Mike Galbraith wrote: > > The serial console appears to be innocent. The suspend/resume methods > > for my 16550A serial port aren't even being _called_, apparently because > > pnp swiped ttyS0. (ahem, bad aim with mouse, resuming) Well, after further rummaging, the suspend/resume methods aren't being called because we're using 8250_pnp.c when CONFIG_PNP is set, and it doesn't have any :) The below works for me, though I'm not sure it's sufficient. If it is deemed sufficient, I'll submit it to Andrew. Add suspend/resume methods to 8250_pnp driver. --- linux-2.6.19-rc6-mm2/drivers/serial/8250_pnp.c.org 2006-11-29 07:14:15.000000000 +0100 +++ linux-2.6.19-rc6-mm2/drivers/serial/8250_pnp.c 2006-11-29 10:55:17.000000000 +0100 @@ -464,11 +464,38 @@ static void __devexit serial_pnp_remove( serial8250_unregister_port(line - 1); } +#ifdef CONFIG_PM +static int serial_pnp_suspend(struct pnp_dev *dev, pm_message_t state) +{ + long line = (long)pnp_get_drvdata(dev); + + if (!line) + return -ENODEV; + serial8250_suspend_port(line - 1); + return 0; +} + +static int serial_pnp_resume(struct pnp_dev *dev) +{ + long line = (long)pnp_get_drvdata(dev); + + if (!line) + return -ENODEV; + serial8250_resume_port(line - 1); + return 0; +} + +#endif /* CONFIG_PM */ + static struct pnp_driver serial_pnp_driver = { .name = "serial", - .id_table = pnp_dev_table, .probe = serial_pnp_probe, .remove = __devexit_p(serial_pnp_remove), +#ifdef CONFIG_PM + .suspend = serial_pnp_suspend, + .resume = serial_pnp_resume, +#endif + .id_table = pnp_dev_table, }; static int __init serial8250_pnp_init(void) - 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/