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

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

Merge "defconfig: enable memory dump for bengal 32bit"

parents 33f56542 9ae367c7

arch/arm/configs/vendor/bengal-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -529,6 +529,7 @@ CONFIG_QCOM_QMI_HELPERS=y 
CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMP2P=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

arch/arm/configs/vendor/bengal_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -533,6 +533,7 @@ CONFIG_QCOM_QMI_HELPERS=y 
CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_SMP2P=y

CONFIG_QCOM_SMP2P=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000

drivers/soc/qcom/memory_dump_v2.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -478,7 +478,7 @@ static struct msm_dump_table *msm_dump_get_table(enum msm_dump_table_ids id) 
{

{

	struct msm_dump_table *table = memdump.table;

	struct msm_dump_table *table = memdump.table;

	int i;

	int i;



	unsigned long offset;

	if (!table) {

	if (!table) {

		pr_err("mem dump base table does not exist\n");

		pr_err("mem dump base table does not exist\n");

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);
@@ -493,8 +493,9 @@ static struct msm_dump_table *msm_dump_get_table(enum msm_dump_table_ids id) 
		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);

	}

	}





	offset = table->entries[i].addr - memdump.table_phys;

	/* Get the apps table pointer */

	/* Get the apps table pointer */

	table = phys_to_virt(table->entries[i].addr);

	table = (void *)memdump.table + offset;





	return table;

	return table;

}

}