Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d12142b8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Kconfig: Fix the dependencies for minidump"

parents 48d15fcc 7025db06

arch/arm64/configs/vendor/lahaina_GKI.config

+0 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,6 @@ CONFIG_MSM_BT_POWER=m 
CONFIG_ARM_SMMU=m

CONFIG_ARM_SMMU=m

CONFIG_MSM_CLK_AOP_QMP=m

CONFIG_MSM_CLK_AOP_QMP=m

CONFIG_MSM_SPSS_UTILS=m

CONFIG_MSM_SPSS_UTILS=m

CONFIG_QCOM_MINIDUMP=m

CONFIG_IPA3=m

CONFIG_IPA3=m

CONFIG_IPA_WDI_UNIFIED_API=y

CONFIG_IPA_WDI_UNIFIED_API=y

CONFIG_CNSS2=m

CONFIG_CNSS2=m

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ CONFIG_MSM_QBT_HANDLER=y 
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y

CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_QCOM_MINIDUMP=y

CONFIG_QCOM_MEM_OFFLINE=y

CONFIG_QCOM_MEM_OFFLINE=y

CONFIG_OVERRIDE_MEMORY_LIMIT=y

CONFIG_OVERRIDE_MEMORY_LIMIT=y

CONFIG_QCOM_MEM_BUF=y

CONFIG_QCOM_MEM_BUF=y

drivers/power/reset/msm-poweroff.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define SCM_DLOAD_FULLDUMP		QCOM_DOWNLOAD_FULLDUMP

#define SCM_DLOAD_FULLDUMP		QCOM_DOWNLOAD_FULLDUMP

#define SCM_EDLOAD_MODE			QCOM_DOWNLOAD_EDL

#define SCM_EDLOAD_MODE			QCOM_DOWNLOAD_EDL

#define SCM_DLOAD_MINIDUMP		QCOM_DOWNLOAD_MINIDUMP

#define SCM_DLOAD_MINIDUMP		QCOM_DOWNLOAD_MINIDUMP

#define SCM_DLOAD_BOTHDUMPS		QCOM_DOWNLOAD_BOTHDUMP

#define SCM_DLOAD_BOTHDUMPS	(SCM_DLOAD_FULLDUMP | SCM_DLOAD_MINIDUMP)





#define DL_MODE_PROP "qcom,msm-imem-download_mode"

#define DL_MODE_PROP "qcom,msm-imem-download_mode"

#define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"

#define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"

drivers/soc/qcom/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -449,7 +449,7 @@ config QCOM_DCC_V2 




config QCOM_MINIDUMP

config QCOM_MINIDUMP

	tristate "QCOM Minidump Support"

	tristate "QCOM Minidump Support"

	depends on QCOM_SMEM && POWER_RESET_QCOM

	depends on QCOM_SMEM && POWER_RESET_MSM

	help

	help

	  This enables minidump feature. It allows various clients to

	  This enables minidump feature. It allows various clients to

	  register to dump their state at system bad state (panic/WDT,etc.,).

	  register to dump their state at system bad state (panic/WDT,etc.,).

include/linux/qcom_scm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ enum qcom_download_mode { 
	QCOM_DOWNLOAD_NODUMP	= 0x00,

	QCOM_DOWNLOAD_NODUMP	= 0x00,

	QCOM_DOWNLOAD_EDL	= 0x01,

	QCOM_DOWNLOAD_EDL	= 0x01,

	QCOM_DOWNLOAD_FULLDUMP	= 0x10,

	QCOM_DOWNLOAD_FULLDUMP	= 0x10,

	QCOM_DOWNLOAD_MINIDUMP	= 0x20,

};

};





struct qcom_scm_hdcp_req {

struct qcom_scm_hdcp_req {