From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - pm-serio-speed-up-resume.patch removed from -mm tree Date: Mon, 21 Jul 2008 14:30:09 -0700 Message-ID: <200807212130.m6LLU9kC025488@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:35677 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbYGUVbD (ORCPT ); Mon, 21 Jul 2008 17:31:03 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: shaohua.li@intel.com, dtor@mail.ru, lenb@kernel.org, pavel@ucw.cz, rjw@sisk.pl, mm-commits@vger.kernel.org The patch titled pm: serio: speed up resume has been removed from the -mm tree. Its filename was pm-serio-speed-up-resume.patch This patch was dropped because conflicting code has been merged into linux-next The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pm: serio: speed up resume From: Shaohua Li Subject: serio: Speed-up resume serio_resume will call into psmouse_extensions(). In my test, the routine is very slow, it blocks resume about 1 sec. Below patch (move resume to kseriod, just like boot time probe) cures the issue in my test, and seems no side effect. I'm no familiar with serio driver, so please check. Signed-off-by: Shaohua Li Acked-by: Len Brown Signed-off-by: Rafael J. Wysocki Cc: Dmitry Torokhov Acked-by: Pavel Machek Signed-off-by: Andrew Morton --- drivers/input/serio/serio.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff -puN drivers/input/serio/serio.c~pm-serio-speed-up-resume drivers/input/serio/serio.c --- a/drivers/input/serio/serio.c~pm-serio-speed-up-resume +++ a/drivers/input/serio/serio.c @@ -163,6 +163,7 @@ enum serio_event_type { SERIO_RECONNECT_PORT, SERIO_REGISTER_PORT, SERIO_ATTACH_DRIVER, + SERIO_RESUME_PORT, }; struct serio_event { @@ -287,6 +288,13 @@ static struct serio_event *serio_get_eve return event; } +#ifdef CONFIG_PM +static void serio_resume_port(struct device *dev); +#else +static inline void serio_resume_port(struct device *dev) +{ +} +#endif /* CONFIG_PM */ static void serio_handle_event(void) { struct serio_event *event; @@ -319,6 +327,10 @@ static void serio_handle_event(void) serio_attach_driver(event->object); break; + case SERIO_RESUME_PORT: + serio_resume_port(event->object); + break; + default: break; } @@ -925,21 +937,26 @@ static int serio_suspend(struct device * return 0; } -static int serio_resume(struct device *dev) +static void serio_resume_port(struct device *dev) { struct serio *serio = to_serio_port(dev); - if (dev->power.power_state.event != PM_EVENT_ON && - serio_reconnect_driver(serio)) { - /* - * Driver re-probing can take a while, so better let kseriod - * deal with it. - */ - serio_rescan(serio); + if (serio_reconnect_driver(serio)) { + serio_disconnect_port(serio); + serio_find_driver(serio); } dev->power.power_state = PMSG_ON; +} +static int serio_resume(struct device *dev) +{ + /* + * Driver reconnect can take a while, so better let kseriod + * deal with it. + */ + if (dev->power.power_state.event != PM_EVENT_ON) + serio_queue_event(dev, NULL, SERIO_RESUME_PORT); return 0; } #endif /* CONFIG_PM */ _ Patches currently in -mm which might be from shaohua.li@intel.com are origin.patch linux-next.patch git-input.patch pm-serio-speed-up-resume.patch pm-acpi-hibernation-utilize-hardware-signature.patch pm-acpi-hibernation-utilize-hardware-signaturepatch-causes-build-error.patch