mt76: mt7615: disable hw/sched scan ops for non-offload firmware
Subsystems (2)
Felix Fietkau
maintainerPATCH v2 1/2 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
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 7 +++++++ drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 8 +++++++- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +7 -0
@@ -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)
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +7 -1
@@ -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);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -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;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH v2 2/2 mt76: mt7615: set hw scan limits only for firmware with offload support
They do not apply to software scan
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +9 -0
@@ -145,10 +145,19 @@ static void mt7615_init_work(struct work_struct *work)mt7615_mcu_del_wtbl_all (dev);if (!mt7615_firmware_offload (dev)) { +struct wiphy *wiphy =mt76_hw (dev)->wiphy; + dev->ops->hw_scan =NULL ; dev->ops->cancel_hw_scan =NULL ; dev->ops->sched_scan_start =NULL ; dev->ops->sched_scan_stop =NULL ; + + wiphy->max_sched_scan_plan_interval =0 ; + wiphy->max_sched_scan_ie_len =0 ; + wiphy->max_scan_ie_len =IEEE80211_MAX_DATA_LEN ; + wiphy->max_sched_scan_ssids =0 ; + wiphy->max_match_sets =0 ; + wiphy->max_sched_scan_reqs =0 ; } }
Signature · 1 line
2.24.0
kbuild test robot
build botI love your patch! Yet something to improve:
Hi Felix,
I love your patch! Yet something to improve:
[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on wireless-drivers/master next-20200409] [cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Felix-Fietkau/mt76-mt7615-disable-hw-sched-scan-ops-for-non-offload-firmware/20200410-021226 base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master config: parisc-allyesconfig (attached as .config) compiler: hppa-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.3.0 make.cross ARCH=parisc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/net/wireless/mediatek/mt76/mt7615/init.c: In function 'mt7615_init_work':
>> drivers/net/wireless/mediatek/mt76/mt7615/init.c:144:7: error: implicit declaration of function 'mt7615_firmware_offload' [-Werror=implicit-function-declaration]
144 | if (!mt7615_firmware_offload(dev)) {
| ^~~~~~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/mt7615_firmware_offload +144 drivers/net/wireless/mediatek/mt76/mt7615/init.c
131
132 static void mt7615_init_work(struct work_struct *work)
133 {
134 struct mt7615_dev *dev = container_of(work, struct mt7615_dev, mcu_work);
135
136 if (mt7615_mcu_init(dev))
137 return;
138
139 mt7615_mcu_set_eeprom(dev);
140 mt7615_mac_init(dev);
141 mt7615_phy_init(dev);
142 mt7615_mcu_del_wtbl_all(dev);
143
> 144 if (!mt7615_firmware_offload(dev)) { 145 dev->ops->hw_scan = NULL;
146 dev->ops->cancel_hw_scan = NULL;
147 dev->ops->sched_scan_start = NULL;
148 dev->ops->sched_scan_stop = NULL;
149 }
150 }
151
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org