[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  mac80211: backport security fixes (coolsnowwolf#10324)
  ipq60xx: remove generic backport qcom smem patch
  ipq60xx: add CMIOT-AX18/ZN-M2 support
  image-commands: add missing qsdk-ipq-factory-mmc
  grub2: bump version

Author: github-actions[bot]

include/image-commands.mk

@@ -459,6 +459,13 @@ define Build/qsdk-ipq-factory-nand
 	@mv $@.new $@
 endef
 
+define Build/qsdk-ipq-factory-mmc
+	$(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \
+		$@.its kernel $(IMAGE_KERNEL) rootfs $(IMAGE_ROOTFS)
+	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
+	@mv $@.new $@
+endef
+
 define Build/qsdk-ipq-factory-nor
 	$(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \
 		$@.its hlos $(IMAGE_KERNEL) rootfs $(IMAGE_ROOTFS)

package/boot/grub2/Makefile

@@ -1,16 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2006-2021 OpenWrt.org
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=grub
 PKG_VERSION:=2.06
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/grub
@@ -22,8 +19,10 @@ PKG_CPE_ID:=cpe:/a:gnu:grub2
 HOST_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=grub2/host
 
-PKG_ASLR_PIE:=0
-PKG_SSP:=0
+ifneq ($(BUILD_VARIANT),none)
+  PKG_ASLR_PIE:=0
+  PKG_SSP:=0
+endif
 
 PKG_FLAGS:=nonshared
 
@@ -49,13 +48,27 @@ define Package/grub2-editenv
   TITLE:=Grub2 Environment editor
   URL:=http://www.gnu.org/software/grub/
   DEPENDS:=@TARGET_x86
-  VARIANT:=pc
+  VARIANT:=none
 endef
 
 define Package/grub2-editenv/description
 	Edit grub2 environment files.
 endef
 
+define Package/grub2-bios-setup
+  CATEGORY:=Utilities
+  SECTION:=utils
+  SUBMENU:=Boot Loaders
+  TITLE:=Grub2 BIOS boot setup tool
+  URL:=http://www.gnu.org/software/grub/
+  DEPENDS:=@TARGET_x86
+  VARIANT:=none
+endef
+
+define Package/grub2-bios-setup/description
+	Set up images to bootable.
+endef
+
 HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
 
 CONFIGURE_VARS += \
@@ -87,16 +100,18 @@ HOST_MAKE_FLAGS += \
 	TARGET_RANLIB=$(TARGET_RANLIB) \
 	LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
 
-TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
+
+ifneq ($(BUILD_VARIANT),none)
+  TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
+  MAKE_PATH := grub-core
+endif
 
 define Host/Configure
 	$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
 	$(Host/Configure/Default)
 endef
 
 define Package/grub2/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/grub2
 	$(CP) $(PKG_BUILD_DIR)/grub-core/boot.img $(STAGING_DIR_IMAGE)/grub2/
 	$(CP) $(PKG_BUILD_DIR)/grub-core/cdboot.img $(STAGING_DIR_IMAGE)/grub2/
@@ -154,7 +169,13 @@ define Package/grub2-editenv/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
 endef
 
+define Package/grub2-bios-setup/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
+endef
+
 $(eval $(call HostBuild))
 $(eval $(call BuildPackage,grub2))
 $(eval $(call BuildPackage,grub2-efi))
 $(eval $(call BuildPackage,grub2-editenv))
+$(eval $(call BuildPackage,grub2-bios-setup))

package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -3333,7 +3333,11 @@
+@@ -3333,7 +3333,11 @@ static int ath10k_core_probe_fw(struct a
  		ath10k_debug_print_board_info(ar);
  	}
 

package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch

@@ -1,8 +1,6 @@
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-index 44a11b0..178e692 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -245,7 +245,11 @@
+@@ -245,7 +245,11 @@ static int brcmf_netdev_set_mac_address(
  	} else {
  		brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
  		memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
@@ -14,53 +12,51 @@ index 44a11b0..178e692 100644
  	}
  	return err;
  }
-@@ -424,6 +428,7 @@
+@@ -424,6 +428,7 @@ void brcmf_netif_rx(struct brcmf_if *ifp
  	ifp->ndev->stats.rx_packets++;
-
+ 
  	brcmf_dbg(DATA, "rx proto=0x%X\n", ntohs(skb->protocol));
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
  	if (inirq) {
  		netif_rx(skb);
  	} else {
-@@ -433,6 +438,9 @@
+@@ -433,6 +438,9 @@ void brcmf_netif_rx(struct brcmf_if *ifp
  		 */
  		netif_rx_ni(skb);
  	}
 +#else
 +	netif_rx(skb);
 +#endif
  }
-
+ 
  void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb)
-@@ -673,7 +681,11 @@
+@@ -673,7 +681,11 @@ int brcmf_net_attach(struct brcmf_if *if
  	ndev->ethtool_ops = &brcmf_ethtool_ops;
-
+ 
  	/* set the mac address & netns */
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
  	memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
 +#else
 +	eth_hw_addr_set(ifp->ndev, ifp->mac_addr);
 +#endif
  	dev_net_set(ndev, wiphy_net(cfg_to_wiphy(drvr->config)));
-
+ 
  	INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
-@@ -848,7 +860,11 @@
+@@ -848,7 +860,11 @@ static int brcmf_net_p2p_attach(struct b
  	ndev->netdev_ops = &brcmf_netdev_ops_p2p;
-
+ 
  	/* set the mac address */
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
  	memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
 +#else
 +	eth_hw_addr_set(ndev, ifp->mac_addr);
 +#endif
-
+ 
  	if (register_netdev(ndev) != 0) {
  		bphy_err(drvr, "couldn't register the p2p net device\n");
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-index 9ac0d8c..4735063 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2125,7 +2125,7 @@ static int brcmf_p2p_disable_p2p_if(struct brcmf_cfg80211_vif *vif)
+@@ -2125,7 +2125,7 @@ static int brcmf_p2p_disable_p2p_if(stru
  	struct brcmf_cfg80211_info *cfg = wdev_to_cfg(&vif->wdev);
  	struct net_device *pri_ndev = cfg_to_ndev(cfg);
  	struct brcmf_if *ifp = netdev_priv(pri_ndev);
@@ -69,7 +65,7 @@ index 9ac0d8c..4735063 100644
 
  	return brcmf_fil_iovar_data_set(ifp, "p2p_ifdis", addr, ETH_ALEN);
  }
-@@ -2135,7 +2135,7 @@ static int brcmf_p2p_release_p2p_if(struct brcmf_cfg80211_vif *vif)
+@@ -2135,7 +2135,7 @@ static int brcmf_p2p_release_p2p_if(stru
  	struct brcmf_cfg80211_info *cfg = wdev_to_cfg(&vif->wdev);
  	struct net_device *pri_ndev = cfg_to_ndev(cfg);
  	struct brcmf_if *ifp = netdev_priv(pri_ndev);
@@ -78,11 +74,9 @@ index 9ac0d8c..4735063 100644
 
  	return brcmf_fil_iovar_data_set(ifp, "p2p_ifdel", addr, ETH_ALEN);
  }
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 8effeb7..04362e2 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -4164,7 +4164,11 @@
+@@ -4164,7 +4164,11 @@ static int brcmf_sdio_bus_reset(struct d
 
  	/* reset the adapter */
  	sdio_claim_host(sdiodev->func1);
@@ -94,8 +88,6 @@ index 8effeb7..04362e2 100644
  	sdio_release_host(sdiodev->func1);
 
  	brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
-diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index ab83553..7941d28 100644
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
 @@ -5555,7 +5555,7 @@ struct wireless_dev {
@@ -107,11 +99,9 @@ index ab83553..7941d28 100644
  {
  	if (wdev->netdev)
  		return wdev->netdev->dev_addr;
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 57aa863..f5ebb5a 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1274,9 +1274,13 @@
+@@ -1274,9 +1274,13 @@ int ieee80211_do_open(struct wireless_de
  	 * this interface, if it has the special null one.
  	 */
  	if (dev && is_zero_ether_addr(dev->dev_addr)) {
@@ -123,10 +113,10 @@ index 57aa863..f5ebb5a 100644
 +		eth_hw_addr_set(dev, local->hw.wiphy->perm_addr);
 +#endif
  		memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
-
+ 
  		if (!is_valid_ether_addr(dev->dev_addr)) {
-@@ -2136,9 +2140,17 @@
-
+@@ -2136,9 +2140,17 @@ int ieee80211_if_add(struct ieee80211_lo
+ 
  		ieee80211_assign_perm_addr(local, ndev->perm_addr, type);
  		if (is_valid_ether_addr(params->macaddr))
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
@@ -141,5 +131,5 @@ index 57aa863..f5ebb5a 100644
 +			eth_hw_addr_set(ndev, ndev->perm_addr);
 +#endif
  		SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
-
+ 
  		/* don't use IEEE80211_DEV_TO_SUB_IF -- it checks too much */

package/kernel/mac80211/patches/build/267-rtl8723_5.18_support.patch

@@ -1,5 +1,5 @@
 --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
-+++ a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
++++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
 @@ -45,7 +45,11 @@
  		spinlock_t	lock;
  	};

package/kernel/mac80211/patches/build/882-use-netif_rx.patch

@@ -1,6 +1,6 @@
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -2149,7 +2149,11 @@
+@@ -2149,7 +2149,11 @@ void cfg80211_send_layer2_update(struct
  	skb->dev = dev;
  	skb->protocol = eth_type_trans(skb, dev);
  	memset(skb->cb, 0, sizeof(skb->cb));
@@ -11,4 +11,4 @@
 +#endif
  }
  EXPORT_SYMBOL(cfg80211_send_layer2_update);
- 
+ 

package/kernel/mac80211/patches/rt2x00/999-backport-to-linux-5.18.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
-@@ -586,10 +586,18 @@ static void rt2x00usb_assign_endpoint(struct data_queue *queue,
+@@ -586,10 +586,18 @@ static void rt2x00usb_assign_endpoint(st
 
  	if (queue->qid == QID_RX) {
  		pipe = usb_rcvbulkpipe(usb_dev, queue->usb_endpoint);

package/kernel/mac80211/patches/rtl/001-rtw88-Call-rtw_fw_beacon_filter_config-with-rtwdev--mutex-held.patch

@@ -1,8 +1,6 @@
-diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
-index 5cdc54c9a9aae..3c07485d6ba47 100644
 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c
 +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
-@@ -466,8 +466,8 @@ static int rtw_ops_sta_remove(struct ieee80211_hw *hw,
+@@ -455,8 +455,8 @@ static int rtw_ops_sta_remove(struct iee
  {
  	struct rtw_dev *rtwdev = hw->priv;
 

package/kernel/mac80211/patches/rtl/002-rtw88-Drop-rf_lock.patch

@@ -1,8 +1,6 @@
-diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c
-index 1a52ff585fbc7..ba5ba852efb8c 100644
 --- a/drivers/net/wireless/realtek/rtw88/debug.c
 +++ b/drivers/net/wireless/realtek/rtw88/debug.c
-@@ -144,7 +144,9 @@ static int rtw_debugfs_get_rf_read(struct seq_file *m, void *v)
+@@ -143,7 +143,9 @@ static int rtw_debugfs_get_rf_read(struc
  	addr = debugfs_priv->rf_addr;
  	mask = debugfs_priv->rf_mask;
 
@@ -12,7 +10,7 @@ index 1a52ff585fbc7..ba5ba852efb8c 100644
 
  	seq_printf(m, "rf_read path:%d addr:0x%08x mask:0x%08x val=0x%08x\n",
  		   path, addr, mask, val);
-@@ -418,7 +420,9 @@ static ssize_t rtw_debugfs_set_rf_write(struct file *filp,
+@@ -401,7 +403,9 @@ static ssize_t rtw_debugfs_set_rf_write(
  		return count;
  	}
 
@@ -22,7 +20,7 @@ index 1a52ff585fbc7..ba5ba852efb8c 100644
  	rtw_dbg(rtwdev, RTW_DBG_DEBUGFS,
  		"write_rf path:%d addr:0x%08x mask:0x%08x, val:0x%08x\n",
  		path, addr, mask, val);
-@@ -523,6 +527,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v)
+@@ -481,6 +485,8 @@ static int rtw_debug_get_rf_dump(struct
  	u32 addr, offset, data;
  	u8 path;
 
@@ -31,7 +29,7 @@ index 1a52ff585fbc7..ba5ba852efb8c 100644
  	for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
  		seq_printf(m, "RF path:%d\n", path);
  		for (addr = 0; addr < 0x100; addr += 4) {
-@@ -537,6 +543,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v)
+@@ -495,6 +501,8 @@ static int rtw_debug_get_rf_dump(struct
  		seq_puts(m, "\n");
  	}
 
@@ -40,7 +38,7 @@ index 1a52ff585fbc7..ba5ba852efb8c 100644
  	return 0;
  }
 
-@@ -1027,6 +1035,8 @@ static void dump_gapk_status(struct rtw_dev *rtwdev, struct seq_file *m)
+@@ -911,6 +919,8 @@ static void dump_gapk_status(struct rtw_
  		   dm_info->dm_flags & BIT(RTW_DM_CAP_TXGAPK) ? '-' : '+',
  		   rtw_dm_cap_strs[RTW_DM_CAP_TXGAPK]);
 
@@ -49,16 +47,14 @@ index 1a52ff585fbc7..ba5ba852efb8c 100644
  	for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
  		val = rtw_read_rf(rtwdev, path, RF_GAINTX, RFREG_MASK);
  		seq_printf(m, "path %d:\n0x%x = 0x%x\n", path, RF_GAINTX, val);
-@@ -1036,6 +1046,7 @@ static void dump_gapk_status(struct rtw_dev *rtwdev, struct seq_file *m)
+@@ -920,6 +930,7 @@ static void dump_gapk_status(struct rtw_
  				   txgapk->rf3f_fs[path][i], i);
  		seq_puts(m, "\n");
  	}
 +	mutex_unlock(&rtwdev->mutex);
  }
 
  static int rtw_debugfs_get_dm_cap(struct seq_file *m, void *v)
-diff --git a/drivers/net/wireless/realtek/rtw88/hci.h b/drivers/net/wireless/realtek/rtw88/hci.h
-index 4c6fc6fb3f83b..830d7532f2a35 100644
 --- a/drivers/net/wireless/realtek/rtw88/hci.h
 +++ b/drivers/net/wireless/realtek/rtw88/hci.h
 @@ -166,12 +166,11 @@ static inline u32
@@ -89,23 +85,19 @@ index 4c6fc6fb3f83b..830d7532f2a35 100644
  }
 
  static inline u32
-diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
-index 8b9899e41b0bb..f9864840ffd9c 100644
 --- a/drivers/net/wireless/realtek/rtw88/main.c
 +++ b/drivers/net/wireless/realtek/rtw88/main.c
-@@ -1994,7 +1994,6 @@ int rtw_core_init(struct rtw_dev *rtwdev)
+@@ -1839,7 +1839,6 @@ int rtw_core_init(struct rtw_dev *rtwdev
  	skb_queue_head_init(&rtwdev->coex.queue);
  	skb_queue_head_init(&rtwdev->tx_report.queue);
 
 -	spin_lock_init(&rtwdev->rf_lock);
  	spin_lock_init(&rtwdev->h2c.lock);
  	spin_lock_init(&rtwdev->txq_lock);
  	spin_lock_init(&rtwdev->tx_report.q_lock);
-diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
-index 17815af9dd4ea..df6c6032bbd3b 100644
 --- a/drivers/net/wireless/realtek/rtw88/main.h
 +++ b/drivers/net/wireless/realtek/rtw88/main.h
-@@ -1994,9 +1994,6 @@ struct rtw_dev {
+@@ -1842,9 +1842,6 @@ struct rtw_dev {
  	/* ensures exclusive access from mac80211 callbacks */
  	struct mutex mutex;