diff options
| author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2016-12-01 11:23:05 +1100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:54:41 +0000 |
| commit | 1344f5b6cbcfcdba4c9f1add550cb8ee3b3b08c3 (patch) | |
| tree | a8d0e198ad26975065470d69817bca3b5b45b78a /net/batman-adv | |
| parent | 85dc53fe3bace2fae0740e40a4ce897645f0bbf5 (diff) | |
powerpc/eeh: Fix deadlock when PE frozen state can't be cleared
commit 409bf7f8a02ef88db5a0f2cdcf9489914f4b8508 upstream.
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")
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions