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

Commit f187fb35 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cache_dump: Support multiplatform"

parents 5ecca31c 3f92991d

arch/arm/mach-msm/Kconfig

+0 −16
Original line number Original line Diff line number Diff line
@@ -926,22 +926,6 @@ config MSM_CPR 
config HAVE_ARCH_HAS_CURRENT_TIMER

config HAVE_ARCH_HAS_CURRENT_TIMER

	bool

	bool





config MSM_CACHE_DUMP

	bool "Cache dumping support"

	help

	  Add infrastructure to dump the L1 and L2 caches to an allocated buffer.

	  This allows for analysis of the caches in case cache corruption is

	  suspected.



config MSM_CACHE_DUMP_ON_PANIC

	bool "Dump caches on panic"

	depends on MSM_CACHE_DUMP

	help

	  By default, the caches are flushed on panic. This means that trying to

	  look at them in a RAM dump will give useless data. Select this if you

	  want to dump the L1 and L2 caches on panic before any flush occurs.

	  If unsure, say N



config MSM_HSIC_SYSMON

config MSM_HSIC_SYSMON

	tristate "MSM HSIC system monitor driver"

	tristate "MSM HSIC system monitor driver"

	depends on USB

	depends on USB

arch/arm/mach-msm/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_ARCH_APQ8084) += gpiomux-v2.o gpiomux.o 
obj-$(CONFIG_ARCH_FSM9900) += gpiomux-v2.o gpiomux.o

obj-$(CONFIG_ARCH_FSM9900) += gpiomux-v2.o gpiomux.o





obj-$(CONFIG_MSM_CACHE_ERP) += cache_erp.o

obj-$(CONFIG_MSM_CACHE_ERP) += cache_erp.o

obj-$(CONFIG_MSM_CACHE_DUMP) += msm_cache_dump.o





obj-$(CONFIG_MSM_HSIC_SYSMON) += hsic_sysmon.o

obj-$(CONFIG_MSM_HSIC_SYSMON) += hsic_sysmon.o

obj-$(CONFIG_MSM_HSIC_SYSMON_TEST) += hsic_sysmon_test.o

obj-$(CONFIG_MSM_HSIC_SYSMON_TEST) += hsic_sysmon_test.o

drivers/soc/qcom/Kconfig

+17 −0
Original line number Original line Diff line number Diff line
@@ -463,6 +463,23 @@ config MSM_XPU_ERR_FATAL 
	help

	help

	 Select if XPU violations have to be configured as fatal errors.

	 Select if XPU violations have to be configured as fatal errors.





config MSM_CACHE_DUMP

	bool "Cache dumping support"

	help

	  Add infrastructure to dump the L1 and L2 caches to an allocated buffer.

	  This allows for analysis of the caches in case cache corruption is

	  suspected.

	  If unsure, say N



config MSM_CACHE_DUMP_ON_PANIC

	bool "Dump caches on panic"

	depends on MSM_CACHE_DUMP

	help

	  By default, the caches are flushed on panic. This means that trying to

	  look at them in a RAM dump will give useless data. Select this if you

	  want to dump the L1 and L2 caches on panic before any flush occurs.

	  If unsure, say N



source "drivers/soc/qcom/memshare/Kconfig"

source "drivers/soc/qcom/memshare/Kconfig"





endif # ARCH_MSM
 
endif # ARCH_MSM

drivers/soc/qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_MSM_JTAG_MM) += jtag-fuse.o jtag-mm.o 
obj-$(CONFIG_MSM_JTAGV8) += jtag-fuse.o jtagv8.o jtagv8-mm.o

obj-$(CONFIG_MSM_JTAGV8) += jtag-fuse.o jtagv8.o jtagv8-mm.o

obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o

obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o





obj-$(CONFIG_MSM_CACHE_DUMP) += cache_dump.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o





obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o

obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o

arch/arm/mach-msm/msm_cache_dump.c→drivers/soc/qcom/cache_dump.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <soc/qcom/scm.h>

#include <soc/qcom/scm.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <mach/msm_cache_dump.h>

#include <soc/qcom/cache_dump.h>

#include <mach/msm_iomap.h>

#include <soc/qcom/memory_dump.h>

#include <soc/qcom/memory_dump.h>





#define L2_DUMP_OFFSET 0x14

#define L2_DUMP_OFFSET 0x14