0068-wifi-ath11k-Remove-disabling-of-80-80-and-160-MHz.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From b100722a777f6455d913666a376f81342b2cb995 Mon Sep 17 00:00:00 2001
  2. From: Muna Sinada <quic_msinada@quicinc.com>
  3. Date: Mon, 17 Apr 2023 13:22:27 -0700
  4. Subject: [PATCH] wifi: ath11k: Remove disabling of 80+80 and 160 MHz
  5. This is a regression fix for 80+80 and 160 MHz support bits being
  6. cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz
  7. capability flags and assign valid center frequency 2 similar to
  8. VHT80_80.
  9. Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware")
  10. Reported-by: Robert Marko <robert.marko@sartura.hr>
  11. Tested-by: Robert Marko <robert.marko@sartura.hr> # IPQ8074 WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1
  12. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299
  13. Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
  14. Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
  15. Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
  16. Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
  17. Link: https://lore.kernel.org/r/1681762947-13882-1-git-send-email-quic_msinada@quicinc.com
  18. ---
  19. drivers/net/wireless/ath/ath11k/mac.c | 4 ----
  20. drivers/net/wireless/ath/ath11k/wmi.c | 3 ++-
  21. 2 files changed, 2 insertions(+), 5 deletions(-)
  22. --- a/drivers/net/wireless/ath/ath11k/mac.c
  23. +++ b/drivers/net/wireless/ath/ath11k/mac.c
  24. @@ -5585,10 +5585,6 @@ static int ath11k_mac_copy_he_cap(struct
  25. he_cap_elem->mac_cap_info[1] &=
  26. IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;
  27. - he_cap_elem->phy_cap_info[0] &=
  28. - ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
  29. - he_cap_elem->phy_cap_info[0] &=
  30. - ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;
  31. he_cap_elem->phy_cap_info[5] &=
  32. ~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;
  33. --- a/drivers/net/wireless/ath/ath11k/wmi.c
  34. +++ b/drivers/net/wireless/ath/ath11k/wmi.c
  35. @@ -871,7 +871,8 @@ static void ath11k_wmi_put_wmi_channel(s
  36. chan->band_center_freq2 = arg->channel.band_center_freq1;
  37. - } else if (arg->channel.mode == MODE_11AC_VHT80_80) {
  38. + } else if ((arg->channel.mode == MODE_11AC_VHT80_80) ||
  39. + (arg->channel.mode == MODE_11AX_HE80_80)) {
  40. chan->band_center_freq2 = arg->channel.band_center_freq2;
  41. } else {
  42. chan->band_center_freq2 = 0;