| Message ID | 20240725120035.493-12-quic_kangyang@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: some fixes and clean up for monitor mode | expand |
On 7/25/2024 5:00 AM, kangyang wrote: > From: Kang Yang <quic_kangyang@quicinc.com> > > Currently mon reap timer is not used, and it is not needed anymore. > > So remove related code. > > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Signed-off-by: Kang Yang <quic_kangyang@quicinc.com> > --- > drivers/net/wireless/ath/ath12k/core.h | 2 -- > drivers/net/wireless/ath/ath12k/dp.c | 25 ------------------------- > 2 files changed, 27 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h > index daf7c04bb728..83ef92ecdc39 100644 > --- a/drivers/net/wireless/ath/ath12k/core.h > +++ b/drivers/net/wireless/ath/ath12k/core.h > @@ -888,8 +888,6 @@ struct ath12k_base { > struct ath12k_dbring_cap *db_caps; > u32 num_db_cap; > > - struct timer_list mon_reap_timer; > - > struct completion htc_suspend; > > u64 fw_soc_drop_count; > diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c > index 61aa78d8bd8c..547ecb419809 100644 > --- a/drivers/net/wireless/ath/ath12k/dp.c > +++ b/drivers/net/wireless/ath/ath12k/dp.c > @@ -974,8 +974,6 @@ void ath12k_dp_pdev_free(struct ath12k_base *ab) > { > int i; > > - del_timer_sync(&ab->mon_reap_timer); > - > for (i = 0; i < ab->num_radios; i++) > ath12k_dp_rx_pdev_free(ab, i); > } > @@ -1020,27 +1018,6 @@ void ath12k_dp_hal_rx_desc_init(struct ath12k_base *ab) > ab->hal_rx_ops->rx_desc_get_desc_size(); > } > > -static void ath12k_dp_service_mon_ring(struct timer_list *t) > -{ > - struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer); > - int i; > - > - for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) > - ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET, > - ATH12K_DP_RX_MONITOR_MODE); > - > - mod_timer(&ab->mon_reap_timer, jiffies + > - msecs_to_jiffies(ATH12K_MON_TIMER_INTERVAL)); > -} > - > -static void ath12k_dp_mon_reap_timer_init(struct ath12k_base *ab) > -{ > - if (ab->hw_params->rxdma1_enable) > - return; > - > - timer_setup(&ab->mon_reap_timer, ath12k_dp_service_mon_ring, 0); > -} > - > int ath12k_dp_pdev_alloc(struct ath12k_base *ab) > { > struct ath12k *ar; > @@ -1051,8 +1028,6 @@ int ath12k_dp_pdev_alloc(struct ath12k_base *ab) > if (ret) > goto out; > > - ath12k_dp_mon_reap_timer_init(ab); > - > /* TODO: Per-pdev rx ring unlike tx ring which is mapped to different AC's */ > for (i = 0; i < ab->num_radios; i++) { > ar = ab->pdevs[i].ar;
Hi Jeff, Jeff Johnson <quic_jjohnson@quicinc.com> wrote: > > On 7/25/2024 5:00 AM, kangyang wrote: > > From: Kang Yang <quic_kangyang@quicinc.com> > > > > Currently mon reap timer is not used, and it is not needed anymore. > > > > So remove related code. > > > > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > > > Signed-off-by: Kang Yang <quic_kangyang@quicinc.com> > > --- > > drivers/net/wireless/ath/ath12k/core.h | 2 -- > > drivers/net/wireless/ath/ath12k/dp.c | 25 ------------------------- > > 2 files changed, 27 deletions(-) > > > > diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h > > index daf7c04bb728..83ef92ecdc39 100644 > > --- a/drivers/net/wireless/ath/ath12k/core.h > > +++ b/drivers/net/wireless/ath/ath12k/core.h > > @@ -888,8 +888,6 @@ struct ath12k_base { > > struct ath12k_dbring_cap *db_caps; > > u32 num_db_cap; > > > > - struct timer_list mon_reap_timer; > > - > > struct completion htc_suspend; > > > > u64 fw_soc_drop_count; > > diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c > > index 61aa78d8bd8c..547ecb419809 100644 > > --- a/drivers/net/wireless/ath/ath12k/dp.c > > +++ b/drivers/net/wireless/ath/ath12k/dp.c > > @@ -974,8 +974,6 @@ void ath12k_dp_pdev_free(struct ath12k_base *ab) > > { > > int i; > > > > - del_timer_sync(&ab->mon_reap_timer); > > - > > for (i = 0; i < ab->num_radios; i++) > > ath12k_dp_rx_pdev_free(ab, i); > > } > > @@ -1020,27 +1018,6 @@ void ath12k_dp_hal_rx_desc_init(struct ath12k_base *ab) > > ab->hal_rx_ops->rx_desc_get_desc_size(); > > } > > > > -static void ath12k_dp_service_mon_ring(struct timer_list *t) > > -{ > > - struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer); > > - int i; > > - > > - for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) > > - ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET, > > - ATH12K_DP_RX_MONITOR_MODE); > > - > > - mod_timer(&ab->mon_reap_timer, jiffies + > > - msecs_to_jiffies(ATH12K_MON_TIMER_INTERVAL)); > > -} > > - > > -static void ath12k_dp_mon_reap_timer_init(struct ath12k_base *ab) > > -{ > > - if (ab->hw_params->rxdma1_enable) > > - return; > > - > > - timer_setup(&ab->mon_reap_timer, ath12k_dp_service_mon_ring, 0); > > -} > > - > > int ath12k_dp_pdev_alloc(struct ath12k_base *ab) > > { > > struct ath12k *ar; > > @@ -1051,8 +1028,6 @@ int ath12k_dp_pdev_alloc(struct ath12k_base *ab) > > if (ret) > > goto out; > > > > - ath12k_dp_mon_reap_timer_init(ab); > > - > > /* TODO: Per-pdev rx ring unlike tx ring which is mapped to different AC's */ > > for (i = 0; i < ab->num_radios; i++) { > > ar = ab->pdevs[i].ar; > Not sure if you send out this mail incompletely. Lore [1] doesn't have complete message neither. [1] https://lore.kernel.org/linux-wireless/2a44b24b-f122-44de-a053-fee07753eb7e@quicinc.com/T/#m1011a89113009a14c9d450dba31d8d11d36b5b6b
On 7/25/2024 5:00 AM, kangyang wrote: > From: Kang Yang <quic_kangyang@quicinc.com> > > Currently mon reap timer is not used, and it is not needed anymore. > > So remove related code. > > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Signed-off-by: Kang Yang <quic_kangyang@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
On 7/25/2024 6:57 PM, Ping-Ke Shih wrote: > Not sure if you send out this mail incompletely. Lore [1] doesn't have complete > message neither. > > [1] https://lore.kernel.org/linux-wireless/2a44b24b-f122-44de-a053-fee07753eb7e@quicinc.com/T/#m1011a89113009a14c9d450dba31d8d11d36b5b6b Thanks for catching this, now sent with my Acked-by properly added.
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h index daf7c04bb728..83ef92ecdc39 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h @@ -888,8 +888,6 @@ struct ath12k_base { struct ath12k_dbring_cap *db_caps; u32 num_db_cap; - struct timer_list mon_reap_timer; - struct completion htc_suspend; u64 fw_soc_drop_count; diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c index 61aa78d8bd8c..547ecb419809 100644 --- a/drivers/net/wireless/ath/ath12k/dp.c +++ b/drivers/net/wireless/ath/ath12k/dp.c @@ -974,8 +974,6 @@ void ath12k_dp_pdev_free(struct ath12k_base *ab) { int i; - del_timer_sync(&ab->mon_reap_timer); - for (i = 0; i < ab->num_radios; i++) ath12k_dp_rx_pdev_free(ab, i); } @@ -1020,27 +1018,6 @@ void ath12k_dp_hal_rx_desc_init(struct ath12k_base *ab) ab->hal_rx_ops->rx_desc_get_desc_size(); } -static void ath12k_dp_service_mon_ring(struct timer_list *t) -{ - struct ath12k_base *ab = from_timer(ab, t, mon_reap_timer); - int i; - - for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) - ath12k_dp_mon_process_ring(ab, i, NULL, DP_MON_SERVICE_BUDGET, - ATH12K_DP_RX_MONITOR_MODE); - - mod_timer(&ab->mon_reap_timer, jiffies + - msecs_to_jiffies(ATH12K_MON_TIMER_INTERVAL)); -} - -static void ath12k_dp_mon_reap_timer_init(struct ath12k_base *ab) -{ - if (ab->hw_params->rxdma1_enable) - return; - - timer_setup(&ab->mon_reap_timer, ath12k_dp_service_mon_ring, 0); -} - int ath12k_dp_pdev_alloc(struct ath12k_base *ab) { struct ath12k *ar; @@ -1051,8 +1028,6 @@ int ath12k_dp_pdev_alloc(struct ath12k_base *ab) if (ret) goto out; - ath12k_dp_mon_reap_timer_init(ab); - /* TODO: Per-pdev rx ring unlike tx ring which is mapped to different AC's */ for (i = 0; i < ab->num_radios; i++) { ar = ab->pdevs[i].ar;