From 2e8001a096bda2eedaa21dd8dfd97c38c3ca1066 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Tue, 22 Nov 2022 20:26:24 -0800 Subject: [PATCH 1/2] defconfig: pineapple-gki: Enable watchdog and related configs Enable watchdog and related configs for pineapple SoC. Change-Id: Iba6e12856f4c201a3f64a6773266c42645a58fb9 Signed-off-by: Guru Das Srinagesh --- arch/arm64/configs/vendor/pineapple_GKI.config | 11 +++++++++++ modules.list.msm.pineapple | 2 ++ 2 files changed, 13 insertions(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index b97aca2fd5cd..e84667952820 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -32,6 +32,7 @@ CONFIG_GH_PROXY_SCHED=m CONFIG_GH_RM_DRV=m CONFIG_GH_SECURE_VM_LOADER=m CONFIG_GH_TLMM_VM_MEM_ACCESS=m +CONFIG_GH_VIRT_WATCHDOG=m CONFIG_GUNYAH=m CONFIG_GUNYAH_DRIVERS=y CONFIG_HVC_GUNYAH=m @@ -102,11 +103,13 @@ CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y CONFIG_QCOM_DMABUF_HEAPS_UBWCP=y CONFIG_QCOM_EUD=m +CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y CONFIG_QCOM_GDSC_REGULATOR=m CONFIG_QCOM_IOMMU_DEBUG=m CONFIG_QCOM_IOMMU_UTIL=m # CONFIG_QCOM_IPA is not set CONFIG_QCOM_IPCC=m +CONFIG_QCOM_IRQ_STAT=y CONFIG_QCOM_LAZY_MAPPING=m CONFIG_QCOM_LLCC=m CONFIG_QCOM_LLCC_PERFMON=m @@ -148,14 +151,22 @@ CONFIG_QCOM_SMP2P=m CONFIG_QCOM_SMP2P_SLEEPSTATE=m # CONFIG_QCOM_SMSM is not set CONFIG_QCOM_SOCINFO=m +# CONFIG_QCOM_SOC_WATCHDOG is not set CONFIG_QCOM_SPMI_ADC5_GEN3=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_SPSS=m CONFIG_QCOM_STATS=m CONFIG_QCOM_TSENS=m CONFIG_QCOM_VADC_COMMON=m +CONFIG_QCOM_WATCHDOG_BARK_TIME=11000 +CONFIG_QCOM_WATCHDOG_IPI_PING=y +CONFIG_QCOM_WATCHDOG_PET_TIME=9360 +# CONFIG_QCOM_WATCHDOG_USERSPACE_PET is not set +CONFIG_QCOM_WATCHDOG_WAKEUP_ENABLE=y CONFIG_QCOM_WCD_USBSS_I2C=m # CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_QCOM_WDOG_BITE_EARLY_PANIC is not set +CONFIG_QCOM_WDT_CORE=m CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QTI_ALTMODE_GLINK=m diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple index 9c5e8e23b410..0151f02b8a4f 100644 --- a/modules.list.msm.pineapple +++ b/modules.list.msm.pineapple @@ -1,3 +1,5 @@ +qcom_wdt_core.ko +gh_virt_wdt.ko cmd-db.ko qcom_rpmh.ko qcom-pdc.ko From 0e406ae43564428e98e7c3f43c8769248fc756e5 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Tue, 22 Nov 2022 20:27:28 -0800 Subject: [PATCH 2/2] defconfig: pineapple-gki: Enable download mode driver Enable the download mode driver and turn on the default flag to enable dump collection in case of panic or error conditions. Change-Id: I7d8f5ec0269062bb1875f2212f9252cc24dd2e4c Signed-off-by: Guru Das Srinagesh --- arch/arm64/configs/vendor/pineapple_GKI.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config index e84667952820..c09330a81b5d 100644 --- a/arch/arm64/configs/vendor/pineapple_GKI.config +++ b/arch/arm64/configs/vendor/pineapple_GKI.config @@ -80,6 +80,8 @@ CONFIG_PINCTRL_MSM=m CONFIG_PINCTRL_PINEAPPLE=m CONFIG_PINCTRL_QCOM_SPMI_PMIC=m # CONFIG_PM8916_WATCHDOG is not set +CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE=m +CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE_DEFAULT=y CONFIG_POWER_RESET_QCOM_PON=m CONFIG_POWER_RESET_QCOM_REBOOT_REASON=m CONFIG_PWM_QTI_LPG=m