wil6210: add support for channel 4

wil6210 supports channels 1-3 of the 60GHz band.
New FW added support for channel 4. Add support for channel 4 also in
wil6210 driver.

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index f79c337105cb465f6895f39e7d37d7d1d624db74..1bdb026ae85cf9301b58e34e6f38f16fd21ba839 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -48,9 +48,29 @@ static struct ieee80211_channel wil_60ghz_channels[] = {
        CHAN60G(1, 0),
        CHAN60G(2, 0),
        CHAN60G(3, 0),
-/* channel 4 not supported yet */
+       CHAN60G(4, 0),
 };
 
+static int wil_num_supported_channels(struct wil6210_priv *wil)
+{
+       int num_channels = ARRAY_SIZE(wil_60ghz_channels);
+
+       if (!test_bit(WMI_FW_CAPABILITY_CHANNEL_4, wil->fw_capabilities))
+               num_channels--;
+
+       return num_channels;
+}
+
+void update_supported_bands(struct wil6210_priv *wil)
+{
+       struct wiphy *wiphy = wil_to_wiphy(wil);
+
+       wil_dbg_misc(wil, "update supported bands");
+
+       wiphy->bands[NL80211_BAND_60GHZ]->n_channels =
+                                               wil_num_supported_channels(wil);
+}
+
 /* Vendor id to be used in vendor specific command and events
  * to user space.
  * NOTE: The authoritative place for definition of QCA_NL80211_VENDOR_ID,

diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 7debed6bec06b4dcbbd66dc6e91a9392c9857387..8820cee16a00fac333e7ef27dac4780d0fa3baef 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -1154,6 +1154,8 @@ void wil_refresh_fw_capabilities(struct wil6210_priv *wil)
                wil->max_agg_wsize = WIL_MAX_AGG_WSIZE;
                wil->max_ampdu_size = WIL_MAX_AMPDU_SIZE;
        }
+
+       update_supported_bands(wil);
 }
 
 void wil_mbox_ring_le2cpus(struct wil6210_mbox_ring *r)

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 17c294b1ead13b3bfdca6328481a0a1a7db1a5ae..85565de05840098b202a65c8d61037d40a925905 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -1370,4 +1370,6 @@ int wmi_addba_rx_resp_edma(struct wil6210_priv *wil, u8 mid, u8 cid,
                           u8 tid, u8 token, u16 status, bool amsdu,
                           u16 agg_wsize, u16 timeout);
 
+void update_supported_bands(struct wil6210_priv *wil);
+
 #endif /* __WIL6210_H__ */

diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 139acb2caf92fcac911d5212f7ac1e26c698dd07..f430e1d48e81c1f2aa81b0ba68b8c808b3dc88b3 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -103,6 +103,7 @@ enum wmi_fw_capability {
        WMI_FW_CAPABILITY_AMSDU                         = 23,
        WMI_FW_CAPABILITY_RAW_MODE                      = 24,
        WMI_FW_CAPABILITY_TX_REQ_EXT                    = 25,
+       WMI_FW_CAPABILITY_CHANNEL_4                     = 26,
        WMI_FW_CAPABILITY_MAX,
 };