mt76: mt7615: disable hw/sched scan ops for non-offload firmware

Avoid having to attempt hw scan and fall back to software for every scan
on devices/firmware without hw scan support

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 07d4b259fe8aaf1596860d2583907696562cc66f..7f3683205b8e200ab95c7af47adb1f343af32d8e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -143,6 +143,13 @@ static void mt7615_init_work(struct work_struct *work)
        mt7615_mac_init(dev);
        mt7615_phy_init(dev);
        mt7615_mcu_del_wtbl_all(dev);
+
+       if (!mt7615_firmware_offload(dev)) {
+               dev->ops->hw_scan = NULL;
+               dev->ops->cancel_hw_scan = NULL;
+               dev->ops->sched_scan_start = NULL;
+               dev->ops->sched_scan_stop = NULL;
+       }
 }
 
 static int mt7615_init_hardware(struct mt7615_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
index d2eff5442824edb80f3f37959f3ad56114b8b8d6..3849bb6b49d038826e9d5710018701c04403aab4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
@@ -139,11 +139,16 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,
                .sta_remove = mt7615_mac_sta_remove,
                .update_survey = mt7615_update_channel,
        };
+       struct ieee80211_ops *ops;
        struct mt7615_dev *dev;
        struct mt76_dev *mdev;
        int ret;
 
-       mdev = mt76_alloc_device(pdev, sizeof(*dev), &mt7615_ops, &drv_ops);
+       ops = devm_kmemdup(pdev, &mt7615_ops, sizeof(mt7615_ops), GFP_KERNEL);
+       if (!ops)
+               return -ENOMEM;
+
+       mdev = mt76_alloc_device(pdev, sizeof(*dev), ops, &drv_ops);
        if (!mdev)
                return -ENOMEM;
 
@@ -151,6 +156,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,
        mt76_mmio_init(&dev->mt76, mem_base);
 
        dev->reg_map = map;
+       dev->ops = ops;
        mdev->rev = (mt76_rr(dev, MT_HW_CHIPID) << 16) |
                    (mt76_rr(dev, MT_HW_REV) & 0xff);
        dev_dbg(mdev->dev, "ASIC revision: %04x\n", mdev->rev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 65a2b30fc588085063c8312f23820e15c5bfaa90..4f0d29e5e5957b294d5423213e77aaec7ff248de 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -235,6 +235,7 @@ struct mt7615_dev {
 
        u16 chainmask;
 
+       struct ieee80211_ops *ops;
        const struct mt7615_mcu_ops *mcu_ops;
        struct regmap *infracfg;
        const u32 *reg_map;