5.10-stable patches

added patches:
	arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch
	revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch

diff --git a/queue-5.10/arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch b/queue-5.10/arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch
new file mode 100644 (file)
index 0000000..87d0009
--- /dev/null
+++ b/queue-5.10/arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch
@@ -0,0 +1,42 @@
+From eb4f756915875b0ea0757751cd29841f0504d547 Mon Sep 17 00:00:00 2001
+From: Wang Kefeng <wangkefeng.wang@huawei.com>
+Date: Mon, 23 Aug 2021 10:41:42 +0100
+Subject: ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
+
+From: Wang Kefeng <wangkefeng.wang@huawei.com>
+
+commit eb4f756915875b0ea0757751cd29841f0504d547 upstream.
+
+After commit 77a7300abad7 ("of/irq: Get rid of NO_IRQ usage"),
+no irq case has been removed, irq_of_parse_and_map() will return
+0 in all cases when get error from parse and map an interrupt into
+linux virq space.
+
+amba_device_register() is only used on no-DT initialization, see
+  s3c64xx_pl080_init()         arch/arm/mach-s3c/pl080.c
+  ep93xx_init_devices()                arch/arm/mach-ep93xx/core.c
+
+They won't set -1 to irq[0], so no need the warn.
+
+This reverts commit 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3.
+
+Reviewed-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
+Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/amba/bus.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/amba/bus.c
++++ b/drivers/amba/bus.c
+@@ -375,9 +375,6 @@ static int amba_device_try_add(struct am
+       void __iomem *tmp;
+       int i, ret;
+ 
+-      WARN_ON(dev->irq[0] == (unsigned int)-1);
+-      WARN_ON(dev->irq[1] == (unsigned int)-1);
+-
+       ret = request_resource(parent, &dev->res);
+       if (ret)
+               goto err_out;

diff --git a/queue-5.10/revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch b/queue-5.10/revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch
new file mode 100644 (file)
index 0000000..8912121
--- /dev/null
+++ b/queue-5.10/revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch
@@ -0,0 +1,74 @@
+From 285bb1738e196507bf985574d0bc1e9dd72d46b1 Mon Sep 17 00:00:00 2001
+From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+Date: Fri, 22 Oct 2021 15:04:47 +0100
+Subject: Revert "wcn36xx: Disable bmps when encryption is disabled"
+
+From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+
+commit 285bb1738e196507bf985574d0bc1e9dd72d46b1 upstream.
+
+This reverts commit c6522a5076e1a65877c51cfee313a74ef61cabf8.
+
+Testing on tip-of-tree shows that this is working now. Revert this and
+re-enable BMPS for Open APs.
+
+Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Link: https://lore.kernel.org/r/20211022140447.2846248-3-bryan.odonoghue@linaro.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/ath/wcn36xx/main.c    |   10 ----------
+ drivers/net/wireless/ath/wcn36xx/pmc.c     |    5 +----
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h |    1 -
+ 3 files changed, 1 insertion(+), 15 deletions(-)
+
+--- a/drivers/net/wireless/ath/wcn36xx/main.c
++++ b/drivers/net/wireless/ath/wcn36xx/main.c
+@@ -601,15 +601,6 @@ static int wcn36xx_set_key(struct ieee80
+                               }
+                       }
+               }
+-              /* FIXME: Only enable bmps support when encryption is enabled.
+-               * For any reasons, when connected to open/no-security BSS,
+-               * the wcn36xx controller in bmps mode does not forward
+-               * 'wake-up' beacons despite AP sends DTIM with station AID.
+-               * It could be due to a firmware issue or to the way driver
+-               * configure the station.
+-               */
+-              if (vif->type == NL80211_IFTYPE_STATION)
+-                      vif_priv->allow_bmps = true;
+               break;
+       case DISABLE_KEY:
+               if (!(IEEE80211_KEY_FLAG_PAIRWISE & key_conf->flags)) {
+@@ -909,7 +900,6 @@ static void wcn36xx_bss_info_changed(str
+                                   vif->addr,
+                                   bss_conf->aid);
+                       vif_priv->sta_assoc = false;
+-                      vif_priv->allow_bmps = false;
+                       wcn36xx_smd_set_link_st(wcn,
+                                               bss_conf->bssid,
+                                               vif->addr,
+--- a/drivers/net/wireless/ath/wcn36xx/pmc.c
++++ b/drivers/net/wireless/ath/wcn36xx/pmc.c
+@@ -23,10 +23,7 @@ int wcn36xx_pmc_enter_bmps_state(struct
+ {
+       int ret = 0;
+       struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);
+-
+-      if (!vif_priv->allow_bmps)
+-              return -ENOTSUPP;
+-
++      /* TODO: Make sure the TX chain clean */
+       ret = wcn36xx_smd_enter_bmps(wcn, vif);
+       if (!ret) {
+               wcn36xx_dbg(WCN36XX_DBG_PMC, "Entered BMPS\n");
+--- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
++++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
+@@ -127,7 +127,6 @@ struct wcn36xx_vif {
+       enum wcn36xx_hal_bss_type bss_type;
+ 
+       /* Power management */
+-      bool allow_bmps;
+       enum wcn36xx_power_state pw_state;
+ 
+       u8 bss_index;

diff --git a/queue-5.10/series b/queue-5.10/series
index 82044b93ddc49b692e79028164bef04657752ff5..5f662b879382b29a873f2c735e12851a84b64b48 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -10,3 +10,5 @@ revert-xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch
 revert-usb-core-hcd-add-support-for-deferring-roothub.patch
 mm-khugepaged-skip-huge-page-collapse-for-special-files.patch
 revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch
+arm-9120-1-revert-amba-make-use-of-1-irqs-warn.patch
+revert-wcn36xx-disable-bmps-when-encryption-is-disabled.patch