@@ -86,6 +86,7 @@ static inline int pciehp_request_irq(struct controller *ctrl)
if (pciehp_poll_mode) {
init_timer(&ctrl->poll_timer);
start_int_poll_timer(ctrl, 10);
+ pm_runtime_get(&ctrl->pcie->port->dev);
return 0;
}
@@ -99,9 +100,10 @@ static inline int pciehp_request_irq(struct controller *ctrl)
static inline void pciehp_free_irq(struct controller *ctrl)
{
- if (pciehp_poll_mode)
+ if (pciehp_poll_mode) {
del_timer_sync(&ctrl->poll_timer);
- else
+ pm_runtime_put(&ctrl->pcie->port->dev);
+ } else
free_irq(ctrl->pcie->irq, ctrl);
}
The slot status is polled from a timer, i.e. in softirq context, and pm_runtime_get_sync() may sleep. Hence it's not an option to runtime resume the port whenever its slot status is polled. It would also be silly to continuously switch back and forth between D0 and D3hot, so keep it runtime active if poll mode is enabled. Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Erik Veijola <erik.veijola@linux.intel.com> Cc: Ashok Raj <ashok.raj@intel.com> Cc: Keith Busch <keith.busch@intel.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Krishna Dhulipala <krishnad@fb.com> Cc: Wei Zhang <wzhang@fb.com> Signed-off-by: Lukas Wunner <lukas@wunner.de> --- drivers/pci/hotplug/pciehp_hpc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)