From: David S. Miller Date: Tue, 21 Jul 2020 00:52:50 +0000 (-0700) Subject: Merge tag 'wireless-drivers-next-2020-07-20' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.9-rc1~133^2~187 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/cfd6920175ac848e057ed258e87c427792f371d0?hp=-c Merge tag 'wireless-drivers-next-2020-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Kalle Valo says: ==================== wireless-drivers-next patches for v5.9 First set of patches for v5.9. This comes later than usual as I was offline for two weeks. The biggest change here is moving Microchip wilc1000 driver from staging. There was an immutable topic branch with one commit moving the whole driver and the topic branch was pulled both to staging-next and wireless-drivers-next. At the moment the only reported conflict is in MAINTAINERS file, so I'm hoping the move should go smoothly. Other notable changes are ath11k getting 6 GHz band support and rtw88 supporting RTL8821CE. And there's also the usual fixes, API changes and cleanups all over. Major changes: wilc1000 * move from drivers/staging to drivers/net/wireless/microchip ath11k * add 6G band support * add spectral scan support iwlwifi * make FW reconfiguration quieter by not using warn level rtw88 * add support for RTL8821CE ==================== Signed-off-by: David S. Miller --- cfd6920175ac848e057ed258e87c427792f371d0 diff --combined MAINTAINERS index b325ed166228,099e672ec6e6..6200eb14757c --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -147,7 -147,7 +147,7 @@@ Maintainers Lis M: Steffen Klassert L: netdev@vger.kernel.org S: Odd Fixes -F: Documentation/networking/device_drivers/3com/vortex.rst +F: Documentation/networking/device_drivers/ethernet/3com/vortex.rst F: drivers/net/ethernet/3com/3c59x.c 3CR990 NETWORK DRIVER @@@ -816,7 -816,7 +816,7 @@@ R: Saeed Bishara L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/amazon/ena.rst +F: Documentation/networking/device_drivers/ethernet/amazon/ena.rst F: drivers/net/ethernet/amazon/ AMAZON RDMA EFA DRIVER @@@ -1295,7 -1295,7 +1295,7 @@@ L: netdev@vger.kernel.or S: Supported W: https://www.marvell.com/ Q: http://patchwork.ozlabs.org/project/netdev/list/ -F: Documentation/networking/device_drivers/aquantia/atlantic.rst +F: Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst F: drivers/net/ethernet/aquantia/atlantic/ AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM @@@ -2929,7 -2929,6 +2929,7 @@@ F: include/uapi/linux/atm ATMEL MACB ETHERNET DRIVER M: Nicolas Ferre +M: Claudiu Beznea S: Supported F: drivers/net/ethernet/cadence/ @@@ -3307,7 -3306,7 +3307,7 @@@ X: arch/riscv/net/bpf_jit_comp32. BPF JIT for S390 M: Ilya Leoshkevich -M: Heiko Carstens +M: Heiko Carstens M: Vasily Gorbik L: netdev@vger.kernel.org L: bpf@vger.kernel.org @@@ -3947,7 -3946,7 +3947,7 @@@ L: linux-crypto@vger.kernel.or S: Supported F: drivers/char/hw_random/cctrng.c F: drivers/char/hw_random/cctrng.h -F: Documentation/devicetree/bindings/rng/arm-cctrng.txt +F: Documentation/devicetree/bindings/rng/arm-cctrng.yaml W: https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family CEC FRAMEWORK @@@ -4754,7 -4753,7 +4754,7 @@@ F: net/ax25/sysctl_net_ax25. DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER L: netdev@vger.kernel.org S: Orphan -F: Documentation/networking/device_drivers/dec/dmfe.rst +F: Documentation/networking/device_drivers/ethernet/dec/dmfe.rst F: drivers/net/ethernet/dec/tulip/dmfe.c DC390/AM53C974 SCSI driver @@@ -5242,8 -5241,8 +5242,8 @@@ M: Ioana Ciornei L: netdev@vger.kernel.org S: Maintained -F: Documentation/networking/device_drivers/freescale/dpaa2/ethernet-driver.rst -F: Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-support.rst +F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst +F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst F: drivers/net/ethernet/freescale/dpaa2/Kconfig F: drivers/net/ethernet/freescale/dpaa2/Makefile F: drivers/net/ethernet/freescale/dpaa2/dpaa2-eth* @@@ -5491,7 -5490,7 +5491,7 @@@ F: include/uapi/drm/r128_drm. DRM DRIVER FOR RAYDIUM RM67191 PANELS M: Robert Chiras S: Maintained -F: Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt +F: Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml F: drivers/gpu/drm/panel/panel-raydium-rm67191.c DRM DRIVER FOR ROCKTECH JH057N00900 PANELS @@@ -7303,7 -7302,7 +7303,7 @@@ R: Sagi Shahar L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/google/gve.rst +F: Documentation/networking/device_drivers/ethernet/google/gve.rst F: drivers/net/ethernet/google GPD POCKET FAN DRIVER @@@ -7914,7 -7913,7 +7914,7 @@@ HUAWEI ETHERNET DRIVE M: Bin Luo L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/hinic.rst +F: Documentation/networking/device_drivers/ethernet/huawei/hinic.rst F: drivers/net/ethernet/huawei/hinic/ HUGETLB FILESYSTEM @@@ -7966,7 -7965,7 +7966,7 @@@ S: Supporte T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git F: Documentation/ABI/stable/sysfs-bus-vmbus F: Documentation/ABI/testing/debugfs-hyperv -F: Documentation/networking/device_drivers/microsoft/netvsc.rst +F: Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst F: arch/x86/hyperv F: arch/x86/include/asm/hyperv-tlfs.h F: arch/x86/include/asm/mshyperv.h @@@ -8334,7 -8333,7 +8334,7 @@@ M: Alexander Aring L: linux-wpan@vger.kernel.org S: Maintained -W: http://wpan.cakelab.org/ +W: https://linux-wpan.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git F: Documentation/networking/ieee802154.rst @@@ -8648,7 -8647,18 +8648,7 @@@ W: http://e1000.sourceforge.net Q: http://patchwork.ozlabs.org/project/intel-wired-lan/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git -F: Documentation/networking/device_drivers/intel/e100.rst -F: Documentation/networking/device_drivers/intel/e1000.rst -F: Documentation/networking/device_drivers/intel/e1000e.rst -F: Documentation/networking/device_drivers/intel/fm10k.rst -F: Documentation/networking/device_drivers/intel/i40e.rst -F: Documentation/networking/device_drivers/intel/iavf.rst -F: Documentation/networking/device_drivers/intel/ice.rst -F: Documentation/networking/device_drivers/intel/igb.rst -F: Documentation/networking/device_drivers/intel/igbvf.rst -F: Documentation/networking/device_drivers/intel/ixgb.rst -F: Documentation/networking/device_drivers/intel/ixgbe.rst -F: Documentation/networking/device_drivers/intel/ixgbevf.rst +F: Documentation/networking/device_drivers/ethernet/intel/ F: drivers/net/ethernet/intel/ F: drivers/net/ethernet/intel/*/ F: include/linux/avf/virtchnl.h @@@ -8838,8 -8848,8 +8838,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB M: Stanislav Yakovlev L: linux-wireless@vger.kernel.org S: Maintained -F: Documentation/networking/device_drivers/intel/ipw2100.rst -F: Documentation/networking/device_drivers/intel/ipw2200.rst +F: Documentation/networking/device_drivers/wifi/intel/ipw2100.rst +F: Documentation/networking/device_drivers/wifi/intel/ipw2200.rst F: drivers/net/wireless/intel/ipw2x00/ INTEL PSTATE DRIVER @@@ -10352,7 -10362,7 +10352,7 @@@ M: Geetha sowjanya L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/marvell/octeontx2.rst +F: Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst F: drivers/net/ethernet/marvell/octeontx2/af/ MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER @@@ -10798,7 -10808,7 +10798,7 @@@ F: Documentation/devicetree/bindings/dm F: drivers/dma/mediatek/ MEDIATEK ETHERNET DRIVER -M: Felix Fietkau +M: Felix Fietkau M: John Crispin M: Sean Wang M: Mark Lee @@@ -11021,7 -11031,7 +11021,7 @@@ L: linux-rdma@vger.kernel.or S: Supported W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ -F: Documentation/networking/device_drivers/mellanox/ +F: Documentation/networking/device_drivers/ethernet/mellanox/ F: drivers/net/ethernet/mellanox/mlx5/core/ F: include/linux/mlx5/ @@@ -11352,6 -11362,13 +11352,13 @@@ L: linux-arm-kernel@lists.infradead.or S: Supported F: drivers/usb/gadget/udc/atmel_usba_udc.* + MICROCHIP WILC1000 WIFI DRIVER + M: Ajay Singh + M: Claudiu Beznea + L: linux-wireless@vger.kernel.org + S: Supported + F: drivers/net/wireless/microchip/wilc1000/ + MICROCHIP XDMA DRIVER M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org @@@ -11359,6 -11376,14 +11366,6 @@@ L: dmaengine@vger.kernel.or S: Supported F: drivers/dma/at_xdmac.c -MICROSEMI ETHERNET SWITCH DRIVER -M: Alexandre Belloni -M: Microchip Linux Driver Support -L: netdev@vger.kernel.org -S: Supported -F: drivers/net/ethernet/mscc/ -F: include/soc/mscc/ocelot* - MICROSEMI MIPS SOCS M: Alexandre Belloni M: Microchip Linux Driver Support @@@ -11796,8 -11821,8 +11803,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge M: Jon Mason L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/neterion/s2io.rst -F: Documentation/networking/device_drivers/neterion/vxge.rst +F: Documentation/networking/device_drivers/ethernet/neterion/s2io.rst +F: Documentation/networking/device_drivers/ethernet/neterion/vxge.rst F: drivers/net/ethernet/neterion/ NETFILTER @@@ -12317,18 -12342,6 +12324,18 @@@ M: Peter Zijlstra +M: Vladimir Oltean +M: Claudiu Manoil +M: Alexandre Belloni +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/dsa/ocelot/* +F: drivers/net/ethernet/mscc/ +F: include/soc/mscc/ocelot* +F: net/dsa/tag_ocelot.c + OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER M: Frederic Barrat M: Andrew Donnellan @@@ -12685,13 -12698,13 +12692,13 @@@ F: arch/mips/boot/dts/ralink/omega2p.dt OP-TEE DRIVER M: Jens Wiklander -L: tee-dev@lists.linaro.org +L: op-tee@lists.trustedfirmware.org S: Maintained F: drivers/tee/optee/ OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER M: Sumit Garg -L: tee-dev@lists.linaro.org +L: op-tee@lists.trustedfirmware.org S: Maintained F: drivers/char/hw_random/optee-rng.c @@@ -13360,7 -13373,7 +13367,7 @@@ M: Shannon Nelson L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/pensando/ionic.rst +F: Documentation/networking/device_drivers/ethernet/pensando/ionic.rst F: drivers/net/ethernet/pensando/ PER-CPU MEMORY ALLOCATOR @@@ -14043,7 -14056,7 +14050,7 @@@ QLOGIC QLA3XXX NETWORK DRIVE M: GR-Linux-NIC-Dev@marvell.com L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx +F: Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx F: drivers/net/ethernet/qlogic/qla3xxx.* QLOGIC QLA4XXX iSCSI DRIVER @@@ -14094,7 -14107,7 +14101,7 @@@ M: Laurentiu Tudor +M: Robert Foss +L: linux-i2c@vger.kernel.org +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt +F: drivers/i2c/busses/i2c-qcom-cci.c + QUALCOMM IOMMU M: Rob Clark L: iommu@lists.linux-foundation.org @@@ -14215,7 -14219,7 +14222,7 @@@ M: Subash Abhinov Kasiviswanathan L: netdev@vger.kernel.org S: Maintained -F: Documentation/networking/device_drivers/qualcomm/rmnet.rst +F: Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst F: drivers/net/ethernet/qualcomm/rmnet/ F: include/linux/if_rmnet.h @@@ -14537,7 -14541,7 +14544,7 @@@ F: Documentation/devicetree/bindings/i2 F: drivers/i2c/busses/i2c-emev2.c RENESAS ETHERNET DRIVERS -R: Sergei Shtylyov +R: Sergei Shtylyov L: netdev@vger.kernel.org L: linux-renesas-soc@vger.kernel.org F: Documentation/devicetree/bindings/net/renesas,*.txt @@@ -14564,8 -14568,8 +14571,8 @@@ RENESAS R-CAR THERMAL DRIVER M: Niklas Söderlund L: linux-renesas-soc@vger.kernel.org S: Supported -F: Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt -F: Documentation/devicetree/bindings/thermal/rcar-thermal.txt +F: Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml +F: Documentation/devicetree/bindings/thermal/rcar-thermal.yaml F: drivers/thermal/rcar_gen3_thermal.c F: drivers/thermal/rcar_thermal.c @@@ -14821,7 -14825,7 +14828,7 @@@ S: Maintaine F: drivers/video/fbdev/savage/ S390 -M: Heiko Carstens +M: Heiko Carstens M: Vasily Gorbik M: Christian Borntraeger L: linux-s390@vger.kernel.org @@@ -14852,7 -14856,7 +14859,7 @@@ F: drivers/s390/block/dasd F: include/linux/dasd_mod.h S390 IOMMU (PCI) -M: Gerald Schaefer +M: Gerald Schaefer L: linux-s390@vger.kernel.org S: Supported W: http://www.ibm.com/developerworks/linux/linux390/ @@@ -14880,7 -14884,7 +14887,7 @@@ F: drivers/s390/net S390 PCI SUBSYSTEM M: Niklas Schnelle -M: Gerald Schaefer +M: Gerald Schaefer L: linux-s390@vger.kernel.org S: Supported W: http://www.ibm.com/developerworks/linux/linux390/ @@@ -16048,10 -16052,8 +16055,10 @@@ SPARSE CHECKE M: "Luc Van Oostenryck" L: linux-sparse@vger.kernel.org S: Maintained -W: https://sparse.wiki.kernel.org/ +W: https://sparse.docs.kernel.org/ T: git git://git.kernel.org/pub/scm/devel/sparse/sparse.git +Q: https://patchwork.kernel.org/project/linux-sparse/list/ +B: https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools F: include/linux/compiler.h SPEAR CLOCK FRAMEWORK SUPPORT @@@ -16098,7 -16100,7 +16105,7 @@@ SPIDERNET NETWORK DRIVER for CEL M: Ishizaki Kou L: netdev@vger.kernel.org S: Supported -F: Documentation/networking/device_drivers/toshiba/spider_net.rst +F: Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst F: drivers/net/ethernet/toshiba/spider_net* SPMI SUBSYSTEM @@@ -16256,13 -16258,6 +16263,6 @@@ M: Forest Bond - M: Ajay Singh - L: linux-wireless@vger.kernel.org - S: Supported - F: drivers/staging/wilc1000/ - STAGING SUBSYSTEM M: Greg Kroah-Hartman L: devel@driverdev.osuosl.org @@@ -16325,7 -16320,7 +16325,7 @@@ M: Jose Abreu -L: tee-dev@lists.linaro.org +L: op-tee@lists.trustedfirmware.org S: Maintained F: Documentation/tee.txt F: drivers/tee/ @@@ -17213,7 -17208,7 +17213,7 @@@ M: Samuel Chessman -M: Claudiu Manoil -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/dsa/ocelot/* -F: net/dsa/tag_ocelot.c - VIVID VIRTUAL VIDEO DRIVER M: Hans Verkuil L: linux-media@vger.kernel.org @@@ -18905,7 -18908,7 +18905,7 @@@ L: linux-hams@vger.kernel.or S: Maintained W: http://yaina.de/jreuter/ W: http://www.qsl.net/dl1bke/ -F: Documentation/networking/z8530drv.rst +F: Documentation/networking/device_drivers/hamradio/z8530drv.rst F: drivers/net/hamradio/*scc.c F: drivers/net/hamradio/z8530.h diff --combined drivers/net/wireless/Kconfig index 2c6dd50b6935,59af9ab0b1f6..170a64e67709 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@@ -14,7 -14,7 +14,7 @@@ menuconfig WLA device drivers. For a complete list of drivers and documentation on them refer to the wireless wiki: - http://wireless.kernel.org/en/users/Drivers + https://wireless.wiki.kernel.org/en/users/Drivers if WLAN @@@ -40,6 -40,7 +40,7 @@@ source "drivers/net/wireless/intel/Kcon source "drivers/net/wireless/intersil/Kconfig" source "drivers/net/wireless/marvell/Kconfig" source "drivers/net/wireless/mediatek/Kconfig" + source "drivers/net/wireless/microchip/Kconfig" source "drivers/net/wireless/ralink/Kconfig" source "drivers/net/wireless/realtek/Kconfig" source "drivers/net/wireless/rsi/Kconfig" @@@ -57,8 -58,7 +58,8 @@@ config PCMCIA_RAYC help Say Y here if you intend to attach an Aviator/Raytheon PCMCIA (PC-card) wireless Ethernet networking card to your computer. - Please read the file for + Please read the file + for details. To compile this driver as a module, choose M here: the module will be diff --combined drivers/net/wireless/intel/ipw2x00/ipw2100.c index 753dada5a243,57ce55728808..83d2f2acc0de --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c @@@ -6397,10 -6397,9 +6397,9 @@@ static void ipw2100_pci_remove_one(stru IPW_DEBUG_INFO("exit\n"); } - #ifdef CONFIG_PM - static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state) + static int __maybe_unused ipw2100_suspend(struct device *dev_d) { - struct ipw2100_priv *priv = pci_get_drvdata(pci_dev); + struct ipw2100_priv *priv = dev_get_drvdata(dev_d); struct net_device *dev = priv->net_dev; IPW_DEBUG_INFO("%s: Going into suspend...\n", dev->name); @@@ -6414,10 -6413,6 +6413,6 @@@ /* Remove the PRESENT state of the device */ netif_device_detach(dev); - pci_save_state(pci_dev); - pci_disable_device(pci_dev); - pci_set_power_state(pci_dev, PCI_D3hot); - priv->suspend_at = ktime_get_boottime_seconds(); mutex_unlock(&priv->action_mutex); @@@ -6425,11 -6420,11 +6420,11 @@@ return 0; } - static int ipw2100_resume(struct pci_dev *pci_dev) + static int __maybe_unused ipw2100_resume(struct device *dev_d) { + struct pci_dev *pci_dev = to_pci_dev(dev_d); struct ipw2100_priv *priv = pci_get_drvdata(pci_dev); struct net_device *dev = priv->net_dev; - int err; u32 val; if (IPW2100_PM_DISABLED) @@@ -6439,16 -6434,6 +6434,6 @@@ IPW_DEBUG_INFO("%s: Coming out of suspend...\n", dev->name); - pci_set_power_state(pci_dev, PCI_D0); - err = pci_enable_device(pci_dev); - if (err) { - printk(KERN_ERR "%s: pci_enable_device failed on resume\n", - dev->name); - mutex_unlock(&priv->action_mutex); - return err; - } - pci_restore_state(pci_dev); - /* * Suspend/Resume resets the PCI configuration space, so we have to * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries @@@ -6473,7 -6458,6 +6458,6 @@@ return 0; } - #endif static void ipw2100_shutdown(struct pci_dev *pci_dev) { @@@ -6539,15 -6523,14 +6523,14 @@@ static const struct pci_device_id ipw21 MODULE_DEVICE_TABLE(pci, ipw2100_pci_id_table); + static SIMPLE_DEV_PM_OPS(ipw2100_pm_ops, ipw2100_suspend, ipw2100_resume); + static struct pci_driver ipw2100_pci_driver = { .name = DRV_NAME, .id_table = ipw2100_pci_id_table, .probe = ipw2100_pci_init_one, .remove = ipw2100_pci_remove_one, - #ifdef CONFIG_PM - .suspend = ipw2100_suspend, - .resume = ipw2100_resume, - #endif + .driver.pm = &ipw2100_pm_ops, .shutdown = ipw2100_shutdown, }; @@@ -8352,7 -8335,7 +8335,7 @@@ static int ipw2100_mod_firmware_load(st if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) { printk(KERN_WARNING DRV_NAME ": Firmware image not compatible " "(detected version id of %u). " - "See Documentation/networking/device_drivers/intel/ipw2100.rst\n", + "See Documentation/networking/device_drivers/wifi/intel/ipw2100.rst\n", h->version); return 1; }