]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch from...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Mar 2025 15:42:32 +0000 (11:42 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Mar 2025 15:42:32 +0000 (11:42 -0400)
12 files changed:
queue-5.10/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-5.10/series
queue-5.15/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-5.15/series
queue-6.1/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-6.1/series
queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-6.12/series
queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-6.13/series
queue-6.6/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch [deleted file]
queue-6.6/series

diff --git a/queue-5.10/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-5.10/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index 05f8e1c..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -546,6 +546,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 0c49e25e5f950bc15b6e498d54c70996c12ed586..67a22ef44532ff5dbe581c4b760891420507125b 100644 (file)
@@ -82,7 +82,6 @@ net-neighbor-add-missing-policy-for-ndtpa_queue_lenb.patch
 i2c-omap-fix-irq-storms.patch
 drm-v3d-don-t-run-jobs-that-have-errors-flagged-in-its-fence.patch
 regulator-check-that-dummy-regulator-has-been-probed-before-using-it.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 proc-fix-uaf-in-proc_get_inode.patch
 arm-shmobile-smp-enforce-shmobile_smp_-alignment.patch
diff --git a/queue-5.15/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-5.15/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index 05e13f2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -576,6 +576,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 5474a047385f8c484b9245ce8d0b82de308ea8ff..e30f4a9c6fc2094ac493ea4849a317546fb5a54a 100644 (file)
@@ -96,7 +96,6 @@ revert-gre-fix-ipv6-link-local-address-generation.patch
 i2c-omap-fix-irq-storms.patch
 drm-v3d-don-t-run-jobs-that-have-errors-flagged-in-its-fence.patch
 regulator-check-that-dummy-regulator-has-been-probed-before-using-it.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 proc-fix-uaf-in-proc_get_inode.patch
 arm-shmobile-smp-enforce-shmobile_smp_-alignment.patch
diff --git a/queue-6.1/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-6.1/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index 0d0154e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -667,6 +667,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 5598e1b414ea87ea338d9319a2c4e33f6dd783f1..ee88890d69c7fa7d449dd373c1d879450b0b56ae 100644 (file)
@@ -172,7 +172,6 @@ can-flexcan-disable-transceiver-during-system-pm.patch
 drm-v3d-don-t-run-jobs-that-have-errors-flagged-in-its-fence.patch
 regulator-check-that-dummy-regulator-has-been-probed-before-using-it.patch
 arm64-dts-freescale-imx8mm-verdin-dahlia-add-microphone-jack-to-sound-card.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-sdhci-brcmstb-add-cqhci-suspend-resume-to-pm-ops.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 proc-fix-uaf-in-proc_get_inode.patch
diff --git a/queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index aa54571..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -661,6 +661,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 85bae6169404d5179f44d9f22a918e36ce946775..c61e640bf3e075ec73322225037f8e0d63327ecc 100644 (file)
@@ -68,7 +68,6 @@ arm64-dts-freescale-imx8mp-verdin-dahlia-add-microphone-jack-to-sound-card.patch
 arm64-dts-freescale-imx8mm-verdin-dahlia-add-microphone-jack-to-sound-card.patch
 arm64-dts-rockchip-fix-pinmux-of-uart0-for-px30-ringneck-on-haikou.patch
 arm64-dts-rockchip-fix-pinmux-of-uart5-for-px30-ringneck-on-haikou.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-sdhci-brcmstb-add-cqhci-suspend-resume-to-pm-ops.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 selftests-mm-run_vmtests.sh-fix-half_ufd_size_mb-calculation.patch
diff --git a/queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index d7394b5..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -673,6 +673,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 920b93b01dfd54a2624476d9faf86e30559b281b..1e8e10c2ce9e5531fbab51a95e17674132d9006e 100644 (file)
@@ -72,7 +72,6 @@ arm64-dts-rockchip-fix-pinmux-of-uart0-for-px30-ringneck-on-haikou.patch
 arm64-dts-rockchip-fix-pinmux-of-uart5-for-px30-ringneck-on-haikou.patch
 arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch
 arm64-dts-rockchip-add-avdd-hdmi-supplies-to-rockpro64-board-dtsi.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-sdhci-brcmstb-add-cqhci-suspend-resume-to-pm-ops.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 selftests-mm-run_vmtests.sh-fix-half_ufd_size_mb-calculation.patch
diff --git a/queue-6.6/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch b/queue-6.6/arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
deleted file mode 100644 (file)
index aa54571..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From ffcef3df680c437ca33ff434be18ec24d72907c2 Mon Sep 17 00:00:00 2001
-From: Dragan Simic <dsimic@manjaro.org>
-Date: Sun, 2 Mar 2025 19:48:04 +0100
-Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
-
-From: Dragan Simic <dsimic@manjaro.org>
-
-commit ffcef3df680c437ca33ff434be18ec24d72907c2 upstream.
-
-Add missing "vpcie0v9-supply" and "vpcie1v8-supply" properties to the "pcie0"
-node in the Pine64 RockPro64 board dtsi file.  This eliminates the following
-warnings from the kernel log:
-
-  rockchip-pcie f8000000.pcie: supply vpcie1v8 not found, using dummy regulator
-  rockchip-pcie f8000000.pcie: supply vpcie0v9 not found, using dummy regulator
-
-These additions improve the accuracy of hardware description of the RockPro64
-and, in theory, they should result in no functional changes to the way board
-works after the changes, because the "vcca_0v9" and "vcca_1v8" regulators are
-always enabled. [1][2]  However, extended reliability testing, performed by
-Chris, [3] has proven that the age-old issues with some PCI Express cards,
-when used with a Pine64 RockPro64, are also resolved.
-
-Those issues were already mentioned in the commit 43853e843aa6 (arm64: dts:
-rockchip: Remove unsupported node from the Pinebook Pro dts, 2024-04-01),
-together with a brief description of the out-of-tree enumeration delay patch
-that reportedly resolves those issues.  In a nutshell, booting a RockPro64
-with some PCI Express cards attached to it caused a kernel oops. [4]
-
-Symptomatically enough, to the commit author's best knowledge, only the Pine64
-RockPro64, out of all RK3399-based boards and devices supported upstream, has
-been reported to suffer from those PCI Express issues, and only the RockPro64
-had some of the PCI Express supplies missing in its DT.  Thus, perhaps some
-weird timing issues exist that caused the "vcca_1v8" always-on regulator,
-which is part of the RK808 PMIC, to actually not be enabled before the PCI
-Express is initialized and enumerated on the RockPro64, causing oopses with
-some PCIe cards, and the aforementioned enumeration delay patch [4] probably
-acted as just a workaround for the underlying timing issue.
-
-Admittedly, the Pine64 RockPro64 is a bit specific board by having a standard
-PCI Express slot, allowing use of various standard cards, but pretty much
-standard PCI Express cards have been attached to other RK3399 boards as well,
-and the commit author is unaware ot such issues reported for them.
-
-It's quite hard to be sure that the PCI Express issues are fully resolved by
-these additions to the DT, without some really extensive and time-consuming
-testing.  However, these additions to the DT can result in good things and
-improvements anyway, making them perfectly safe from the standpoint of being
-unable to do any harm or cause some unforeseen regressions.
-
-These changes apply to the both supported hardware revisions of the Pine64
-RockPro64, i.e. to the production-run revisions 2.0 and 2.1. [1][2]
-
-[1] https://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
-[2] https://files.pine64.org/doc/rockpro64/rockpro64_v20-SCH.pdf
-[3] https://z9.de/hedgedoc/s/nF4d5G7rg#reboot-tests-for-PCIe-improvements
-[4] https://lore.kernel.org/lkml/20230509153912.515218-1-vincenzopalazzodev@gmail.com/T/#u
-
-Fixes: bba821f5479e ("arm64: dts: rockchip: add PCIe nodes on rk3399-rockpro64")
-Cc: stable@vger.kernel.org
-Cc: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
-Cc: Peter Geis <pgwipeout@gmail.com>
-Cc: Bjorn Helgaas <helgaas@kernel.org>
-Reported-by: Diederik de Haas <didi.debian@cknow.org>
-Tested-by: Chris Vogel <chris@z9.de>
-Signed-off-by: Dragan Simic <dsimic@manjaro.org>
-Tested-by: Diederik de Haas <didi.debian@cknow.org>
-Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -661,6 +661,8 @@
-       num-lanes = <4>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie_perst>;
-+      vpcie0v9-supply = <&vcca_0v9>;
-+      vpcie1v8-supply = <&vcca_1v8>;
-       vpcie12v-supply = <&vcc12v_dcin>;
-       vpcie3v3-supply = <&vcc3v3_pcie>;
-       status = "okay";
index 654e20c5a467c8503dfddf1576c1b0f4d08e86d9..bc34b456e253dbd856a9ac90730bb1b17b6d58eb 100644 (file)
@@ -39,7 +39,6 @@ accel-qaic-fix-integer-overflow-in-qaic_validate_req.patch
 arm64-dts-freescale-imx8mp-verdin-dahlia-add-microphone-jack-to-sound-card.patch
 arm64-dts-freescale-imx8mm-verdin-dahlia-add-microphone-jack-to-sound-card.patch
 arm64-dts-rockchip-fix-pinmux-of-uart0-for-px30-ringneck-on-haikou.patch
-arm64-dts-rockchip-add-missing-pcie-supplies-to-rockpro64-board-dtsi.patch
 mmc-sdhci-brcmstb-add-cqhci-suspend-resume-to-pm-ops.patch
 mmc-atmel-mci-add-missing-clk_disable_unprepare.patch
 mm-fix-error-handling-in-__filemap_get_folio-with-fgp_nowait.patch