wifi: mt76: fix 6GHz high channel not be scanned

[ Upstream commit 23792cedaff02351b57bddd8957fc917fa88f2e0 ]

mt76 scan command only support 64 channels currently. If the
channel count is larger than 64(for 2+5+6GHz), some channels will
not be scanned. Hence change the scan type to full channel scan
in case of the command cannot include proper list for chip.

Fixes: 399090ef9605 ("mt76: mt76_connac: move hw_scan and sched_scan routine in mt76_connac_mcu module")
Reported-by: Ben Greear <greearb@candelatech.com>
Tested-by: Isaac Konikoff <konikofi@candelatech.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 025a237c1cce8f26af77d29c81355248fc82285c..546cbe21aab31a3c920f41a5b90e6d46e18fb8e9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -1561,8 +1561,16 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
        req->channel_min_dwell_time = cpu_to_le16(duration);
        req->channel_dwell_time = cpu_to_le16(duration);
 
-       req->channels_num = min_t(u8, sreq->n_channels, 32);
-       req->ext_channels_num = min_t(u8, ext_channels_num, 32);
+       if (sreq->n_channels == 0 || sreq->n_channels > 64) {
+               req->channel_type = 0;
+               req->channels_num = 0;
+               req->ext_channels_num = 0;
+       } else {
+               req->channel_type = 4;
+               req->channels_num = min_t(u8, sreq->n_channels, 32);
+               req->ext_channels_num = min_t(u8, ext_channels_num, 32);
+       }
+
        for (i = 0; i < req->channels_num + req->ext_channels_num; i++) {
                if (i >= 32)
                        chan = &req->ext_channels[i - 32];
@@ -1582,7 +1590,6 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
                }
                chan->channel_num = scan_list[i]->hw_value;
        }
-       req->channel_type = sreq->n_channels ? 4 : 0;
 
        if (sreq->ie_len > 0) {
                memcpy(req->ies, sreq->ie, sreq->ie_len);