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

Commit 3a641f49 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

soc: qcom: Consolidate and add gladiator erp for msmskunk 



Add support for gladiator cache interconnect error detection
and reporting for msmskunk.

Also consolidate gladiator erp all to one single version on
kernel 4.9.

Change-Id: Ic6d24f0535b90d916a8d1f470b391807e82e194e
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parent fe5ce61d

Documentation/devicetree/bindings/cache/msm_gladiator_erp_v2.txt→Documentation/devicetree/bindings/cache/msm_gladiator_erp.txt

+3 −2
Original line number Diff line number Diff line 
* MSM Gladiator error reporting driver



Required properties:

- compatible: Should be "qcom,msm-gladiator-v2"

- compatible: Should be "qcom,msm-gladiator" or "qcom,msm-gladiator-v2" or

"qcom,msm-gladiator-v3"

- reg: I/O address Gladiator H/W block

- reg-names: Should be "gladiator_base"

- interrupts: Should contain the gladiator error interrupt number
@@ -11,7 +12,7 @@ Required properties: 
Example:



qcom,msm-gladiator-v2@b1c0000 {

	compatible = "qcom,msm-gladiator-v2";

	compatible = "qcom,msm-gladiator";

	reg = <0xb1c0000 0xe000>;

	reg-names = "gladiator_base";

	interrupts = <0 34 0>;

arch/arm64/boot/dts/qcom/sdm845.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,13 @@ 
		qcom,config-reg = <0x17990434>;

	};



	qcom,msm-gladiator-v3@17900000 {

		compatible = "qcom,msm-gladiator-v3";

		reg = <0x17900000 0xd080>;

		reg-names = "gladiator_base";

		interrupts = <0 17 0>;

	};



	cmd_db: qcom,cmd-db@861e0000 {

		compatible = "qcom,cmd-db";

		reg = <0x861e0000 0x4000>;

drivers/soc/qcom/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ config MSM_GLADIATOR_HANG_DETECT 
         gladiator hang detection and collects the context for the

         gladiator hang.



config MSM_GLADIATOR_ERP_V2

       tristate "GLADIATOR coherency interconnect error reporting driver v2"

config MSM_GLADIATOR_ERP

       tristate "GLADIATOR coherency interconnect error reporting driver"

       help

               Support dumping debug information for the GLADIATOR

               cache interconnect in the error interrupt handler.
@@ -183,9 +183,9 @@ config MSM_GLADIATOR_ERP_V2 


               If unsure, say N.



config PANIC_ON_GLADIATOR_ERROR_V2

       depends on MSM_GLADIATOR_ERP_V2

       bool "Panic on GLADIATOR error report v2"

config PANIC_ON_GLADIATOR_ERROR

       depends on MSM_GLADIATOR_ERP

       bool "Panic on GLADIATOR error report"

       help

               Panic upon detection of an Gladiator coherency interconnect error

               in order to support dumping debug information.

drivers/soc/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_SOC_BUS) += socinfo.o 
obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o

obj-$(CONFIG_MSM_GLADIATOR_HANG_DETECT) += gladiator_hang_detect.o

obj-$(CONFIG_MSM_GLADIATOR_ERP_V2) += gladiator_erp_v2.o

obj-$(CONFIG_MSM_GLADIATOR_ERP) += gladiator_erp.o

obj-$(CONFIG_QCOM_EUD) += eud.o

obj-$(CONFIG_QCOM_WATCHDOG_V2) += watchdog_v2.o

obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o

drivers/soc/qcom/gladiator_erp_v2.c→drivers/soc/qcom/gladiator_erp.c

+1130 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.