diff --git a/arm64-96boards-Rock960-CE-board-support.patch b/arm64-96boards-Rock960-CE-board-support.patch deleted file mode 100644 index 2d0186abb..000000000 --- a/arm64-96boards-Rock960-CE-board-support.patch +++ /dev/null @@ -1,139 +0,0 @@ -From patchwork Tue Oct 16 14:00:20 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Lezcano -X-Patchwork-Id: 1000432 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 41BB8C04EBD - for ; Tue, 16 Oct 2018 14:01:24 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 032862089E - for ; Tue, 16 Oct 2018 14:01:24 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org - header.b="OwrJnI6D" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 032862089E -Authentication-Results: mail.kernel.org; - dmarc=fail (p=none dis=none) header.from=linaro.org -Authentication-Results: mail.kernel.org; - spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727241AbeJPVv6 (ORCPT - ); - Tue, 16 Oct 2018 17:51:58 -0400 -Received: from mail-wr1-f68.google.com ([209.85.221.68]:43800 "EHLO - mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1727149AbeJPVv6 (ORCPT - ); - Tue, 16 Oct 2018 17:51:58 -0400 -Received: by mail-wr1-f68.google.com with SMTP id n1-v6so25672615wrt.10 - for ; - Tue, 16 Oct 2018 07:01:21 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=linaro.org; s=google; - h=from:to:cc:subject:date:message-id; - bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=; - b=OwrJnI6D/huHRM5jiagiGiKBxUHFUlMvwe1t2GexoIKOTqtFGY3vwPCkrAUWdnT5+f - n+wvqEq+enR14QpmLTY3VNYAsxMcDtJOZ2R2Cw0rRdiHypMeUGRanfszUimV9omTlSGH - ApMgMERT+Pim+X1tp/uH775sDaVLHsJDyJb2Y= -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=; - b=DO/kT4iXCQgCsPC53FV7CMKKHaDQNQtZUIfHfJGQ2iRgCRNsZSYU6JYHxxjsqWSLyq - c46PNGLDG4qPZf/tveVt9wc9SPdKTk3klyT5NnQvdlNY8uv5/GTXINOWmNE0xD9hqvaP - ml6yJRUA51/KJU73p7XhGvWlMmEuStLUtXa4rlqKgush6lllYhSFpca2xkiKFhqcd+Bc - HHXRh2i0OVgTdmdb0+lSKyLXm74UHrhv1WEbgjGm+Mharwz/qsidTCXfqKPC7izgstBS - L+mjOACqna60eEsABW/p2nH9vxXAsU2ArAnmB714yeh9uckl1uRzYmMQCSD1LmmBN0q4 - 4UvQ== -X-Gm-Message-State: ABuFfojBZLkXjdlBc4AIjobar5Yk+68lR2+TEpPVGjsScLNzcmIj5eYO - yyEhPWYj3vc1MHjUcMfQLt7ahg== -X-Google-Smtp-Source: - ACcGV614RNSZy+OjIvsEaE9ONlZaDAeI1a8EpD+wP5Gt58g75Bh8DJgL6KJJ2ZjTenoZPwHLydiQBg== -X-Received: by 2002:adf:cd0c:: with SMTP id - w12-v6mr19534363wrm.67.1539698480294; - Tue, 16 Oct 2018 07:01:20 -0700 (PDT) -Received: from localhost.localdomain (221.56.88.92.rev.sfr.net. - [92.88.56.221]) - by smtp.gmail.com with ESMTPSA id - b81-v6sm10195012wmh.47.2018.10.16.07.01.18 - (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); - Tue, 16 Oct 2018 07:01:19 -0700 (PDT) -From: Daniel Lezcano -To: heiko@sntech.de -Cc: linux-kernel@vger.kernel.org, Rob Herring , - Mark Rutland , - Vicente Bergas , - Shawn Lin , - Ezequiel Garcia , - Enric Balletbo i Serra , - Manivannan Sadhasivam , - devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED - DEVICE TREE BINDINGS), - linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC - support), - linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC - support) -Subject: [PATCH] DT: rockchip: Fix stability issues with the 'performance' - governor on rock960 -Date: Tue, 16 Oct 2018 16:00:20 +0200 -Message-Id: <1539698431-12616-1-git-send-email-daniel.lezcano@linaro.org> -X-Mailer: git-send-email 2.7.4 -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -When the performance governor is set as default, the rock960 hangs -around one minute after booting, whatever the activity is (idle, key -pressed, loaded, ...). - -Based on the commit log found at https://patchwork.kernel.org/patch/10092377/ - -"vdd_log has no consumer and therefore will not be set to a specific -voltage. Still the PWM output pin gets configured and thence the vdd_log -output voltage will changed from it's default. Depending on the idle -state of the PWM this will slightly over or undervoltage the logic supply -of the RK3399 and cause instability with GbE (undervoltage) and PCIe -(overvoltage). Since the default value set by a voltage divider is the -correct supply voltage and we don't need to change it during runtime we -remove the rail from the devicetree completely so the PWM pin will not -be configured." - -After removing the vdd-log from the rock960's specific DT, the board -does no longer hang and shows a stable behavior. - -Apply the same change for the rock960 by removing the vdd-log from the -DT. - -Signed-off-by: Daniel Lezcano -Tested-by: Manivannan Sadhasivam ---- - arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -index 6c8c4ab..56abbb0 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -@@ -57,18 +57,6 @@ - regulator-always-on; - vin-supply = <&vcc_sys>; - }; -- -- vdd_log: vdd-log { -- compatible = "pwm-regulator"; -- pwms = <&pwm2 0 25000 0>; -- regulator-name = "vdd_log"; -- regulator-min-microvolt = <800000>; -- regulator-max-microvolt = <1400000>; -- regulator-always-on; -- regulator-boot-on; -- vin-supply = <&vcc_sys>; -- }; -- - }; - - &cpu_l0 { diff --git a/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED b/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED new file mode 100644 index 000000000..d45ac4831 --- /dev/null +++ b/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED @@ -0,0 +1 @@ +# CONFIG_PSI_DEFAULT_DISABLED is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 new file mode 100644 index 000000000..e35f85669 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 @@ -0,0 +1 @@ +CONFIG_ARM64_ERRATUM_1286807=y diff --git a/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC new file mode 100644 index 000000000..e109ab25a --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC @@ -0,0 +1 @@ +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y diff --git a/gitrev b/gitrev index 641166a04..656d96f33 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -94f371cb73944b410a269d570d6946c042f2ddd0 +2595646791c319cadfdbf271563aac97d0843dc7 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 40cc994dd..b1aa5358f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -283,6 +283,7 @@ CONFIG_ARM64_CNP=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y +CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -4514,6 +4515,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index e259613bf..0dfb2f643 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -283,6 +283,7 @@ CONFIG_ARM64_CNP=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y +CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -4492,6 +4493,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 350c47bc0..319083f92 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4763,6 +4763,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index df25b876d..4a4072856 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4528,6 +4528,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2f6851f35..b6f491343 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4507,6 +4507,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 955ab0ef8..6356fb84a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4742,6 +4742,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 2bb47f1ef..cb9403d42 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4289,6 +4289,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-i686.config b/kernel-i686.config index 677b3797d..396b55931 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4268,6 +4268,7 @@ CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index dacbfb3e0..f4fcec154 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4037,6 +4037,7 @@ CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 960d1b2af..d4a7c8633 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4014,6 +4014,7 @@ CONFIG_PROFILING=y CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d9f1f07e3..38bc24f3a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3925,6 +3925,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-s390x.config b/kernel-s390x.config index b5f547050..b0d0fbc99 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3902,6 +3902,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 6f5da3409..d6130d162 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4324,6 +4324,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ba227ef3f..7e04bf109 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4303,6 +4303,7 @@ CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel.spec b/kernel.spec index c4d1bbfa4..65ce830a8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 4 +%global rcrev 5 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -577,8 +577,6 @@ Patch305: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861 Patch306: arm-sdhci-esdhc-imx-fixes.patch -Patch307: arm64-96boards-Rock960-CE-board-support.patch - Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch @@ -1883,6 +1881,9 @@ fi # # %changelog +* Mon Dec 03 2018 Justin M. Forbes - 4.20.0-0.rc5.git0.1 +- Linux v4.20-rc5 + * Mon Dec 03 2018 Justin M. Forbes - Disable debugging options. diff --git a/sources b/sources index 870a2fbab..51aee29ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -SHA512 (patch-4.20-rc4.xz) = 6cd5063110b286fa61f0d96ca675d5235debe7ac9e21ce2d709bdb299af897448048650e7d5497b9b2de474c42b120f89ed6cc5b5d38f71762263ad5a8ee9999 -SHA512 (patch-4.20-rc4-git2.xz) = 99b2e09f1378a48431faf341c3dbdb1d39c6799c7edef8bf89904ad8fceb845676f3d2404f0be26148124ca86e9755dd572c67452ab53a1d49a8bae043a3c419 +SHA512 (patch-4.20-rc5.xz) = 389daea25e1a19050fa2e7f4eb7cc8e462a83560a06b43b5bd8458bfcf3754c987660c2b42f9adeacd956342f4520c45d2982fbee4cfd2b8825f9153db06aaa9