Commit c3c84a74 authored by Pradeep Kumar Chitrapu's avatar Pradeep Kumar Chitrapu Committed by Kalle Valo
Browse files

wifi: ath12k: Correct 6 GHz frequency value in rx status 



The frequency in the rx status is currently being filled
incorrectly for the 6 GHz band. The channel number received is
invalid in this case, resulting in packet drops. Fix this
issue by correcting the frequency calculation.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Fixes: d8899132 ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: default avatarPradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240508173655.22191-3-quic_pradeepc@quicinc.com
parent 3745d796

drivers/net/wireless/ath/ath12k/dp_rx.c

+6 −3
Original line number Diff line number Diff line
@@ -2359,8 +2359,10 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, 
	channel_num = meta_data;

	center_freq = meta_data >> 16;



	if (center_freq >= 5935 && center_freq <= 7105) {

	if (center_freq >= ATH12K_MIN_6G_FREQ &&

	    center_freq <= ATH12K_MAX_6G_FREQ) {

		rx_status->band = NL80211_BAND_6GHZ;

		rx_status->freq = center_freq;

	} else if (channel_num >= 1 && channel_num <= 14) {

		rx_status->band = NL80211_BAND_2GHZ;

	} else if (channel_num >= 36 && channel_num <= 173) {
@@ -2378,6 +2380,7 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, 
				rx_desc, sizeof(*rx_desc));

	}



	if (rx_status->band != NL80211_BAND_6GHZ)

		rx_status->freq = ieee80211_channel_to_frequency(channel_num,

								 rx_status->band);

drivers/net/wireless/ath/ath12k/wmi.c

+7 −3
Original line number Diff line number Diff line
@@ -6022,8 +6022,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) 
	if (rx_ev.status & WMI_RX_STATUS_ERR_MIC)

		status->flag |= RX_FLAG_MMIC_ERROR;



	if (rx_ev.chan_freq >= ATH12K_MIN_6G_FREQ) {

	if (rx_ev.chan_freq >= ATH12K_MIN_6G_FREQ &&

	    rx_ev.chan_freq <= ATH12K_MAX_6G_FREQ) {

		status->band = NL80211_BAND_6GHZ;

		status->freq = rx_ev.chan_freq;

	} else if (rx_ev.channel >= 1 && rx_ev.channel <= 14) {

		status->band = NL80211_BAND_2GHZ;

	} else if (rx_ev.channel >= 36 && rx_ev.channel <= ATH12K_MAX_5G_CHAN) {
@@ -6044,8 +6046,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) 


	sband = &ar->mac.sbands[status->band];



	if (status->band != NL80211_BAND_6GHZ)

		status->freq = ieee80211_channel_to_frequency(rx_ev.channel,

							      status->band);



	status->signal = rx_ev.snr + ATH12K_DEFAULT_NOISE_FLOOR;

	status->rate_idx = ath12k_mac_bitrate_to_idx(sband, rx_ev.rate / 100);