]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit62df219c9407ed71746786b9dd93a52af12a311a
treeb3946210981ba102373c30a71c0dc28f2b0d5593
parentad2904f877bcd63b0f82415b2890c6067dcbe7b3
Revert "mwifiex: cancel pcie/sdio work in remove/shutdown handler"

This reverts commit ec847b2c725ee048fea83e6b0c2bbc523405eef6.

The "fix" in question does not actually fix all related problems, and it
also introduces new deadlock possibilities. Since commit 0d61c14cc414
("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