From 948d73374d08bcc0dd120951b8550ce5c7d29075 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Apr 2025 17:14:39 +0200 Subject: [PATCH] drop arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch again --- ...ip-add-missing-pcie-supplies-to-rock.patch | 91 ------------------- queue-6.12/series | 1 - ...ip-add-missing-pcie-supplies-to-rock.patch | 91 ------------------- queue-6.13/series | 1 - 4 files changed, 184 deletions(-) delete mode 100644 queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch delete mode 100644 queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch diff --git a/queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch b/queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch deleted file mode 100644 index c3a8db4ef8..0000000000 --- a/queue-6.12/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8aee6471dd6b35fc567fb1629dbeb376bfd80a93 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 2 Mar 2025 19:48:04 +0100 -Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board - dtsi - -From: Dragan Simic - -[ Upstream commit ffcef3df680c437ca33ff434be18ec24d72907c2 ] - -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 -Cc: Peter Geis -Cc: Bjorn Helgaas -Reported-by: Diederik de Haas -Tested-by: Chris Vogel -Signed-off-by: Dragan Simic -Tested-by: Diederik de Haas -Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org -Signed-off-by: Heiko Stuebner -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 11d99d8b34a2b..fd8296c1d3fad 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -661,6 +661,8 @@ &pcie0 { - 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"; --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index 803f0202c8..3efd9424a5 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -351,7 +351,6 @@ tracing-switch-trace_events_hist.c-code-over-to-use-.patch tracing-hist-add-poll-pollin-support-on-hist-file.patch tracing-hist-support-pollpri-event-for-poll-on-histo.patch tracing-correct-the-refcount-if-the-hist-hist_debug-.patch -arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch cgroup-rstat-tracking-cgroup-level-niced-cpu-time.patch cgroup-rstat-fix-forceidle-time-in-cpu.stat.patch tty-serial-fsl_lpuart-use-u32-and-u8-for-register-va.patch diff --git a/queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch b/queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch deleted file mode 100644 index f92def8b0f..0000000000 --- a/queue-6.13/arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch +++ /dev/null @@ -1,91 +0,0 @@ -From e674bddb6329f27d249cf9b3bed6126fea405555 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 2 Mar 2025 19:48:04 +0100 -Subject: arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board - dtsi - -From: Dragan Simic - -[ Upstream commit ffcef3df680c437ca33ff434be18ec24d72907c2 ] - -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 -Cc: Peter Geis -Cc: Bjorn Helgaas -Reported-by: Diederik de Haas -Tested-by: Chris Vogel -Signed-off-by: Dragan Simic -Tested-by: Diederik de Haas -Link: https://lore.kernel.org/r/b39cfd7490d8194f053bf3971f13a43472d1769e.1740941097.git.dsimic@manjaro.org -Signed-off-by: Heiko Stuebner -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 47dc198706c85..51c6aa26d8285 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -673,6 +673,8 @@ &pcie0 { - 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"; --- -2.39.5 - diff --git a/queue-6.13/series b/queue-6.13/series index c2859f1b0d..2e3da0c2c5 100644 --- a/queue-6.13/series +++ b/queue-6.13/series @@ -414,7 +414,6 @@ tracing-switch-trace_events_hist.c-code-over-to-use-.patch tracing-hist-add-poll-pollin-support-on-hist-file.patch tracing-hist-support-pollpri-event-for-poll-on-histo.patch tracing-correct-the-refcount-if-the-hist-hist_debug-.patch -arm64-dts-rockchip-add-missing-pcie-supplies-to-rock.patch staging-gpib-replace-semaphore-with-completion-for-o.patch staging-gpib-modify-gpib_register_driver-to-return-e.patch staging-gpib-ni_usb-handle-gpib_register_driver-erro.patch -- 2.47.3