Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757181AbXKIVGf (ORCPT ); Fri, 9 Nov 2007 16:06:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751130AbXKIVG1 (ORCPT ); Fri, 9 Nov 2007 16:06:27 -0500 Received: from smtp2.linux-foundation.org ([207.189.120.14]:34719 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbXKIVG0 (ORCPT ); Fri, 9 Nov 2007 16:06:26 -0500 Date: Fri, 9 Nov 2007 13:05:55 -0800 From: Andrew Morton To: Daniel Drake Cc: rjw@sisk.pl, linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org, stern@rowland.harvard.edu, kay.sievers@vrfy.org, linux-hotplug-devel@lists.sourceforge.net, greg@kroah.com, oneukum@suse.de Subject: Re: [PATCH] create /sys/.../power when CONFIG_PM is set Message-Id: <20071109130555.5304d49a.akpm@linux-foundation.org> In-Reply-To: <20071107101043.2E64C9D4ECC@zog.reactivated.net> References: <20071107101043.2E64C9D4ECC@zog.reactivated.net> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5776 Lines: 187 On Wed, 7 Nov 2007 10:10:43 +0000 (GMT) Daniel Drake wrote: > The CONFIG_SUSPEND changes in 2.6.23 caused a regression under certain > configuration conditions (SUSPEND=n, USB_AUTOSUSPEND=y) where all USB device > attributes in sysfs (idVendor, idProduct, ...) silently disappeared, causing > udev breakage and more. > > The cause of this is that the /sys/.../power subdirectory is now only created > when CONFIG_PM_SLEEP is set, however, it should be created whenever CONFIG_PM > is set to handle the above situation. The following patch fixes the > regression. > Your patch is for 2.6.24-rc2 and 2.6.23, afacit. It needed some work to apply on Greg's tree because the new pm_sleep_lock() and pm_sleep_unlock() went and copied the same bug as you've fixed here. I guess the right thing to do is to apply your patch as-is to 2.6.24-rcX and to 2.6.23.x. I can't really do that because doing so would wreck my copy of Greg's tree. So I'll run with the below (I think it's right) and will let Greg sort it out ;) From: Daniel Drake The CONFIG_SUSPEND changes in 2.6.23 caused a regression under certain configuration conditions (SUSPEND=n, USB_AUTOSUSPEND=y) where all USB device attributes in sysfs (idVendor, idProduct, ...) silently disappeared, causing udev breakage and more. The cause of this is that the /sys/.../power subdirectory is now only created when CONFIG_PM_SLEEP is set, however, it should be created whenever CONFIG_PM is set to handle the above situation. The following patch fixes the regression. Signed-off-by: Daniel Drake Acked-by: Rafael J. Wysocki Cc: Alan Stern Cc: Greg KH Cc: Kay Sievers Cc: Signed-off-by: Andrew Morton --- drivers/base/core.c | 4 ++- drivers/base/power/Makefile | 3 +- drivers/base/power/main.c | 8 ------ drivers/base/power/power.h | 40 ++++++++++++++++++++++------------ 4 files changed, 33 insertions(+), 22 deletions(-) diff -puN drivers/base/core.c~create-sys-power-when-config_pm-is-set drivers/base/core.c --- a/drivers/base/core.c~create-sys-power-when-config_pm-is-set +++ a/drivers/base/core.c @@ -785,9 +785,10 @@ int device_add(struct device *dev) error = device_add_attrs(dev); if (error) goto AttrsError; - error = device_pm_add(dev); + error = dpm_sysfs_add(dev); if (error) goto PMError; + device_pm_add(dev); error = bus_add_device(dev); if (error) goto BusError; @@ -813,6 +814,7 @@ int device_add(struct device *dev) return error; BusError: device_pm_remove(dev); + dpm_sysfs_remove(dev); PMError: if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, diff -puN drivers/base/power/Makefile~create-sys-power-when-config_pm-is-set drivers/base/power/Makefile --- a/drivers/base/power/Makefile~create-sys-power-when-config_pm-is-set +++ a/drivers/base/power/Makefile @@ -1,5 +1,6 @@ obj-y := shutdown.o -obj-$(CONFIG_PM_SLEEP) += main.o sysfs.o +obj-$(CONFIG_PM) += sysfs.o +obj-$(CONFIG_PM_SLEEP) += main.o obj-$(CONFIG_PM_TRACE) += trace.o ifeq ($(CONFIG_DEBUG_DRIVER),y) diff -puN drivers/base/power/main.c~create-sys-power-when-config_pm-is-set drivers/base/power/main.c --- a/drivers/base/power/main.c~create-sys-power-when-config_pm-is-set +++ a/drivers/base/power/main.c @@ -59,20 +59,14 @@ static DECLARE_RWSEM(pm_sleep_rwsem); int (*platform_enable_wakeup)(struct device *dev, int is_on); -int device_pm_add(struct device *dev) +void device_pm_add(struct device *dev) { - int error; - pr_debug("PM: Adding info for %s:%s\n", dev->bus ? dev->bus->name : "No Bus", kobject_name(&dev->kobj)); mutex_lock(&dpm_list_mtx); list_add_tail(&dev->power.entry, &dpm_active); - error = dpm_sysfs_add(dev); - if (error) - list_del(&dev->power.entry); mutex_unlock(&dpm_list_mtx); - return error; } void device_pm_remove(struct device *dev) diff -puN drivers/base/power/power.h~create-sys-power-when-config_pm-is-set drivers/base/power/power.h --- a/drivers/base/power/power.h~create-sys-power-when-config_pm-is-set +++ a/drivers/base/power/power.h @@ -13,31 +13,23 @@ extern void device_shutdown(void); extern struct list_head dpm_active; /* The active device list */ -static inline struct device * to_device(struct list_head * entry) +static inline struct device *to_device(struct list_head *entry) { return container_of(entry, struct device, power.entry); } -extern int device_pm_add(struct device *); +extern void device_pm_add(struct device *); extern void device_pm_remove(struct device *); extern int pm_sleep_lock(void); extern void pm_sleep_unlock(void); -/* - * sysfs.c - */ - -extern int dpm_sysfs_add(struct device *); -extern void dpm_sysfs_remove(struct device *); - #else /* CONFIG_PM_SLEEP */ - -static inline int device_pm_add(struct device * dev) +static inline void device_pm_add(struct device *dev) { - return 0; } -static inline void device_pm_remove(struct device * dev) + +static inline void device_pm_remove(struct device *dev) { } @@ -51,3 +43,25 @@ static inline void pm_sleep_unlock(void) } #endif + +#ifdef CONFIG_PM + +/* + * sysfs.c + */ + +extern int dpm_sysfs_add(struct device *); +extern void dpm_sysfs_remove(struct device *); + +#else /* CONFIG_PM */ + +static inline int dpm_sysfs_add(struct device *dev) +{ + return 0; +} + +static inline void dpm_sysfs_remove(struct device *dev) +{ +} + +#endif _ - 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/