Merge "wil6210: prevent device access during PCIe linkdown" (eeb0a3bd) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/ath/wil6210/main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,8 @@ void wil_memcpy_toio_32(volatile void __iomem dst, const void src,
		}
		}

		/* Device memory access is prohibited while reset or suspend.
		/* Device memory access is prohibited while reset, suspend or
		* pci linkdown.
		* wil_mem_access_lock protects accessing device memory in these cases
		*/
		int wil_mem_access_lock(struct wil6210_priv *wil)
		@@ -190,7 +191,8 @@ int wil_mem_access_lock(struct wil6210_priv *wil)
		return -EBUSY;

		if (test_bit(wil_status_suspending, wil->status) \|\|
		test_bit(wil_status_suspended, wil->status)) {
		test_bit(wil_status_suspended, wil->status) \|\|
		test_bit(wil_status_pci_linkdown, wil->status)) {
		up_read(&wil->mem_lock);
		return -EBUSY;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -65,9 +65,10 @@ int wil_fw_copy_crash_dump(struct wil6210_priv wil, void dest, u32 size)
		down_write(&wil->mem_lock);

		if (test_bit(wil_status_suspending, wil->status) \|\|
		test_bit(wil_status_suspended, wil->status)) {
		test_bit(wil_status_suspended, wil->status) \|\|
		test_bit(wil_status_pci_linkdown, wil->status)) {
		wil_err(wil,
		"suspend/resume in progress. cannot copy crash dump\n");
		"suspend/resume/pci linkdown in progress. cannot copy crash dump\n");
		up_write(&wil->mem_lock);
		return -EBUSY;
		}