]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.11-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Nov 2024 06:09:10 +0000 (07:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Nov 2024 06:09:10 +0000 (07:09 +0100)
added patches:
arm64-dts-imx8ulp-correct-the-flexspi-compatible-string.patch
arm64-dts-qcom-msm8939-revert-use-of-apcs-mbox-for-rpm.patch
arm64-dts-qcom-x1e80100-add-broadcast_and-region-in-llcc-block.patch
arm64-dts-qcom-x1e80100-crd-fix-nvme-regulator-boot-glitch.patch
arm64-dts-qcom-x1e80100-fix-pcie4-and-pcie6a-phy-clocks.patch
arm64-dts-qcom-x1e80100-fix-pcie4-interconnect.patch
arm64-dts-qcom-x1e80100-fix-up-bar-spaces.patch
arm64-dts-qcom-x1e80100-qcp-fix-nvme-regulator-boot-glitch.patch
arm64-dts-qcom-x1e80100-vivobook-s15-fix-nvme-regulator-boot-glitch.patch
arm64-dts-qcom-x1e80100-yoga-slim7x-fix-nvme-regulator-boot-glitch.patch
riscv-dts-starfive-disable-unused-csi-camss-nodes.patch
riscv-dts-starfive-update-ethernet-phy0-delay-parameter-values-for-star64.patch

13 files changed:
queue-6.11/arm64-dts-imx8ulp-correct-the-flexspi-compatible-string.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-msm8939-revert-use-of-apcs-mbox-for-rpm.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-add-broadcast_and-region-in-llcc-block.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-crd-fix-nvme-regulator-boot-glitch.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-and-pcie6a-phy-clocks.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-interconnect.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-fix-up-bar-spaces.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-qcp-fix-nvme-regulator-boot-glitch.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-vivobook-s15-fix-nvme-regulator-boot-glitch.patch [new file with mode: 0644]
queue-6.11/arm64-dts-qcom-x1e80100-yoga-slim7x-fix-nvme-regulator-boot-glitch.patch [new file with mode: 0644]
queue-6.11/riscv-dts-starfive-disable-unused-csi-camss-nodes.patch [new file with mode: 0644]
queue-6.11/riscv-dts-starfive-update-ethernet-phy0-delay-parameter-values-for-star64.patch [new file with mode: 0644]
queue-6.11/series

diff --git a/queue-6.11/arm64-dts-imx8ulp-correct-the-flexspi-compatible-string.patch b/queue-6.11/arm64-dts-imx8ulp-correct-the-flexspi-compatible-string.patch
new file mode 100644 (file)
index 0000000..42d0871
--- /dev/null
@@ -0,0 +1,92 @@
+From 409dc5196d5b6eb67468a06bf4d2d07d7225a67b Mon Sep 17 00:00:00 2001
+From: Haibo Chen <haibo.chen@nxp.com>
+Date: Thu, 5 Sep 2024 17:43:38 +0800
+Subject: arm64: dts: imx8ulp: correct the flexspi compatible string
+
+From: Haibo Chen <haibo.chen@nxp.com>
+
+commit 409dc5196d5b6eb67468a06bf4d2d07d7225a67b upstream.
+
+The flexspi on imx8ulp only has 16 LUTs, and imx8mm flexspi has
+32 LUTs, so correct the compatible string here, otherwise will
+meet below error:
+
+[    1.119072] ------------[ cut here ]------------
+[    1.123926] WARNING: CPU: 0 PID: 1 at drivers/spi/spi-nxp-fspi.c:855 nxp_fspi_exec_op+0xb04/0xb64
+[    1.133239] Modules linked in:
+[    1.136448] CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.11.0-rc6-next-20240902-00001-g131bf9439dd9 #69
+[    1.146821] Hardware name: NXP i.MX8ULP EVK (DT)
+[    1.151647] pstate: 40000005 (nZcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
+[    1.158931] pc : nxp_fspi_exec_op+0xb04/0xb64
+[    1.163496] lr : nxp_fspi_exec_op+0xa34/0xb64
+[    1.168060] sp : ffff80008002b2a0
+[    1.171526] x29: ffff80008002b2d0 x28: 0000000000000000 x27: 0000000000000000
+[    1.179002] x26: ffff2eb645542580 x25: ffff800080610014 x24: ffff800080610000
+[    1.186480] x23: ffff2eb645548080 x22: 0000000000000006 x21: ffff2eb6455425e0
+[    1.193956] x20: 0000000000000000 x19: ffff80008002b5e0 x18: ffffffffffffffff
+[    1.201432] x17: ffff2eb644467508 x16: 0000000000000138 x15: 0000000000000002
+[    1.208907] x14: 0000000000000000 x13: ffff2eb6400d8080 x12: 00000000ffffff00
+[    1.216378] x11: 0000000000000000 x10: ffff2eb6400d8080 x9 : ffff2eb697adca80
+[    1.223850] x8 : ffff2eb697ad3cc0 x7 : 0000000100000000 x6 : 0000000000000001
+[    1.231324] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 00000000000007a6
+[    1.238795] x2 : 0000000000000000 x1 : 00000000000001ce x0 : 00000000ffffff92
+[    1.246267] Call trace:
+[    1.248824]  nxp_fspi_exec_op+0xb04/0xb64
+[    1.253031]  spi_mem_exec_op+0x3a0/0x430
+[    1.257139]  spi_nor_read_id+0x80/0xcc
+[    1.261065]  spi_nor_scan+0x1ec/0xf10
+[    1.264901]  spi_nor_probe+0x108/0x2fc
+[    1.268828]  spi_mem_probe+0x6c/0xbc
+[    1.272574]  spi_probe+0x84/0xe4
+[    1.275958]  really_probe+0xbc/0x29c
+[    1.279713]  __driver_probe_device+0x78/0x12c
+[    1.284277]  driver_probe_device+0xd8/0x15c
+[    1.288660]  __device_attach_driver+0xb8/0x134
+[    1.293316]  bus_for_each_drv+0x88/0xe8
+[    1.297337]  __device_attach+0xa0/0x190
+[    1.301353]  device_initial_probe+0x14/0x20
+[    1.305734]  bus_probe_device+0xac/0xb0
+[    1.309752]  device_add+0x5d0/0x790
+[    1.313408]  __spi_add_device+0x134/0x204
+[    1.317606]  of_register_spi_device+0x3b4/0x590
+[    1.322348]  spi_register_controller+0x47c/0x754
+[    1.327181]  devm_spi_register_controller+0x4c/0xa4
+[    1.332289]  nxp_fspi_probe+0x1cc/0x2b0
+[    1.336307]  platform_probe+0x68/0xc4
+[    1.340145]  really_probe+0xbc/0x29c
+[    1.343893]  __driver_probe_device+0x78/0x12c
+[    1.348457]  driver_probe_device+0xd8/0x15c
+[    1.352838]  __driver_attach+0x90/0x19c
+[    1.356857]  bus_for_each_dev+0x7c/0xdc
+[    1.360877]  driver_attach+0x24/0x30
+[    1.364624]  bus_add_driver+0xe4/0x208
+[    1.368552]  driver_register+0x5c/0x124
+[    1.372573]  __platform_driver_register+0x28/0x34
+[    1.377497]  nxp_fspi_driver_init+0x1c/0x28
+[    1.381888]  do_one_initcall+0x80/0x1c8
+[    1.385908]  kernel_init_freeable+0x1c4/0x28c
+[    1.390472]  kernel_init+0x20/0x1d8
+[    1.394138]  ret_from_fork+0x10/0x20
+[    1.397885] ---[ end trace 0000000000000000 ]---
+[    1.407908] ------------[ cut here ]------------
+
+Fixes: ef89fd56bdfc ("arm64: dts: imx8ulp: add flexspi node")
+Cc: stable@kernel.org
+Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/freescale/imx8ulp.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8ulp.dtsi
+@@ -384,7 +384,7 @@
+                       };
+                       flexspi2: spi@29810000 {
+-                              compatible = "nxp,imx8mm-fspi";
++                              compatible = "nxp,imx8ulp-fspi";
+                               reg = <0x29810000 0x10000>, <0x60000000 0x10000000>;
+                               reg-names = "fspi_base", "fspi_mmap";
+                               #address-cells = <1>;
diff --git a/queue-6.11/arm64-dts-qcom-msm8939-revert-use-of-apcs-mbox-for-rpm.patch b/queue-6.11/arm64-dts-qcom-msm8939-revert-use-of-apcs-mbox-for-rpm.patch
new file mode 100644 (file)
index 0000000..accc4f8
--- /dev/null
@@ -0,0 +1,46 @@
+From d92e9ea2f0f918d7b01cbacb838288bffccc8954 Mon Sep 17 00:00:00 2001
+From: Fabien Parent <fabien.parent@linaro.org>
+Date: Wed, 4 Sep 2024 11:26:55 -0700
+Subject: arm64: dts: qcom: msm8939: revert use of APCS mbox for RPM
+
+From: Fabien Parent <fabien.parent@linaro.org>
+
+commit d92e9ea2f0f918d7b01cbacb838288bffccc8954 upstream.
+
+Commit 22e4e43484c4 ("arm64: dts: qcom: msm8939: Use mboxes
+properties for APCS") broke the boot on msm8939 platforms.
+
+The issue comes from the SMD driver failing to request the mbox
+channel because of circular dependencies:
+       1. rpm -> apcs1_mbox -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm.
+       2. rpm -> apcs1_mbox -> gcc -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm
+       3. rpm -> apcs1_mbox -> apcs2 -> gcc -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm
+
+To fix this issue let's switch back to using the deprecated
+qcom,ipc property for the RPM node.
+
+Fixes: 22e4e43484c4 ("arm64: dts: qcom: msm8939: Use mboxes properties for APCS")
+Signed-off-by: Fabien Parent <fabien.parent@linaro.org>
+Link: https://lore.kernel.org/r/20240904-msm8939-rpm-apcs-fix-v1-1-b608e7e48fe1@linaro.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
+index 46d9480cd464..39405713329b 100644
+--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
++++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
+@@ -248,7 +248,7 @@ rpm: remoteproc {
+               smd-edge {
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
+-                      mboxes = <&apcs1_mbox 0>;
++                      qcom,ipc = <&apcs1_mbox 8 0>;
+                       qcom,smd-edge = <15>;
+                       rpm_requests: rpm-requests {
+-- 
+2.47.0
+
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-add-broadcast_and-region-in-llcc-block.patch b/queue-6.11/arm64-dts-qcom-x1e80100-add-broadcast_and-region-in-llcc-block.patch
new file mode 100644 (file)
index 0000000..b3a5b63
--- /dev/null
@@ -0,0 +1,51 @@
+From 80fe25fcc605209b707583e3337e3cd40b7ed0bf Mon Sep 17 00:00:00 2001
+From: Abel Vesa <abel.vesa@linaro.org>
+Date: Mon, 14 Oct 2024 10:38:20 +0300
+Subject: arm64: dts: qcom: x1e80100: Add Broadcast_AND region in LLCC block
+
+From: Abel Vesa <abel.vesa@linaro.org>
+
+commit 80fe25fcc605209b707583e3337e3cd40b7ed0bf upstream.
+
+Add missing Broadcast_AND region to the LLCC block for x1e80100,
+as the LLCC version on this platform is 4.1 and it provides the region.
+
+This also fixes the following error caused by the missing region:
+
+[    3.797768] qcom-llcc 25000000.system-cache-controller: error -EINVAL: invalid resource (null)
+
+This error started showing up only after the new regmap region called
+Broadcast_AND that has been added to the llcc-qcom driver.
+
+Cc: stable@vger.kernel.org # 6.11: 055afc34fd21: soc: qcom: llcc: Add regmap for Broadcast_AND region
+Fixes: af16b00578a7 ("arm64: dts: qcom: Add base X1E80100 dtsi and the QCP dts")
+Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
+Link: https://lore.kernel.org/r/20241014-x1e80100-dts-llcc-add-broadcastand_region-v2-1-5ee6ac128627@linaro.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
++++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+@@ -5700,7 +5700,8 @@
+                             <0 0x25a00000 0 0x200000>,
+                             <0 0x25c00000 0 0x200000>,
+                             <0 0x25e00000 0 0x200000>,
+-                            <0 0x26000000 0 0x200000>;
++                            <0 0x26000000 0 0x200000>,
++                            <0 0x26200000 0 0x200000>;
+                       reg-names = "llcc0_base",
+                                   "llcc1_base",
+                                   "llcc2_base",
+@@ -5709,7 +5710,8 @@
+                                   "llcc5_base",
+                                   "llcc6_base",
+                                   "llcc7_base",
+-                                  "llcc_broadcast_base";
++                                  "llcc_broadcast_base",
++                                  "llcc_broadcast_and_base";
+                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+               };
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-crd-fix-nvme-regulator-boot-glitch.patch b/queue-6.11/arm64-dts-qcom-x1e80100-crd-fix-nvme-regulator-boot-glitch.patch
new file mode 100644 (file)
index 0000000..f010aa5
--- /dev/null
@@ -0,0 +1,36 @@
+From 37f9477ce9d07ed87f6efe9b99de580bc9d27df5 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Wed, 16 Oct 2024 16:51:08 +0200
+Subject: arm64: dts: qcom: x1e80100-crd: fix nvme regulator boot glitch
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 37f9477ce9d07ed87f6efe9b99de580bc9d27df5 upstream.
+
+The NVMe regulator has been left enabled by the boot firmware. Mark it
+as such to avoid disabling the regulator temporarily during boot.
+
+Fixes: eb57cbe730d1 ("arm64: dts: qcom: x1e80100: Describe the PCIe 6a resources")
+Cc: stable@vger.kernel.org     # 6.11
+Cc: Abel Vesa <abel.vesa@linaro.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241016145112.24785-3-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100-crd.dts |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
++++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+@@ -283,6 +283,8 @@
+               pinctrl-names = "default";
+               pinctrl-0 = <&nvme_reg_en>;
++
++              regulator-boot-on;
+       };
+ };
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-and-pcie6a-phy-clocks.patch b/queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-and-pcie6a-phy-clocks.patch
new file mode 100644 (file)
index 0000000..bd32a3f
--- /dev/null
@@ -0,0 +1,67 @@
+From 27727cb6604e0998d03d9ec063b517b239d2bb0f Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Mon, 16 Sep 2024 10:23:06 +0200
+Subject: arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 27727cb6604e0998d03d9ec063b517b239d2bb0f upstream.
+
+Add the missing clkref enable and pipediv2 clocks to the PCIe4 and
+PCIe6a PHYs.
+
+Fixes: 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
+Cc: stable@vger.kernel.org     # 6.9
+Cc: Abel Vesa <abel.vesa@linaro.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
+Reviewed-by: Konrad Dybcio <konradybcio@kernel.org>
+Link: https://lore.kernel.org/r/20240916082307.29393-3-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi |   16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
++++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+@@ -2973,14 +2973,16 @@
+                       clocks = <&gcc GCC_PCIE_6A_PHY_AUX_CLK>,
+                                <&gcc GCC_PCIE_6A_CFG_AHB_CLK>,
+-                               <&rpmhcc RPMH_CXO_CLK>,
++                               <&tcsr TCSR_PCIE_4L_CLKREF_EN>,
+                                <&gcc GCC_PCIE_6A_PHY_RCHNG_CLK>,
+-                               <&gcc GCC_PCIE_6A_PIPE_CLK>;
++                               <&gcc GCC_PCIE_6A_PIPE_CLK>,
++                               <&gcc GCC_PCIE_6A_PIPEDIV2_CLK>;
+                       clock-names = "aux",
+                                     "cfg_ahb",
+                                     "ref",
+                                     "rchng",
+-                                    "pipe";
++                                    "pipe",
++                                    "pipediv2";
+                       resets = <&gcc GCC_PCIE_6A_PHY_BCR>,
+                                <&gcc GCC_PCIE_6A_NOCSR_COM_PHY_BCR>;
+@@ -3105,14 +3107,16 @@
+                       clocks = <&gcc GCC_PCIE_4_AUX_CLK>,
+                                <&gcc GCC_PCIE_4_CFG_AHB_CLK>,
+-                               <&rpmhcc RPMH_CXO_CLK>,
++                               <&tcsr TCSR_PCIE_2L_4_CLKREF_EN>,
+                                <&gcc GCC_PCIE_4_PHY_RCHNG_CLK>,
+-                               <&gcc GCC_PCIE_4_PIPE_CLK>;
++                               <&gcc GCC_PCIE_4_PIPE_CLK>,
++                               <&gcc GCC_PCIE_4_PIPEDIV2_CLK>;
+                       clock-names = "aux",
+                                     "cfg_ahb",
+                                     "ref",
+                                     "rchng",
+-                                    "pipe";
++                                    "pipe",
++                                    "pipediv2";
+                       resets = <&gcc GCC_PCIE_4_PHY_BCR>;
+                       reset-names = "phy";
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-interconnect.patch b/queue-6.11/arm64-dts-qcom-x1e80100-fix-pcie4-interconnect.patch
new file mode 100644 (file)
index 0000000..c82503c
--- /dev/null
@@ -0,0 +1,39 @@
+From f3bba5eb46ddb8f460fc808a65050a9bf2f7ef23 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Thu, 24 Oct 2024 15:10:59 +0200
+Subject: arm64: dts: qcom: x1e80100: fix PCIe4 interconnect
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit f3bba5eb46ddb8f460fc808a65050a9bf2f7ef23 upstream.
+
+The fourth PCIe controller is connected to the PCIe North ANoC.
+
+Fix the corresponding interconnect property so that the OS manages the
+right path.
+
+Fixes: 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
+Cc: stable@vger.kernel.org     # 6.9
+Cc: Abel Vesa <abel.vesa@linaro.org>
+Cc: Sibi Sankar <quic_sibis@quicinc.com>
+Cc: Rajendra Nayak <quic_rjendra@quicinc.com>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241024131101.13587-2-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
++++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+@@ -3068,7 +3068,7 @@
+                       assigned-clocks = <&gcc GCC_PCIE_4_AUX_CLK>;
+                       assigned-clock-rates = <19200000>;
+-                      interconnects = <&pcie_south_anoc MASTER_PCIE_4 QCOM_ICC_TAG_ALWAYS
++                      interconnects = <&pcie_north_anoc MASTER_PCIE_4 QCOM_ICC_TAG_ALWAYS
+                                        &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
+                                        &cnoc_main SLAVE_PCIE_4 QCOM_ICC_TAG_ALWAYS>;
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-fix-up-bar-spaces.patch b/queue-6.11/arm64-dts-qcom-x1e80100-fix-up-bar-spaces.patch
new file mode 100644 (file)
index 0000000..b958e33
--- /dev/null
@@ -0,0 +1,58 @@
+From 7af1418500124150f9fd24e1a5b9c288771df271 Mon Sep 17 00:00:00 2001
+From: Konrad Dybcio <konrad.dybcio@linaro.org>
+Date: Wed, 10 Jul 2024 16:07:23 +0200
+Subject: arm64: dts: qcom: x1e80100: Fix up BAR spaces
+
+From: Konrad Dybcio <konrad.dybcio@linaro.org>
+
+commit 7af1418500124150f9fd24e1a5b9c288771df271 upstream.
+
+The 32-bit BAR spaces are reaching outside their assigned register
+regions. Shrink them to match their actual sizes.
+
+This resolves an issue where the regions overlap and one of the
+controllers won't come up, which can be seen in the log as:
+
+  qcom-pcie 1c08000.pci: resource collision: [mem 0x7c300000-0x7fffffff] conflicts with 1c00000.pci dbi [mem 0x7e000000-0x7e000f1c]
+
+While at it, unify the style.
+
+Fixes: 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
+Cc: stable@vger.kernel.org
+Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
+Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
+Tested-by: Abel Vesa <abel.vesa@linaro.org>
+Link: https://lore.kernel.org/r/20240710-topic-barman-v1-1-5f63fca8d0fc@linaro.org
+[bjorn: Added note about overlapping resource regions]
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
++++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+@@ -2895,9 +2895,9 @@
+                                   "mhi";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+-                      ranges = <0x01000000 0 0x00000000 0 0x70200000 0 0x100000>,
+-                               <0x02000000 0 0x70300000 0 0x70300000 0 0x3d00000>;
+-                      bus-range = <0 0xff>;
++                      ranges = <0x01000000 0x0 0x00000000 0x0 0x70200000 0x0 0x100000>,
++                               <0x02000000 0x0 0x70300000 0x0 0x70300000 0x0 0x1d00000>;
++                      bus-range = <0x00 0xff>;
+                       dma-coherent;
+@@ -3017,8 +3017,8 @@
+                                   "mhi";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+-                      ranges = <0x01000000 0 0x00000000 0 0x7c200000 0 0x100000>,
+-                               <0x02000000 0 0x7c300000 0 0x7c300000 0 0x3d00000>;
++                      ranges = <0x01000000 0x0 0x00000000 0x0 0x7c200000 0x0 0x100000>,
++                               <0x02000000 0x0 0x7c300000 0x0 0x7c300000 0x0 0x1d00000>;
+                       bus-range = <0x00 0xff>;
+                       dma-coherent;
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-qcp-fix-nvme-regulator-boot-glitch.patch b/queue-6.11/arm64-dts-qcom-x1e80100-qcp-fix-nvme-regulator-boot-glitch.patch
new file mode 100644 (file)
index 0000000..26d2742
--- /dev/null
@@ -0,0 +1,41 @@
+From 717f0637ffc6a6a59f838df94a7d61e643c98d62 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Wed, 16 Oct 2024 16:51:12 +0200
+Subject: arm64: dts: qcom: x1e80100-qcp: fix nvme regulator boot glitch
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 717f0637ffc6a6a59f838df94a7d61e643c98d62 upstream.
+
+The NVMe regulator has been left enabled by the boot firmware. Mark it
+as such to avoid disabling the regulator temporarily during boot.
+
+Fixes: eb57cbe730d1 ("arm64: dts: qcom: x1e80100: Describe the PCIe 6a resources")
+Cc: stable@vger.kernel.org     # 6.11
+Cc: Abel Vesa <abel.vesa@linaro.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241016145112.24785-7-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+index 1c3a6a7b3ed6..5ef030c60abe 100644
+--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
++++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+@@ -253,6 +253,8 @@ vreg_nvme: regulator-nvme {
+               pinctrl-names = "default";
+               pinctrl-0 = <&nvme_reg_en>;
++
++              regulator-boot-on;
+       };
+ };
+-- 
+2.47.0
+
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-vivobook-s15-fix-nvme-regulator-boot-glitch.patch b/queue-6.11/arm64-dts-qcom-x1e80100-vivobook-s15-fix-nvme-regulator-boot-glitch.patch
new file mode 100644 (file)
index 0000000..0bd5480
--- /dev/null
@@ -0,0 +1,41 @@
+From c6d151f61b6703124e14bc0eae98d05206e36e02 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Wed, 16 Oct 2024 16:51:09 +0200
+Subject: arm64: dts: qcom: x1e80100-vivobook-s15: fix nvme regulator boot glitch
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit c6d151f61b6703124e14bc0eae98d05206e36e02 upstream.
+
+The NVMe regulator has been left enabled by the boot firmware. Mark it
+as such to avoid disabling the regulator temporarily during boot.
+
+Fixes: d0e2f8f62dff ("arm64: dts: qcom: Add device tree for ASUS Vivobook S 15")
+Cc: stable@vger.kernel.org     # 6.11
+Cc: Xilin Wu <wuxilin123@gmail.com>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241016145112.24785-4-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+index 20616bd4aa6c..fb4a48a1e2a8 100644
+--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
++++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+@@ -134,6 +134,8 @@ vreg_nvme: regulator-nvme {
+               pinctrl-0 = <&nvme_reg_en>;
+               pinctrl-names = "default";
++
++              regulator-boot-on;
+       };
+ };
+-- 
+2.47.0
+
diff --git a/queue-6.11/arm64-dts-qcom-x1e80100-yoga-slim7x-fix-nvme-regulator-boot-glitch.patch b/queue-6.11/arm64-dts-qcom-x1e80100-yoga-slim7x-fix-nvme-regulator-boot-glitch.patch
new file mode 100644 (file)
index 0000000..95643b0
--- /dev/null
@@ -0,0 +1,36 @@
+From 1badd07e4c0e1ecfb187dcba05357c0f3e70e797 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Wed, 16 Oct 2024 16:51:10 +0200
+Subject: arm64: dts: qcom: x1e80100-yoga-slim7x: fix nvme regulator boot glitch
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 1badd07e4c0e1ecfb187dcba05357c0f3e70e797 upstream.
+
+The NVMe regulator has been left enabled by the boot firmware. Mark it
+as such to avoid disabling the regulator temporarily during boot.
+
+Fixes: 45247fe17db2 ("arm64: dts: qcom: x1e80100: add Lenovo Thinkpad Yoga slim 7x devicetree")
+Cc: stable@vger.kernel.org     # 6.11
+Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241016145112.24785-5-johan+linaro@kernel.org
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
++++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
+@@ -206,6 +206,8 @@
+               pinctrl-0 = <&nvme_reg_en>;
+               pinctrl-names = "default";
++
++              regulator-boot-on;
+       };
+ };
diff --git a/queue-6.11/riscv-dts-starfive-disable-unused-csi-camss-nodes.patch b/queue-6.11/riscv-dts-starfive-disable-unused-csi-camss-nodes.patch
new file mode 100644 (file)
index 0000000..6986d8a
--- /dev/null
@@ -0,0 +1,48 @@
+From 2e11e78667db90a9e732fbe42820e734d0658fc7 Mon Sep 17 00:00:00 2001
+From: Conor Dooley <conor.dooley@microchip.com>
+Date: Wed, 16 Oct 2024 21:11:15 +0100
+Subject: riscv: dts: starfive: disable unused csi/camss nodes
+
+From: Conor Dooley <conor.dooley@microchip.com>
+
+commit 2e11e78667db90a9e732fbe42820e734d0658fc7 upstream.
+
+Aurelien reported probe failures due to the csi node being enabled
+without having a camera attached to it. A camera was in the initial
+submissions, but was removed from the dts, as it had not actually been
+present on the board, but was from an addon board used by the
+developer of the relevant drivers. The non-camera pipeline nodes were
+not disabled when this happened and the probe failures are problematic
+for Debian. Disable them.
+
+CC: stable@vger.kernel.org
+Fixes: 28ecaaa5af192 ("riscv: dts: starfive: jh7110: Add camera subsystem nodes")
+Closes: https://lore.kernel.org/all/Zw1-vcN4CoVkfLjU@aurel32.net/
+Reported-by: Aurelien Jarno <aurelien@aurel32.net>
+Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
+Tested-by: Aurelien Jarno <aurelien@aurel32.net>
+Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
+Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/boot/dts/starfive/jh7110-common.dtsi |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
++++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+@@ -128,7 +128,6 @@
+       assigned-clocks = <&ispcrg JH7110_ISPCLK_DOM4_APB_FUNC>,
+                         <&ispcrg JH7110_ISPCLK_MIPI_RX0_PXL>;
+       assigned-clock-rates = <49500000>, <198000000>;
+-      status = "okay";
+       ports {
+               #address-cells = <1>;
+@@ -151,7 +150,6 @@
+ &csi2rx {
+       assigned-clocks = <&ispcrg JH7110_ISPCLK_VIN_SYS>;
+       assigned-clock-rates = <297000000>;
+-      status = "okay";
+       ports {
+               #address-cells = <1>;
diff --git a/queue-6.11/riscv-dts-starfive-update-ethernet-phy0-delay-parameter-values-for-star64.patch b/queue-6.11/riscv-dts-starfive-update-ethernet-phy0-delay-parameter-values-for-star64.patch
new file mode 100644 (file)
index 0000000..f9c535e
--- /dev/null
@@ -0,0 +1,83 @@
+From 825bb69228c8ab85637d21cdf4d44207937130b6 Mon Sep 17 00:00:00 2001
+From: E Shattow <e@freeshell.de>
+Date: Mon, 21 Oct 2024 23:09:51 -0700
+Subject: riscv: dts: starfive: Update ethernet phy0 delay parameter values for Star64
+
+From: E Shattow <e@freeshell.de>
+
+commit 825bb69228c8ab85637d21cdf4d44207937130b6 upstream.
+
+Improve function of Star64 bottom network port phy0 with updated delay values.
+Initial upstream patches supporting Star64 use the same vendor board support
+package parameters known to result in an unreliable bottom network port.
+
+Success acquiring DHCP lease and no dropped packets to ping LAN address:
+rx  900: tx 1500 1650 1800 1950
+rx  750: tx      1650 1800 1950
+rx  600: tx           1800 1950
+rx 1050: tx      1650 1800 1950
+rx 1200: tx 1500 1650 1800 1950
+rx 1350: tx 1500 1650 1800 1950
+rx 1500: tx 1500 1650 1800 1950
+rx 1650: tx 1500 1650 1800 1950
+rx 1800: tx 1500 1650 1800 1950
+rx 1900: tx                1950
+rx 1950: tx                1950
+
+Failure acquiring DHCP lease or many dropped packets:
+rx  450: tx                1500      1800 1950
+rx  600: tx      1200 1350      1650
+rx  750: tx           1350 1500
+rx  900: tx      1200 1350
+rx 1050: tx 1050 1200 1350 1500
+rx 1200: tx           1350
+rx 1350: tx           1350
+rx 1500: tx      1200 1350
+rx 1650: tx 1050 1200 1350
+rx 1800: tx 1050 1200 1350
+rx 1900: tx                1500 1650 1800
+rx 1950: tx      1200 1350
+
+Non-functional:
+rx    0: tx 0  150  300  450  600  750  900 1050 1200 1350 1500 1650 1800 1950
+rx  150: tx 0  150  300  450  600  750  900 1050 1200 1350 1500 1650 1800 1950
+rx  300: tx 0  150  300  450  600  750  900 1050 1200 1350 1500 1650 1800 1950
+rx  450: tx 0  150  300  450  600  750  900 1050 1200 1350      1650
+rx  600: tx 0  150  300  450  600  750  900 1050
+rx  750: tx 0  150  300  450  600  750  900 1050 1200
+rx  900: tx 0  150  300  450  600  750  900 1050
+rx 1050: tx 0  150  300  450  600  750  900
+rx 1200: tx 0  150  300  450  600  750  900 1050 1200
+rx 1350: tx 0  150  300  450  600  750  900 1050 1200
+rx 1500: tx 0  150  300  450  600  750  900 1050
+rx 1650: tx 0  150  300  450  600  750  900
+rx 1800: tx 0  150  300  450  600  750  900
+rx 1900: tx 0  150  300  450  600  750  900 1050 1200 1350
+rx 1950: tx 0  150  300  450  600  750  900 1050
+
+Selecting the median of all working rx delay values 1500 combined with tx delay
+values 1500, 1650, 1800, and 1950 only the tx delay value of 1950 (default) is
+reliable as tested in both Linux 6.11.2 and U-Boot v2024.10
+
+Signed-off-by: E Shattow <e@freeshell.de>
+CC: stable@vger.kernel.org
+Fixes: 2606bf583b962 ("riscv: dts: starfive: add Star64 board devicetree")
+Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
+Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
++++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
+@@ -44,8 +44,7 @@
+ };
+ &phy0 {
+-      rx-internal-delay-ps = <1900>;
+-      tx-internal-delay-ps = <1500>;
++      rx-internal-delay-ps = <1500>;
+       motorcomm,rx-clk-drv-microamp = <2910>;
+       motorcomm,rx-data-drv-microamp = <2910>;
+       motorcomm,tx-clk-adj-enabled;
index ea753d29c01d14d023ac6e7dffe8400dcdd0a72a..06c3fe2249e9cf24f3ebdd44e580bbcea7c3598e 100644 (file)
@@ -207,3 +207,15 @@ mm-multi-gen-lru-ignore-non-leaf-pmd_young-for-force.patch
 mm-multi-gen-lru-remove-mm_leaf_old-and-mm_nonleaf_t.patch
 mm-shrink-skip-folio-mapped-by-an-exiting-process.patch
 mm-multi-gen-lru-use-ptep-pmdp-_clear_young_notify.patch
+riscv-dts-starfive-update-ethernet-phy0-delay-parameter-values-for-star64.patch
+riscv-dts-starfive-disable-unused-csi-camss-nodes.patch
+arm64-dts-qcom-msm8939-revert-use-of-apcs-mbox-for-rpm.patch
+arm64-dts-qcom-x1e80100-yoga-slim7x-fix-nvme-regulator-boot-glitch.patch
+arm64-dts-qcom-x1e80100-fix-up-bar-spaces.patch
+arm64-dts-qcom-x1e80100-vivobook-s15-fix-nvme-regulator-boot-glitch.patch
+arm64-dts-qcom-x1e80100-fix-pcie4-interconnect.patch
+arm64-dts-qcom-x1e80100-qcp-fix-nvme-regulator-boot-glitch.patch
+arm64-dts-qcom-x1e80100-crd-fix-nvme-regulator-boot-glitch.patch
+arm64-dts-imx8ulp-correct-the-flexspi-compatible-string.patch
+arm64-dts-qcom-x1e80100-add-broadcast_and-region-in-llcc-block.patch
+arm64-dts-qcom-x1e80100-fix-pcie4-and-pcie6a-phy-clocks.patch