mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 15:31:14 +07:00
PM: fix irq enable/disable in runtime PM code
This patch (as1305) fixes a bug in the irq-enable settings and removes some related overhead in the runtime PM code. In __pm_runtime_resume(), within the scope of the original spin_lock_irq(), we know that irqs are disabled. There's no reason to go through a pair of enable/disable cycles when acquiring and releasing the parent's lock. In __pm_runtime_set_status(), irqs are already disabled when the parent's lock is acquired, and they must remain disabled when it is released. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
parent
a8a8a669ea
commit
862f89b3d4
@ -328,11 +328,11 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
|
||||
* necessary.
|
||||
*/
|
||||
parent = dev->parent;
|
||||
spin_unlock_irq(&dev->power.lock);
|
||||
spin_unlock(&dev->power.lock);
|
||||
|
||||
pm_runtime_get_noresume(parent);
|
||||
|
||||
spin_lock_irq(&parent->power.lock);
|
||||
spin_lock(&parent->power.lock);
|
||||
/*
|
||||
* We can resume if the parent's run-time PM is disabled or it
|
||||
* is set to ignore children.
|
||||
@ -343,9 +343,9 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
|
||||
if (parent->power.runtime_status != RPM_ACTIVE)
|
||||
retval = -EBUSY;
|
||||
}
|
||||
spin_unlock_irq(&parent->power.lock);
|
||||
spin_unlock(&parent->power.lock);
|
||||
|
||||
spin_lock_irq(&dev->power.lock);
|
||||
spin_lock(&dev->power.lock);
|
||||
if (retval)
|
||||
goto out;
|
||||
goto repeat;
|
||||
@ -777,7 +777,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
|
||||
}
|
||||
|
||||
if (parent) {
|
||||
spin_lock_irq(&parent->power.lock);
|
||||
spin_lock(&parent->power.lock);
|
||||
|
||||
/*
|
||||
* It is invalid to put an active child under a parent that is
|
||||
@ -793,7 +793,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
|
||||
atomic_inc(&parent->power.child_count);
|
||||
}
|
||||
|
||||
spin_unlock_irq(&parent->power.lock);
|
||||
spin_unlock(&parent->power.lock);
|
||||
|
||||
if (error)
|
||||
goto out;
|
||||
|
Loading…
Reference in New Issue
Block a user