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

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

Merge "defconfig: arm64: msm: Enable MSM_DEBUG_LAR_UNLOCK for msm8937"

parents 5d34a129 d02451ee

arch/arm/configs/vendor/msm8937_32go_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ CONFIG_MSM_SPM=y 
CONFIG_MSM_L2_SPM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMSM=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm/configs/vendor/msm8937_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ CONFIG_MSM_SPM=y 
CONFIG_MSM_L2_SPM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMSM=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm64/configs/vendor/msm8937_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ CONFIG_MSM_SPM=y 
CONFIG_MSM_L2_SPM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMSM=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

drivers/soc/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -315,6 +315,15 @@ config QCOM_MEMORY_DUMP_V2 
	  of deadlocks or cpu hangs these dump regions are captured to

	  give a snapshot of the system at the time of the crash.



config MSM_DEBUG_LAR_UNLOCK

	bool "MSM Debug LAR Unlock Support"

	depends on QCOM_MEMORY_DUMP_V2

	help

	  This allows unlocking Core Debug lock to allow capture

	  of upper 32 bits of program counter at the time of

	  system crash. This is useful in getting correct crash

	  location.



config QCOM_SMEM_STATE

	bool

drivers/soc/qcom/memory_dump_v2.c

+2 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2014-2017, 2019-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2017, 2019-2021, The Linux Foundation. All rights reserved.

 */



#include <asm/cacheflush.h>
@@ -755,13 +755,8 @@ static int init_memory_dump(void *dump_vaddr, phys_addr_t phys_addr, 
static int __init init_debug_lar_unlock(void)

{

	int ret;

	uint32_t argument = 0;

	struct scm_desc desc = {0};



	if (!is_scm_armv8())

		ret = scm_call(SCM_SVC_TZ, SCM_CMD_DEBUG_LAR_UNLOCK, &argument,

			       sizeof(argument), NULL, 0);

	else

	ret = scm_call2(SCM_SIP_FNID(SCM_SVC_TZ,

				SCM_CMD_DEBUG_LAR_UNLOCK), &desc);

	if (ret)