]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jul 2024 11:47:14 +0000 (13:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jul 2024 11:47:14 +0000 (13:47 +0200)
added patches:
revert-dt-bindings-cache-qcom-llcc-correct-qdu1000-reg-entries.patch

queue-6.9/revert-dt-bindings-cache-qcom-llcc-correct-qdu1000-reg-entries.patch [new file with mode: 0644]
queue-6.9/series

diff --git a/queue-6.9/revert-dt-bindings-cache-qcom-llcc-correct-qdu1000-reg-entries.patch b/queue-6.9/revert-dt-bindings-cache-qcom-llcc-correct-qdu1000-reg-entries.patch
new file mode 100644 (file)
index 0000000..6a4700d
--- /dev/null
@@ -0,0 +1,56 @@
+From e227c11179dfb6970360c95a8d7b007eb3b223d6 Mon Sep 17 00:00:00 2001
+From: Komal Bajaj <quic_kbajaj@quicinc.com>
+Date: Wed, 19 Jun 2024 11:46:41 +0530
+Subject: Revert "dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries"
+
+From: Komal Bajaj <quic_kbajaj@quicinc.com>
+
+commit e227c11179dfb6970360c95a8d7b007eb3b223d6 upstream.
+
+This reverts commit f0f99f371822c48847e02e56d6e7de507e18f186.
+
+QDU1000 has 7 register regions. The earlier commit 8e2506d01231
+("dt-bindings: cache: qcom,llcc: Add LLCC compatible for QDU1000/QRU1000")
+to add llcc compatible was reflecting the same, but dtsi change for
+QDU1000 was not aligning with its binding. Later, commit f0f99f371822
+("dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries") was merged
+intended to fix this misalignment.
+
+After the LLCC driver refactor, each LLCC bank/channel need to be
+represented as one register space to avoid mapping to the region where
+access is not there. Hence, revert the commit f0f99f371822 ("dt-bindings:
+cache: qcom,llcc: correct QDU1000 reg entries") to align QDU1000 llcc
+binding with its dtsi node.
+
+Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
+Link: https://lore.kernel.org/r/20240619061641.5261-3-quic_kbajaj@quicinc.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/devicetree/bindings/cache/qcom,llcc.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/cache/qcom,llcc.yaml b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
+index 07ccbda4a0ab..b9a9f2cf32a1 100644
+--- a/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
++++ b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
+@@ -66,7 +66,6 @@ allOf:
+         compatible:
+           contains:
+             enum:
+-              - qcom,qdu1000-llcc
+               - qcom,sc7180-llcc
+               - qcom,sm6350-llcc
+     then:
+@@ -104,6 +103,7 @@ allOf:
+         compatible:
+           contains:
+             enum:
++              - qcom,qdu1000-llcc
+               - qcom,sc8180x-llcc
+               - qcom,sc8280xp-llcc
+               - qcom,x1e80100-llcc
+-- 
+2.45.2
+
index 961f71c48754f33063879961ca18fae4471b70a6..7176761601fcce3d5009962ac7c74d2587a64ce8 100644 (file)
@@ -130,3 +130,4 @@ misc-fastrpc-restrict-untrusted-app-to-attach-to-privileged-pd.patch
 mm-readahead-limit-page-cache-size-in-page_cache_ra_order.patch
 mm-shmem-disable-pmd-sized-page-cache-if-needed.patch
 mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet.patch
+revert-dt-bindings-cache-qcom-llcc-correct-qdu1000-reg-entries.patch