6.3-stable patches

added patches:
	drm-msm-adreno-adreno_gpu-use-suspend-instead-of-idle-on-load-error.patch
	revert-net-sched-flower-fix-wrong-handle-assignment-during-filter-change.patch

diff --git a/queue-6.3/drm-msm-adreno-adreno_gpu-use-suspend-instead-of-idle-on-load-error.patch b/queue-6.3/drm-msm-adreno-adreno_gpu-use-suspend-instead-of-idle-on-load-error.patch
new file mode 100644 (file)
index 0000000..e2415d4
--- /dev/null
+++ b/queue-6.3/drm-msm-adreno-adreno_gpu-use-suspend-instead-of-idle-on-load-error.patch
@@ -0,0 +1,58 @@
+From 3eeca5e5f3100435b06a5b5d86daa3d135a8a4bd Mon Sep 17 00:00:00 2001
+From: Konrad Dybcio <konrad.dybcio@linaro.org>
+Date: Fri, 31 Mar 2023 01:15:16 +0200
+Subject: drm/msm/adreno: adreno_gpu: Use suspend() instead of idle() on load error
+
+From: Konrad Dybcio <konrad.dybcio@linaro.org>
+
+commit 3eeca5e5f3100435b06a5b5d86daa3d135a8a4bd upstream.
+
+The adreno_load_gpu() path is guarded by an error check on
+adreno_load_fw(). This function is responsible for loading
+Qualcomm-only-signed binaries (e.g. SQE and GMU FW for A6XX), but it
+does not take the vendor-signed ZAP blob into account.
+
+By embedding the SQE (and GMU, if necessary) firmware into the
+initrd/kernel, we can trigger and unfortunate path that would not bail
+out early and proceed with gpu->hw_init(). That will fail, as the ZAP
+loader path will not find the firmware and return back to
+adreno_load_gpu().
+
+This error path involves pm_runtime_put_sync() which then calls idle()
+instead of suspend(). This is suboptimal, as it means that we're not
+going through the clean shutdown sequence. With at least A619_holi, this
+makes the GPU not wake up until it goes through at least one more
+start-fail-stop cycle. The pm_runtime_put_sync that appears in the error
+path actually does not guarantee that because of the earlier enabling of
+runtime autosuspend.
+
+Fix that by using pm_runtime_put_sync_suspend to force a clean shutdown.
+
+Test cases:
+1. All firmware baked into kernel
+2. error loading ZAP fw in initrd -> load from rootfs at DE start
+
+Both succeed on A619_holi (SM6375) and A630 (SDM845).
+
+Fixes: 0d997f95b70f ("drm/msm/adreno: fix runtime PM imbalance at gpu load")
+Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
+Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
+Patchwork: https://patchwork.freedesktop.org/patch/530001/
+Link: https://lore.kernel.org/r/20230330231517.2747024-1-konrad.dybcio@linaro.org
+Signed-off-by: Rob Clark <robdclark@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/msm/adreno/adreno_device.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
++++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
+@@ -465,7 +465,7 @@ struct msm_gpu *adreno_load_gpu(struct d
+       return gpu;
+ 
+ err_put_rpm:
+-      pm_runtime_put_sync(&pdev->dev);
++      pm_runtime_put_sync_suspend(&pdev->dev);
+ err_disable_rpm:
+       pm_runtime_disable(&pdev->dev);
+ 

diff --git a/queue-6.3/revert-net-sched-flower-fix-wrong-handle-assignment-during-filter-change.patch b/queue-6.3/revert-net-sched-flower-fix-wrong-handle-assignment-during-filter-change.patch
new file mode 100644 (file)
index 0000000..7ed7cb8
--- /dev/null
+++ b/queue-6.3/revert-net-sched-flower-fix-wrong-handle-assignment-during-filter-change.patch
@@ -0,0 +1,32 @@
+From 5110f3ff6d3c986df9575c8da86630578b7f0846 Mon Sep 17 00:00:00 2001
+From: Vlad Buslov <vladbu@nvidia.com>
+Date: Thu, 4 May 2023 20:16:15 +0200
+Subject: Revert "net/sched: flower: Fix wrong handle assignment during filter change"
+
+From: Vlad Buslov <vladbu@nvidia.com>
+
+commit 5110f3ff6d3c986df9575c8da86630578b7f0846 upstream.
+
+This reverts commit 32eff6bacec2cb574677c15378169a9fa30043ef.
+
+Superseded by the following commit in this series.
+
+Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/cls_flower.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/sched/cls_flower.c
++++ b/net/sched/cls_flower.c
+@@ -2231,8 +2231,8 @@ static int fl_change(struct net *net, st
+                       kfree(fnew);
+                       goto errout_tb;
+               }
+-              fnew->handle = handle;
+       }
++      fnew->handle = handle;
+ 
+       err = tcf_exts_init_ex(&fnew->exts, net, TCA_FLOWER_ACT, 0, tp, handle,
+                              !tc_skip_hw(fnew->flags));

diff --git a/queue-6.3/series b/queue-6.3/series
index 156338a0a4ad352eb73b9e61446318b9ec5f6a06..9b69a0aecebe46274f92c9206447bfcfbaf62186 100644 (file)
--- a/queue-6.3/series
+++ b/queue-6.3/series
@@ -211,3 +211,5 @@ hid-wacom-set-a-default-resolution-for-older-tablets.patch
 hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch
 fs-ntfs3-fix-null-ptr-deref-on-inode-i_op-in-ntfs_lookup.patch
 fs-ntfs3-refactoring-of-various-minor-issues.patch
+revert-net-sched-flower-fix-wrong-handle-assignment-during-filter-change.patch
+drm-msm-adreno-adreno_gpu-use-suspend-instead-of-idle-on-load-error.patch