| Message ID | 1590067829-26109-4-git-send-email-mkenna@codeaurora.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: vdev and peer delete synchronization with firmware | expand |
Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote: > Unused structure ath11k_vdev_stop_status is removed. > 'ath11k_mac_get_ar_vdev_stop_status' api has been replaced > with 'ath11k_mac_get_ar_by_vdev_id' inside vdev_stopped_event. > > Tested-on: IPQ8074 WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Ritesh Singh <ritesi@codeaurora.org> > Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> What about other firmware branches? For example, will this break 2.1.0.1 branch support?
On 2020-05-28 13:00, Kalle Valo wrote: > Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote: > >> Unused structure ath11k_vdev_stop_status is removed. >> 'ath11k_mac_get_ar_vdev_stop_status' api has been replaced >> with 'ath11k_mac_get_ar_by_vdev_id' inside vdev_stopped_event. >> >> Tested-on: IPQ8074 WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1 >> >> Signed-off-by: Ritesh Singh <ritesi@codeaurora.org> >> Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> >> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> > > What about other firmware branches? For example, will this break > 2.1.0.1 branch support? [Maha]: It won't break 2.1.0.1 branch as it is host related change. Regards, Maha
Maharaja Kennadyrajan <mkenna@codeaurora.org> writes: > On 2020-05-28 13:00, Kalle Valo wrote: >> Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote: >> >>> Unused structure ath11k_vdev_stop_status is removed. >>> 'ath11k_mac_get_ar_vdev_stop_status' api has been replaced >>> with 'ath11k_mac_get_ar_by_vdev_id' inside vdev_stopped_event. >>> >>> Tested-on: IPQ8074 WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1 >>> >>> Signed-off-by: Ritesh Singh <ritesi@codeaurora.org> >>> Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> >>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> >> >> What about other firmware branches? For example, will this break >> 2.1.0.1 branch support? > > [Maha]: It won't break 2.1.0.1 branch as it is host related change. What do you mean with "host related changed" exactly? In patch 1 I see that you add a new handler for WMI_VDEV_DELETE_RESP_EVENTID event. So firmware functionality is very much involved here, right? For example, do all branches send that event to the host?
On 2020-06-09 17:31, Kalle Valo wrote: > Maharaja Kennadyrajan <mkenna@codeaurora.org> writes: > >> On 2020-05-28 13:00, Kalle Valo wrote: >>> Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote: >>> >>>> Unused structure ath11k_vdev_stop_status is removed. >>>> 'ath11k_mac_get_ar_vdev_stop_status' api has been replaced >>>> with 'ath11k_mac_get_ar_by_vdev_id' inside vdev_stopped_event. >>>> >>>> Tested-on: IPQ8074 WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1 >>>> >>>> Signed-off-by: Ritesh Singh <ritesi@codeaurora.org> >>>> Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org> >>>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> >>> >>> What about other firmware branches? For example, will this break >>> 2.1.0.1 branch support? >> >> [Maha]: It won't break 2.1.0.1 branch as it is host related change. > > What do you mean with "host related changed" exactly? In patch 1 I see > that you add a new handler for WMI_VDEV_DELETE_RESP_EVENTID event. So > firmware functionality is very much involved here, right? For example, > do all branches send that event to the host? [Maha]: You are right, Stop event will come for all the firmware. So, it won't break with other firmware branches. we just replaced the ath11k_mac_get_ar_vdev_stop_status by ath11k_mac_get_ar_by_vdev_id. Regards, Maha
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h index 283846e..ef4c9e4 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -415,11 +415,6 @@ struct ath11k_per_peer_tx_stats { #define ATH11K_FLUSH_TIMEOUT (5 * HZ) #define ATH11K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ) -struct ath11k_vdev_stop_status { - bool stop_in_progress; - u32 vdev_id; -}; - struct ath11k { struct ath11k_base *ab; struct ath11k_pdev *pdev; @@ -494,7 +489,6 @@ struct ath11k { struct completion install_key_done; int last_wmi_vdev_start_status; - struct ath11k_vdev_stop_status vdev_stop_status; struct completion vdev_setup_done; struct completion vdev_delete_done; diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index a936bb6..ffaac779 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -452,31 +452,6 @@ struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id) return NULL; } -struct ath11k *ath11k_mac_get_ar_vdev_stop_status(struct ath11k_base *ab, - u32 vdev_id) -{ - int i; - struct ath11k_pdev *pdev; - struct ath11k *ar; - - for (i = 0; i < ab->num_radios; i++) { - pdev = rcu_dereference(ab->pdevs_active[i]); - if (pdev && pdev->ar) { - ar = pdev->ar; - - spin_lock_bh(&ar->data_lock); - if (ar->vdev_stop_status.stop_in_progress && - ar->vdev_stop_status.vdev_id == vdev_id) { - ar->vdev_stop_status.stop_in_progress = false; - spin_unlock_bh(&ar->data_lock); - return ar; - } - spin_unlock_bh(&ar->data_lock); - } - } - return NULL; -} - static void ath11k_pdev_caps_update(struct ath11k *ar) { struct ath11k_base *ab = ar->ab; @@ -4760,13 +4735,6 @@ static int ath11k_mac_vdev_stop(struct ath11k_vif *arvif) reinit_completion(&ar->vdev_setup_done); - spin_lock_bh(&ar->data_lock); - - ar->vdev_stop_status.stop_in_progress = true; - ar->vdev_stop_status.vdev_id = arvif->vdev_id; - - spin_unlock_bh(&ar->data_lock); - ret = ath11k_wmi_vdev_stop(ar, arvif->vdev_id); if (ret) { ath11k_warn(ar->ab, "failed to stop WMI vdev %i: %d\n", @@ -4795,10 +4763,6 @@ static int ath11k_mac_vdev_stop(struct ath11k_vif *arvif) return 0; err: - spin_lock_bh(&ar->data_lock); - ar->vdev_stop_status.stop_in_progress = false; - spin_unlock_bh(&ar->data_lock); - return ret; } diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h index 0607479..597104a 100644 --- a/drivers/net/wireless/ath/ath11k/mac.h +++ b/drivers/net/wireless/ath/ath11k/mac.h @@ -137,8 +137,6 @@ struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab, u32 vdev_id); struct ath11k *ath11k_mac_get_ar_by_vdev_id(struct ath11k_base *ab, u32 vdev_id); struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id); -struct ath11k *ath11k_mac_get_ar_vdev_stop_status(struct ath11k_base *ab, - u32 vdev_id); void ath11k_mac_drain_tx(struct ath11k *ar); void ath11k_mac_peer_cleanup_all(struct ath11k *ar); diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 7cc0fca..ff85957 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -5207,7 +5207,7 @@ static void ath11k_vdev_stopped_event(struct ath11k_base *ab, struct sk_buff *sk } rcu_read_lock(); - ar = ath11k_mac_get_ar_vdev_stop_status(ab, vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id); if (!ar) { ath11k_warn(ab, "invalid vdev id in vdev stopped ev %d", vdev_id);