Commit 7bf4e594 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / wakeup: Do not fail dev_pm_attach_wake_irq() unnecessarily 



Returning an error code from dev_pm_attach_wake_irq() if
device_wakeup_attach_irq() called by it returns an error is
pointless, because the wakeup source used by it may be deleted
by user space via sysfs at any time and in particular right after
dev_pm_attach_wake_irq() has returned.  Moreover, it requires
the callers of dev_pm_attach_wake_irq() to create that wakeup
source via device_wakeup_enable() upfront, but that obviously is
racy with respect to the sysfs-based manipulations of it.

To avoid the race, modify device_wakeup_attach_irq() to check
that the wakeup source it is going to use is there (and return
early otherwise), make it void (as it cannot fail after that
change) and make dev_pm_attach_wake_irq() simply call it for
the device unconditionally.

Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 32bfa56a

drivers/base/power/power.h

+3 −8
Original line number Diff line number Diff line
@@ -41,20 +41,15 @@ extern void dev_pm_disable_wake_irq_check(struct device *dev); 


#ifdef CONFIG_PM_SLEEP



extern int device_wakeup_attach_irq(struct device *dev,

				    struct wake_irq *wakeirq);

extern void device_wakeup_attach_irq(struct device *dev, struct wake_irq *wakeirq);

extern void device_wakeup_detach_irq(struct device *dev);

extern void device_wakeup_arm_wake_irqs(void);

extern void device_wakeup_disarm_wake_irqs(void);



#else



static inline int

device_wakeup_attach_irq(struct device *dev,

			 struct wake_irq *wakeirq)

{

	return 0;

}

static inline void device_wakeup_attach_irq(struct device *dev,

					    struct wake_irq *wakeirq) {}



static inline void device_wakeup_detach_irq(struct device *dev)

{

drivers/base/power/wakeirq.c

+3 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static int dev_pm_attach_wake_irq(struct device *dev, int irq, 
				  struct wake_irq *wirq)

{

	unsigned long flags;

	int err;



	if (!dev || !wirq)

		return -EINVAL;
@@ -45,12 +44,11 @@ static int dev_pm_attach_wake_irq(struct device *dev, int irq, 
		return -EEXIST;

	}



	err = device_wakeup_attach_irq(dev, wirq);

	if (!err)

	dev->power.wakeirq = wirq;

	device_wakeup_attach_irq(dev, wirq);



	spin_unlock_irqrestore(&dev->power.lock, flags);

	return err;

	return 0;

}



/**

drivers/base/power/wakeup.c

+4 −7
Original line number Diff line number Diff line
@@ -291,22 +291,19 @@ EXPORT_SYMBOL_GPL(device_wakeup_enable); 
 *

 * Call under the device's power.lock lock.

 */

int device_wakeup_attach_irq(struct device *dev,

void device_wakeup_attach_irq(struct device *dev,

			     struct wake_irq *wakeirq)

{

	struct wakeup_source *ws;



	ws = dev->power.wakeup;

	if (!ws) {

		dev_err(dev, "forgot to call device_init_wakeup?\n");

		return -EINVAL;

	}

	if (!ws)

		return;



	if (ws->wakeirq)

		return -EEXIST;

		dev_err(dev, "Leftover wakeup IRQ found, overriding\n");



	ws->wakeirq = wakeirq;

	return 0;

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE