From: Ben Greear <[email protected]>
My wave-1 firmware often crashes when I am bringing down
AP vdevs, and sometimes at least some machines lockup hard
after spewing IOMMU errors.
I don't see the same issue in STA mode, so I suspect beacons
are the issue.
Moving the beacon buf deletion to later in the vdev teardown
logic appears to help this problem. Firmware still crashes
often, but several iterations did not show IOMMU errors and
machine didn't hang.
Signed-off-by: Ben Greear <[email protected]>
---
drivers/net/wireless/ath/ath10k/mac.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f70c48ec9464..c38561788791 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6142,10 +6142,6 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
mutex_lock(&ar->conf_mutex);
- spin_lock_bh(&ar->data_lock);
- ath10k_mac_vif_beacon_cleanup(arvif);
- spin_unlock_bh(&ar->data_lock);
-
ret = ath10k_spectral_vif_stop(arvif);
if (ret)
ath10k_warn(ar, "failed to stop spectral for vdev %i: %d\n",
@@ -6204,6 +6200,10 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
peer->vif = NULL;
}
}
+
+ /* Clean this up late, less opportunity for firmware to access
+ DMA memory we have deleted. */
+ ath10k_mac_vif_beacon_cleanup(arvif);
spin_unlock_bh(&ar->data_lock);
ath10k_peer_cleanup(ar, arvif->vdev_id);
--
2.20.1
[email protected] wrote:
> My wave-1 firmware often crashes when I am bringing down
> AP vdevs, and sometimes at least some machines lockup hard
> after spewing IOMMU errors.
>
> I don't see the same issue in STA mode, so I suspect beacons
> are the issue.
>
> Moving the beacon buf deletion to later in the vdev teardown
> logic appears to help this problem. Firmware still crashes
> often, but several iterations did not show IOMMU errors and
> machine didn't hang.
I'm not really fond of fixing issues just by luck but after a quick look at the
code I can't see any harm in this change either. So I guess it's ok.
But can you provide the exact hardware and firmware you used for testing, I'll
add it to the commit log. I want to document that in every commit:
https://wireless.wiki.kernel.org/en/users/drivers/ath10k/submittingpatches#guidelines
Please also CC ath10k list when submitting patches.
--
https://patchwork.kernel.org/patch/10831867/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
[email protected] wrote:
> My wave-1 firmware often crashes when I am bringing down
> AP vdevs, and sometimes at least some machines lockup hard
> after spewing IOMMU errors.
>
> I don't see the same issue in STA mode, so I suspect beacons
> are the issue.
>
> Moving the beacon buf deletion to later in the vdev teardown
> logic appears to help this problem. Firmware still crashes
> often, but several iterations did not show IOMMU errors and
> machine didn't hang.
>
> Tested hardware: QCA9880
> Tested firmware: ath10k-ct from beginning of 2019, exact version unknown
>
> Signed-off-by: Ben Greear <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
b3281c6cb768 ath10k: free beacon buf later in vdev teardown
--
https://patchwork.kernel.org/patch/10831867/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches