From patchwork Tue Mar 2 11:22:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 1445976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DqZYk6Kyvz9sVt; Tue, 2 Mar 2021 22:25:30 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lH39c-0000la-6o; Tue, 02 Mar 2021 11:25:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH39a-0000lU-KZ for kernel-team@lists.ubuntu.com; Tue, 02 Mar 2021 11:25:26 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH37D-0000rO-TH; Tue, 02 Mar 2021 11:22:59 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][SRU][HIRSUTE][RISCV] Revert "SiFive Unleashed CPUFreq" Date: Tue, 2 Mar 2021 11:22:57 +0000 Message-Id: <20210302112258.4909-2-colin.king@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210302112258.4909-1-colin.king@canonical.com> References: <20210302112258.4909-1-colin.king@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Colin Ian King The SiFive Unleashed CPU frequency is known to be unreliabe especially when using the latest device tree and the default Ubuntu CPU frequency schedule settings. Revert the CPU Frequency commit for now until we get a suitable upstream fix that works more reliably with our default Ubuntu configs. BugLink: https://bugs.launchpad.net/bugs/1917433 This reverts commit 3949df6ecdca04339bc8a3925c2ba7f881cf82b1. --- arch/riscv/Kconfig | 8 ----- arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 5 --- .../boot/dts/sifive/hifive-unleashed-a00.dts | 34 ------------------- arch/riscv/configs/defconfig | 5 --- 4 files changed, 52 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index b0a7a37b2ae1..3230c1d48562 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -396,14 +396,6 @@ config BUILTIN_DTB depends on RISCV_M_MODE depends on OF -menu "CPU Power Management" - -source "drivers/cpuidle/Kconfig" - -source "drivers/cpufreq/Kconfig" - -endmenu - menu "Power management options" source "kernel/power/Kconfig" diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi index 023a8fd14cf6..7db861053483 100644 --- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi +++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi @@ -30,7 +30,6 @@ cpu0: cpu@0 { i-cache-size = <16384>; reg = <0>; riscv,isa = "rv64imac"; - clocks = <&prci PRCI_CLK_COREPLL>; status = "disabled"; cpu0_intc: interrupt-controller { #interrupt-cells = <1>; @@ -55,7 +54,6 @@ cpu1: cpu@1 { reg = <1>; riscv,isa = "rv64imafdc"; tlb-split; - clocks = <&prci PRCI_CLK_COREPLL>; next-level-cache = <&l2cache>; cpu1_intc: interrupt-controller { #interrupt-cells = <1>; @@ -80,7 +78,6 @@ cpu2: cpu@2 { reg = <2>; riscv,isa = "rv64imafdc"; tlb-split; - clocks = <&prci PRCI_CLK_COREPLL>; next-level-cache = <&l2cache>; cpu2_intc: interrupt-controller { #interrupt-cells = <1>; @@ -105,7 +102,6 @@ cpu3: cpu@3 { reg = <3>; riscv,isa = "rv64imafdc"; tlb-split; - clocks = <&prci PRCI_CLK_COREPLL>; next-level-cache = <&l2cache>; cpu3_intc: interrupt-controller { #interrupt-cells = <1>; @@ -130,7 +126,6 @@ cpu4: cpu@4 { reg = <4>; riscv,isa = "rv64imafdc"; tlb-split; - clocks = <&prci PRCI_CLK_COREPLL>; next-level-cache = <&l2cache>; cpu4_intc: interrupt-controller { #interrupt-cells = <1>; diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts index c8a47bf32f04..9bafe4673cca 100644 --- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts +++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts @@ -78,40 +78,6 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; - - fu540_c000_opp_table: opp-table { - compatible = "operating-points-v2"; - opp-shared; - - opp-350000000 { - opp-hz = /bits/ 64 <350000000>; - }; - opp-700000000 { - opp-hz = /bits/ 64 <700000000>; - }; - opp-999999999 { - opp-hz = /bits/ 64 <999999999>; - }; - opp-1400000000 { - opp-hz = /bits/ 64 <1400000000>; - }; - }; -}; - -&cpu0 { - operating-points-v2 = <&fu540_c000_opp_table>; -}; -&cpu1 { - operating-points-v2 = <&fu540_c000_opp_table>; -}; -&cpu2 { - operating-points-v2 = <&fu540_c000_opp_table>; -}; -&cpu3 { - operating-points-v2 = <&fu540_c000_opp_table>; -}; -&cpu4 { - operating-points-v2 = <&fu540_c000_opp_table>; }; &uart0 { diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 58f4bce82d91..4da4886246a4 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -17,11 +17,6 @@ CONFIG_BPF_SYSCALL=y CONFIG_SOC_SIFIVE=y CONFIG_SOC_VIRT=y CONFIG_SMP=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPUFREQ_DT=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_NET=y From patchwork Tue Mar 2 11:22:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 1445975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DqZXD4qcjz9sWH; Tue, 2 Mar 2021 22:24:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lH38L-0000gI-Ps; Tue, 02 Mar 2021 11:24:09 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH38J-0000gB-KR for kernel-team@lists.ubuntu.com; Tue, 02 Mar 2021 11:24:07 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lH37E-0000rV-BT; Tue, 02 Mar 2021 11:23:00 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][SRU][HIRSUTE][RISCV] UBUNTU: [Config] Update annotations for CPUFreq revert Date: Tue, 2 Mar 2021 11:22:58 +0000 Message-Id: <20210302112258.4909-3-colin.king@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210302112258.4909-1-colin.king@canonical.com> References: <20210302112258.4909-1-colin.king@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Colin Ian King BugLink: https://bugs.launchpad.net/bugs/1917433 Disabling CPU frequency scaling requires diabling CONFIG_UCLAMP_TASK Signed-off-by: Colin Ian King --- debian.riscv-21.04/config/annotations | 3 ++- debian.riscv/config/annotations | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian.riscv-21.04/config/annotations b/debian.riscv-21.04/config/annotations index ba53fc4e0189..a9dc2288c7dc 100644 --- a/debian.riscv-21.04/config/annotations +++ b/debian.riscv-21.04/config/annotations @@ -7665,8 +7665,9 @@ CONFIG_RCU_EXPERT flag # Menu: General setup >> Scheduler features # -CONFIG_UCLAMP_TASK policy<{'riscv64': 'n'}> +CONFIG_UCLAMP_TASK policy<{'riscv64': '-'}> CONFIG_UCLAMP_TASK flag +CONFIG_UCLAMP_TASK mark # Menu: General setup >> Timers subsystem CONFIG_NO_HZ policy<{'riscv64': 'y'}> diff --git a/debian.riscv/config/annotations b/debian.riscv/config/annotations index 5c7d04559b34..4c36c312eaec 100644 --- a/debian.riscv/config/annotations +++ b/debian.riscv/config/annotations @@ -7665,8 +7665,9 @@ CONFIG_RCU_EXPERT flag # Menu: General setup >> Scheduler features # -CONFIG_UCLAMP_TASK policy<{'riscv64': 'n'}> +CONFIG_UCLAMP_TASK policy<{'riscv64': '-'}> CONFIG_UCLAMP_TASK flag +CONFIG_UCLAMP_TASK mark # Menu: General setup >> Timers subsystem CONFIG_NO_HZ policy<{'riscv64': 'y'}>