From: Greg Kroah-Hartman Date: Mon, 10 Feb 2020 12:32:39 +0000 (-0800) Subject: drop queue-4.4/clk-tegra-mark-fuse-clock-as-critical.patch X-Git-Tag: v4.19.103~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fbe5983b3bf665f77c4e5bc2d7a4bcdf6708d20;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/clk-tegra-mark-fuse-clock-as-critical.patch --- diff --git a/queue-4.4/clk-tegra-mark-fuse-clock-as-critical.patch b/queue-4.4/clk-tegra-mark-fuse-clock-as-critical.patch deleted file mode 100644 index cb1d2aec7e4..00000000000 --- a/queue-4.4/clk-tegra-mark-fuse-clock-as-critical.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bf83b96f87ae2abb1e535306ea53608e8de5dfbb Mon Sep 17 00:00:00 2001 -From: Stephen Warren -Date: Thu, 3 Oct 2019 14:50:30 -0600 -Subject: clk: tegra: Mark fuse clock as critical - -From: Stephen Warren - -commit bf83b96f87ae2abb1e535306ea53608e8de5dfbb upstream. - -For a little over a year, U-Boot on Tegra124 has configured the flow -controller to perform automatic RAM re-repair on off->on power -transitions of the CPU rail[1]. This is mandatory for correct operation -of Tegra124. However, RAM re-repair relies on certain clocks, which the -kernel must enable and leave running. The fuse clock is one of those -clocks. Mark this clock as critical so that LP1 power mode (system -suspend) operates correctly. - -[1] 3cc7942a4ae5 ARM: tegra: implement RAM repair - -Reported-by: Jonathan Hunter -Cc: stable@vger.kernel.org -Signed-off-by: Stephen Warren -Signed-off-by: Thierry Reding -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clk/tegra/clk-tegra-periph.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/clk/tegra/clk-tegra-periph.c -+++ b/drivers/clk/tegra/clk-tegra-periph.c -@@ -516,7 +516,11 @@ static struct tegra_periph_init_data gat - GATE("vcp", "clk_m", 29, 0, tegra_clk_vcp, 0), - GATE("apbdma", "clk_m", 34, 0, tegra_clk_apbdma, 0), - GATE("kbc", "clk_32k", 36, TEGRA_PERIPH_ON_APB | TEGRA_PERIPH_NO_RESET, tegra_clk_kbc, 0), -- GATE("fuse", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse, 0), -+ /* -+ * Critical for RAM re-repair operation, which must occur on resume -+ * from LP1 system suspend and as part of CCPLEX cluster switching. -+ */ -+ GATE("fuse", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse, CLK_IS_CRITICAL), - GATE("fuse_burn", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse_burn, 0), - GATE("kfuse", "clk_m", 40, TEGRA_PERIPH_ON_APB, tegra_clk_kfuse, 0), - GATE("apbif", "clk_m", 107, TEGRA_PERIPH_ON_APB, tegra_clk_apbif, 0), diff --git a/queue-4.4/series b/queue-4.4/series index 8123f495792..3962c7f3d7c 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -44,7 +44,6 @@ kvm-x86-protect-msr-based-index-computations-in-fixed_msr_to_seg_unit-from-spect kvm-ppc-book3s-hv-uninit-vcpu-if-vcore-creation-fails.patch kvm-ppc-book3s-pr-free-shared-page-if-mmu-initialization-fails.patch kvm-x86-free-wbinvd_dirty_mask-if-vcpu-creation-fails.patch -clk-tegra-mark-fuse-clock-as-critical.patch scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch scsi-csiostor-adjust-indentation-in-csio_device_reset.patch scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch