Merge debug topic branch changes

arch/arm64/configs/qcom_debug.config

@@ -0,0 +1,4 @@
+CONFIG_QCOM_DCC=y
+CONFIG_QCOM_DCC_DEV=y
+CONFIG_QCOM_MEMORY_DUMP_V2=y
+CONFIG_QCOM_MEMORY_DUMP_DEV=y

arch/arm64/mm/init.c

@@ -50,6 +50,7 @@
 #include <asm/tlb.h>
 #include <asm/alternative.h>
 #include <asm/xen/swiotlb-xen.h>
+#include <linux/firmware/qcom/memory_dump.h>
 
 /*
  * We need to be able to catch inadvertent references to memstart_addr
@@ -327,6 +328,9 @@ void __init bootmem_init(void)
 	 * reserved, so do it here.
 	 */
 	arch_reserve_crashkernel();
+#if defined(CONFIG_QCOM_MEMORY_DUMP_V2)
+	reserve_memdump_cma();
+#endif
 
 	memblock_dump_all();
 }

drivers/firmware/qcom/Kconfig

@@ -94,4 +94,20 @@ config QCOM_QSEECOM_UEFISECAPP
 	  Select Y here to provide access to EFI variables on the aforementioned
 	  platforms.
 
+config QCOM_MEMORY_DUMP_V2
+	tristate "QCOM Memory Dump V2 Support"
+	depends on QCOM_TZMEM
+	depends on CMA
+	help
+	  This enables memory dump feature. It allows various client
+	  subsystems to register respective dump regions. At the time
+	  of deadlocks or cpu hangs these dump regions are captured to
+	  give a snapshot of the system at the time of the crash.
+
+config QCOM_MEMORY_DUMP_DEV
+	tristate "QCOM Memory Dump V2 device stub"
+	depends on QCOM_MEMORY_DUMP_V2
+	help
+	  Device stub for memory dump V2 driver.
+
 endmenu

drivers/firmware/qcom/Makefile

@@ -11,3 +11,5 @@ obj-$(CONFIG_QCOM_QSEECOM)	+= qcom_qseecom.o
 obj-$(CONFIG_QCOM_QSEECOM_UEFISECAPP) += qcom_qseecom_uefisecapp.o
 obj-$(CONFIG_QCOM_PAS)		+= qcom_pas.o
 obj-$(CONFIG_QCOM_PAS_TEE)	+= qcom_pas_tee.o
+obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o
+obj-$(CONFIG_QCOM_MEMORY_DUMP_DEV) += memory_dump_dev.o