powerpc/eeh: Fix deadlock when PE frozen state can't be cleared
authorAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Thu, 1 Dec 2016 00:23:05 +0000 (11:23 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 1 Dec 2016 11:26:27 +0000 (22:26 +1100)
commit409bf7f8a02ef88db5a0f2cdcf9489914f4b8508
tree30b48672eb767fdfec1860d412e87c38b24ca4c8
parentdd7b2f035ec41a409f7a7cec7aabc0ec0eacf476
powerpc/eeh: Fix deadlock when PE frozen state can't be cleared

In eeh_reset_device(), we take the pci_rescan_remove_lock immediately after
after we call eeh_reset_pe() to reset the PCI controller. We then call
eeh_clear_pe_frozen_state(), which can return an error. In this case, we
bail out of eeh_reset_device() without calling pci_unlock_rescan_remove().

Add a call to pci_unlock_rescan_remove() in the eeh_clear_pe_frozen_state()
error path so that we don't cause a deadlock later on.

Reported-by: Pradipta Ghosh <pradghos@in.ibm.com>
Fixes: 78954700631f ("powerpc/eeh: Avoid I/O access during PE reset")
Cc: stable@vger.kernel.org # v3.16+
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/eeh_driver.c