From f1fde87a315c78541654653e232b8bac1b6a4e09 Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Mon, 28 Sep 2020 15:05:05 -0700 Subject: [PATCH] arm64: defconfig: Disable LOCKUP_DETECTOR for lahaina QGKI Disable LOCKUP_DETECTOR and DETECT_HUNG_TASK configs flags for QGKI config fragment to avoid the power regressions and keep these features enabled in consolidate config fragment. Change-Id: I847726454614b55447a8d9a226ac38a68d5a369b Signed-off-by: Prasad Sodagudi Signed-off-by: Raghavendra Rao Ananta --- arch/arm64/configs/vendor/lahaina_QGKI.config | 2 ++ arch/arm64/configs/vendor/lahaina_consolidate.config | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index 935113e43628..4484cc8cfac9 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -14,6 +14,8 @@ CONFIG_IOMMU_IO_PGTABLE_FAST=y CONFIG_IOMMU_DYNAMIC_DOMAINS=y # CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST is not set # CONFIG_IOMMU_IO_PGTABLE_FAST_PROVE_TLB is not set +# CONFIG_SOFTLOCKUP_DETECTOR is not set +# CONFIG_DETECT_HUNG_TASK is not set CONFIG_RCU_EXPERT=y CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_NOCB_CPU=y diff --git a/arch/arm64/configs/vendor/lahaina_consolidate.config b/arch/arm64/configs/vendor/lahaina_consolidate.config index dfc679287b80..f78eeb8e44ab 100644 --- a/arch/arm64/configs/vendor/lahaina_consolidate.config +++ b/arch/arm64/configs/vendor/lahaina_consolidate.config @@ -13,6 +13,7 @@ CONFIG_PAGE_OWNER=y CONFIG_PAGE_OWNER_ENABLE_DEFAULT=y CONFIG_PAGE_EXTENSION_PAGE_FREE=y CONFIG_PSI_FTRACE=y +CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_DEBUG_DMA_BUF_REF is not set CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y CONFIG_QMP_DEBUGFS_CLIENT=y