5.10-stable patches

added patches:
	arm64-dts-qcom-ipq8074-fix-gen2-pcie-qmp-phy.patch
	wifi-ath9k-use-proper-statements-in-conditionals.patch

diff --git a/queue-5.10/arm64-dts-qcom-ipq8074-fix-gen2-pcie-qmp-phy.patch b/queue-5.10/arm64-dts-qcom-ipq8074-fix-gen2-pcie-qmp-phy.patch
new file mode 100644 (file)
index 0000000..74c4b10
--- /dev/null
+++ b/queue-5.10/arm64-dts-qcom-ipq8074-fix-gen2-pcie-qmp-phy.patch
@@ -0,0 +1,35 @@
+From 100d9c94ccf15b02742c326cd04f422ab729153b Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 13 Jan 2023 17:44:41 +0100
+Subject: arm64: dts: qcom: ipq8074: fix Gen2 PCIe QMP PHY
+
+From: Robert Marko <robimarko@gmail.com>
+
+commit 100d9c94ccf15b02742c326cd04f422ab729153b upstream.
+
+Serdes register space sizes are incorrect, update them to match the
+actual sizes from downstream QCA 5.4 kernel.
+
+Fixes: 942bcd33ed45 ("arm64: dts: qcom: Fix IPQ8074 PCIe PHY nodes")
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Link: https://lore.kernel.org/r/20230113164449.906002-1-robimarko@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+@@ -213,9 +213,9 @@
+                       status = "disabled";
+ 
+                       pcie_phy1: phy@8e200 {
+-                              reg = <0x8e200 0x16c>,
++                              reg = <0x8e200 0x130>,
+                                     <0x8e400 0x200>,
+-                                    <0x8e800 0x4f4>;
++                                    <0x8e800 0x1f8>;
+                               #phy-cells = <0>;
+                               #clock-cells = <0>;
+                               clocks = <&gcc GCC_PCIE1_PIPE_CLK>;

diff --git a/queue-5.10/series b/queue-5.10/series
index f1903cef520ec06d0f9d0de7c06e8fc52d2d9cfc..5c54cfcc0079e2c2f31d0a18e5f306b794b9a213 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -425,3 +425,5 @@ vfio-type1-prevent-underflow-of-locked_vm-via-exec.patch
 drm-i915-quirks-add-inverted-backlight-quirk-for-hp-14-r206nv.patch
 drm-radeon-fix-edp-for-single-display-imac11-2.patch
 drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch
+arm64-dts-qcom-ipq8074-fix-gen2-pcie-qmp-phy.patch
+wifi-ath9k-use-proper-statements-in-conditionals.patch

diff --git a/queue-5.10/wifi-ath9k-use-proper-statements-in-conditionals.patch b/queue-5.10/wifi-ath9k-use-proper-statements-in-conditionals.patch
new file mode 100644 (file)
index 0000000..a299ee7
--- /dev/null
+++ b/queue-5.10/wifi-ath9k-use-proper-statements-in-conditionals.patch
@@ -0,0 +1,63 @@
+From b7dc753fe33a707379e2254317794a4dad6c0fe2 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 15 Dec 2022 17:55:42 +0100
+Subject: wifi: ath9k: use proper statements in conditionals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit b7dc753fe33a707379e2254317794a4dad6c0fe2 upstream.
+
+A previous cleanup patch accidentally broke some conditional
+expressions by replacing the safe "do {} while (0)" constructs
+with empty macros. gcc points this out when extra warnings
+are enabled:
+
+drivers/net/wireless/ath/ath9k/hif_usb.c: In function 'ath9k_skb_queue_complete':
+drivers/net/wireless/ath/ath9k/hif_usb.c:251:57: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
+  251 |                         TX_STAT_INC(hif_dev, skb_failed);
+
+Make both sets of macros proper expressions again.
+
+Fixes: d7fc76039b74 ("ath9k: htc: clean up statistics macros")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
+Signed-off-by: Kalle Valo <kvalo@kernel.org>
+Link: https://lore.kernel.org/r/20221215165553.1950307-1-arnd@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/ath/ath9k/htc.h |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/htc.h
++++ b/drivers/net/wireless/ath/ath9k/htc.h
+@@ -327,9 +327,9 @@ static inline struct ath9k_htc_tx_ctl *H
+ }
+ 
+ #ifdef CONFIG_ATH9K_HTC_DEBUGFS
+-#define __STAT_SAFE(hif_dev, expr)    ((hif_dev)->htc_handle->drv_priv ? (expr) : 0)
+-#define CAB_STAT_INC(priv)            ((priv)->debug.tx_stats.cab_queued++)
+-#define TX_QSTAT_INC(priv, q)         ((priv)->debug.tx_stats.queue_stats[q]++)
++#define __STAT_SAFE(hif_dev, expr)    do { ((hif_dev)->htc_handle->drv_priv ? (expr) : 0); } while (0)
++#define CAB_STAT_INC(priv)            do { ((priv)->debug.tx_stats.cab_queued++); } while (0)
++#define TX_QSTAT_INC(priv, q)         do { ((priv)->debug.tx_stats.queue_stats[q]++); } while (0)
+ 
+ #define TX_STAT_INC(hif_dev, c) \
+               __STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c++)
+@@ -378,10 +378,10 @@ void ath9k_htc_get_et_stats(struct ieee8
+                           struct ethtool_stats *stats, u64 *data);
+ #else
+ 
+-#define TX_STAT_INC(hif_dev, c)
+-#define TX_STAT_ADD(hif_dev, c, a)
+-#define RX_STAT_INC(hif_dev, c)
+-#define RX_STAT_ADD(hif_dev, c, a)
++#define TX_STAT_INC(hif_dev, c)               do { } while (0)
++#define TX_STAT_ADD(hif_dev, c, a)    do { } while (0)
++#define RX_STAT_INC(hif_dev, c)               do { } while (0)
++#define RX_STAT_ADD(hif_dev, c, a)    do { } while (0)
+ 
+ #define CAB_STAT_INC(priv)
+ #define TX_QSTAT_INC(priv, c)