Merge "defconfig: Enable mem_dump driver on gki build for lahaina" (672df0d1) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm64/configs/vendor/lahaina_GKI.config

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ CONFIG_QCOM_LAHAINA_LLCC=m
		CONFIG_QCOM_IPCC=m
		CONFIG_QCOM_WATCHDOG=m
		CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
		CONFIG_QCOM_MEMORY_DUMP_V2=m
		CONFIG_QCOM_SCM=m
		CONFIG_QTEE_SHM_BRIDGE=y
		# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set

+0 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ CONFIG_ARM_QCOM_DEVFREQ_QOSLAT=y
		CONFIG_QCOM_LLCC_PMU=y
		CONFIG_QCOM_GUESTVM=y
		CONFIG_QTI_TZ_LOG=y
		CONFIG_QCOM_MEMORY_DUMP_V2=y
		CONFIG_MSM_REMOTEQDSS=y
		CONFIG_QCOM_DCC_V2=y
		CONFIG_CLD_LL_CORE=y

+1 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@ config QCOM_SMD_RPM
		module. This will build a module called "qcom-smd-rpm".

		config QCOM_MEMORY_DUMP_V2
		bool "QCOM Memory Dump V2 Support"
		tristate "QCOM Memory Dump V2 Support"
		help
		This enables memory dump feature. It allows various client
		subsystems to register respective dump regions. At the time

+3 −5

Original line number	Diff line number	Diff line
		@@ -892,9 +892,7 @@ static struct platform_driver mem_dump_driver = {
		},
		};

		static int __init mem_dump_init(void)
		{
		return platform_driver_register(&mem_dump_driver);
		}
		module_platform_driver(mem_dump_driver);

		pure_initcall(mem_dump_init);
		MODULE_DESCRIPTION("Memory Dump V2 Driver");
		MODULE_LICENSE("GPL v2");

+3 −3

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2012, 2014-2017, 2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012, 2014-2017, 2020, The Linux Foundation. All rights reserved.
		*/

		#ifndef __MSM_MEMORY_DUMP_H
		@@ -42,7 +42,7 @@ static inline int msm_dump_tbl_register(struct msm_client_dump *entry)
		#endif


		#if defined(CONFIG_QCOM_MEMORY_DUMP) \|\| defined(CONFIG_QCOM_MEMORY_DUMP_V2)
		#if IS_ENABLED(CONFIG_QCOM_MEMORY_DUMP_V2)
		extern uint32_t msm_dump_table_version(void);
		#else
		static inline uint32_t msm_dump_table_version(void)
		@@ -114,7 +114,7 @@ struct msm_dump_entry {
		uint64_t addr;
		};

		#ifdef CONFIG_QCOM_MEMORY_DUMP_V2
		#if IS_ENABLED(CONFIG_QCOM_MEMORY_DUMP_V2)
		extern int msm_dump_data_register(enum msm_dump_table_ids id,
		struct msm_dump_entry *entry);
		extern int msm_dump_data_register_nominidump(enum msm_dump_table_ids id,