From 9b562c47f2730fb363e07674b2a5b1a4018cabcd Mon Sep 17 00:00:00 2001 From: Lech Betlej Date: Thu, 26 Mar 2020 15:54:36 +0100 Subject: [PATCH 1/2] cavs: set HP ring oscillator clock as a default The change is provided to address issues reported by users who try to execute workloads that exceed computing capacity provided by LP RO clock. On the other hand motivation to have a canary settings to check FW pipelines utilization is diminished as infrastructure improvements to measure compute utilization per component are introduced. Signed-off-by: Lech Betlej --- src/arch/xtensa/configs/cannonlake_defconfig | 2 -- src/arch/xtensa/configs/icelake_defconfig | 1 - src/arch/xtensa/configs/tigerlake_defconfig | 1 - src/platform/Kconfig | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/arch/xtensa/configs/cannonlake_defconfig b/src/arch/xtensa/configs/cannonlake_defconfig index 60b02f93fc93..f9154d8b746e 100644 --- a/src/arch/xtensa/configs/cannonlake_defconfig +++ b/src/arch/xtensa/configs/cannonlake_defconfig @@ -2,8 +2,6 @@ CONFIG_CANNONLAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPS=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=47 diff --git a/src/arch/xtensa/configs/icelake_defconfig b/src/arch/xtensa/configs/icelake_defconfig index 160a542b405a..53ac339451c4 100644 --- a/src/arch/xtensa/configs/icelake_defconfig +++ b/src/arch/xtensa/configs/icelake_defconfig @@ -2,7 +2,6 @@ CONFIG_ICELAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=47 diff --git a/src/arch/xtensa/configs/tigerlake_defconfig b/src/arch/xtensa/configs/tigerlake_defconfig index aabcfca06988..18e9e22d9228 100644 --- a/src/arch/xtensa/configs/tigerlake_defconfig +++ b/src/arch/xtensa/configs/tigerlake_defconfig @@ -2,7 +2,6 @@ CONFIG_TIGERLAKE=y CONFIG_CAVS_DMIC=y CONFIG_CAVS_SSP=y CONFIG_CAVS_ALH=y -CONFIG_CAVS_LPRO=y CONFIG_CORE_COUNT=4 CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=46 diff --git a/src/platform/Kconfig b/src/platform/Kconfig index 0e6c67980cb8..d150d590edbb 100644 --- a/src/platform/Kconfig +++ b/src/platform/Kconfig @@ -260,6 +260,7 @@ config CONFIG_CHERRYTRAIL_EXTRA_DW_DMA config CAVS_LPRO bool "Enable low power ring oscillator as the default clock" + default n depends on CAVS && !CAVS_VERSION_1_5 help Select if you want to use 120MHz LPRO as the DSP clock source. From 15b246e009e5ceb8c59c36ff2209c88b55f21036 Mon Sep 17 00:00:00 2001 From: Lech Betlej Date: Thu, 26 Mar 2020 17:12:34 +0100 Subject: [PATCH 2/2] cavs: add configuration presets for Chrome based products As the number of configuration options is increased there is a need to clearly specify presets that reflect features options. Specifically the change adds option to enable Low Power Sequencer (LPS) and Low Power Ring oscillator together. The approach is based on keeping generic configuration in configs directory while the override directory contains only incremental delta information. The compilation flow assumes using make overrideconfig command. In example: make cannonlake_defconfig cp ../src/arch/xtensa/configs/override/cannonlake_chrome.config override.config make overrideconfig make bin Signed-off-by: Lech Betlej --- src/arch/xtensa/configs/override/cannonlake_chrome.config | 2 ++ src/arch/xtensa/configs/override/jasperlake_chrome.config | 2 ++ src/arch/xtensa/configs/override/tigerlake_chrome.config | 1 + 3 files changed, 5 insertions(+) create mode 100644 src/arch/xtensa/configs/override/cannonlake_chrome.config create mode 100644 src/arch/xtensa/configs/override/jasperlake_chrome.config create mode 100644 src/arch/xtensa/configs/override/tigerlake_chrome.config diff --git a/src/arch/xtensa/configs/override/cannonlake_chrome.config b/src/arch/xtensa/configs/override/cannonlake_chrome.config new file mode 100644 index 000000000000..3ac57df516da --- /dev/null +++ b/src/arch/xtensa/configs/override/cannonlake_chrome.config @@ -0,0 +1,2 @@ +CONFIG_CAVS_LPS=y +CONFIG_CAVS_LPRO=y diff --git a/src/arch/xtensa/configs/override/jasperlake_chrome.config b/src/arch/xtensa/configs/override/jasperlake_chrome.config new file mode 100644 index 000000000000..3ac57df516da --- /dev/null +++ b/src/arch/xtensa/configs/override/jasperlake_chrome.config @@ -0,0 +1,2 @@ +CONFIG_CAVS_LPS=y +CONFIG_CAVS_LPRO=y diff --git a/src/arch/xtensa/configs/override/tigerlake_chrome.config b/src/arch/xtensa/configs/override/tigerlake_chrome.config new file mode 100644 index 000000000000..79cee681a82b --- /dev/null +++ b/src/arch/xtensa/configs/override/tigerlake_chrome.config @@ -0,0 +1 @@ +CONFIG_CAVS_LPS=y