| Message ID | 20241221043014.1252841-4-quic_ppranees@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | wifi: ath12k: Enable monitor ring for updating station dump in QCN9274 | expand |
On 12/22/2024 10:45 AM, Karthikeyan Periyasamy wrote: > > > On 12/21/2024 10:00 AM, P Praneesh wrote: >> ath12k_mac_op_configure_filter() gets called multiple times during >> interface bringup. Applying filter configuration from this function leads >> to writing same filter configurations multiple times. >> >> Fix it by moving the filter configuration to ath12k_mac_op_start(). >> >> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 >> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481- >> QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 >> >> Signed-off-by: P Praneesh <quic_ppranees@quicinc.com> >> --- >> drivers/net/wireless/ath/ath12k/mac.c | 55 ++++++++++++++------------- >> 1 file changed, 29 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/ >> wireless/ath/ath12k/mac.c >> index 6f10813d9378..2cb6e9b529d7 100644 >> --- a/drivers/net/wireless/ath/ath12k/mac.c >> +++ b/drivers/net/wireless/ath/ath12k/mac.c >> @@ -7237,8 +7237,34 @@ void ath12k_mac_drain_tx(struct ath12k *ar) >> static int ath12k_mac_config_mon_status_default(struct ath12k *ar, >> bool enable) >> { >> - return -EOPNOTSUPP; >> - /* TODO: Need to support new monitor mode */ >> + struct htt_rx_ring_tlv_filter tlv_filter = {}; >> + struct ath12k_base *ab = ar->ab; >> + u32 ring_id, i; >> + int ret = 0; >> + >> + lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy); >> + >> + if (!ab->hw_params->rxdma1_enable) >> + return ret; >> + >> + if (enable) >> + tlv_filter = ath12k_mac_mon_status_filter_default; > > No need to disable the filter in the else case like below ? > > tlv_filter.rxmon_disable = true; > > Yes, setting this flag to true fully disables the monitor ring. I'll include this change in the next version.
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 6f10813d9378..2cb6e9b529d7 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -7237,8 +7237,34 @@ void ath12k_mac_drain_tx(struct ath12k *ar) static int ath12k_mac_config_mon_status_default(struct ath12k *ar, bool enable) { - return -EOPNOTSUPP; - /* TODO: Need to support new monitor mode */ + struct htt_rx_ring_tlv_filter tlv_filter = {}; + struct ath12k_base *ab = ar->ab; + u32 ring_id, i; + int ret = 0; + + lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy); + + if (!ab->hw_params->rxdma1_enable) + return ret; + + if (enable) + tlv_filter = ath12k_mac_mon_status_filter_default; + + for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) { + ring_id = ar->dp.rxdma_mon_dst_ring[i].ring_id; + ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, + ar->dp.mac_id + i, + HAL_RXDMA_MONITOR_DST, + DP_RXDMA_REFILL_RING_SIZE, + &tlv_filter); + if (ret) { + ath12k_err(ab, + "failed to setup filter for monitor buf %d\n", + ret); + } + } + + return ret; } static int ath12k_mac_start(struct ath12k *ar) @@ -8363,29 +8389,6 @@ static void ath12k_mac_op_remove_interface(struct ieee80211_hw *hw, FIF_PROBE_REQ | \ FIF_FCSFAIL) -static void ath12k_mac_configure_filter(struct ath12k *ar, - unsigned int total_flags) -{ - bool reset_flag; - int ret; - - lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy); - - ar->filter_flags = total_flags; - - /* For monitor mode */ - reset_flag = !(ar->filter_flags & FIF_BCN_PRBRESP_PROMISC); - - ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, reset_flag); - if (ret) - ath12k_warn(ar->ab, - "fail to set monitor filter: %d\n", ret); - - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, - "total_flags:0x%x, reset_flag:%d\n", - total_flags, reset_flag); -} - static void ath12k_mac_op_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *total_flags, @@ -8399,7 +8402,7 @@ static void ath12k_mac_op_configure_filter(struct ieee80211_hw *hw, ar = ath12k_ah_to_ar(ah, 0); *total_flags &= SUPPORTED_FILTERS; - ath12k_mac_configure_filter(ar, *total_flags); + ar->filter_flags = *total_flags; } static int ath12k_mac_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
ath12k_mac_op_configure_filter() gets called multiple times during interface bringup. Applying filter configuration from this function leads to writing same filter configurations multiple times. Fix it by moving the filter configuration to ath12k_mac_op_start(). Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: P Praneesh <quic_ppranees@quicinc.com> --- drivers/net/wireless/ath/ath12k/mac.c | 55 ++++++++++++++------------- 1 file changed, 29 insertions(+), 26 deletions(-)