OSDN Git Service

Revert "mwifiex: cancel pcie/sdio work in remove/shutdown handler"
authorBrian Norris <briannorris@chromium.org>
Fri, 12 Jan 2018 21:08:36 +0000 (13:08 -0800)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 16 Jan 2018 16:00:16 +0000 (18:00 +0200)
commit7e34c0d2f631a1ecd4a0a6973502fff72343487e
treeb3946210981ba102373c30a71c0dc28f2b0d5593
parent7e2c49222b4e26590d68578ec8fec0988859c218
Revert "mwifiex: cancel pcie/sdio work in remove/shutdown handler"

This reverts commit b713bbf1471b56b572ce26bd02b81a85c2b007f4.

The "fix" in question does not actually fix all related problems, and it
also introduces new deadlock possibilities. Since commit b014e96d1abb
("PCI: Protect pci_error_handlers->reset_notify() usage with
device_lock()"), the race in question is actually resolved (PCIe reset
cannot happen at the same time as remove()). Instead, this "fix" just
introduces a deadlock where mwifiex_pcie_card_reset_work() is waiting on
device_lock, which is held by PCIe device remove(), which is waiting
on...mwifiex_pcie_card_reset_work().

The proper thing to do is just to fix the deadlock. Patch for this will
come separately.

Cc: Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/pcie.c
drivers/net/wireless/marvell/mwifiex/sdio.c