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

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

Merge "defconfig: msmcobalt: Enable gladiator error reporting v2"

parents 1fa97146 24420382

Documentation/devicetree/bindings/cache/msm_gladiator_erp_v2.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* MSM Gladiator error reporting driver



Required properties:

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

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

- reg-names: Should be "gladiator_base"

- interrupts: Should contain the gladiator error interrupt number

- clock-names: Should be "atb_clk"

- clocks: Handles to clocks specified in "clock-names" property.



Example:



qcom,msm-gladiator-v2@b1c0000 {

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

	reg = <0xb1c0000 0xe000>;

	reg-names = "gladiator_base";

	interrupts = <0 34 0>;

	clock-names = "atb_clk";

	clocks = <&clock_gcc clk_qdss_clk>;

}

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -822,6 +822,15 @@ 
		qcom,config-reg = <0x179d1434>;

	};



	qcom,msm-gladiator-v2@17900000 {

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

		reg = <0x17900000 0xe000>;

		reg-names = "gladiator_base";

		interrupts = <0 22 0>;

		clock-names = "atb_clk";

		clocks = <&clock_gcc clk_qdss_clk>;

	};



	qcom,smem@86000000 {

		compatible = "qcom,smem";

		reg = <0x86000000 0x200000>,

arch/arm64/configs/msmcortex_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -514,6 +514,8 @@ CONFIG_MSM_QPNP_INT=y 
CONFIG_CP_ACCESS64=y

CONFIG_MSM_GLADIATOR_ERP=y

CONFIG_PANIC_ON_GLADIATOR_ERROR=y

CONFIG_MSM_GLADIATOR_ERP_V2=y

CONFIG_PANIC_ON_GLADIATOR_ERROR_V2=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

drivers/soc/qcom/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -58,6 +58,25 @@ config PANIC_ON_GLADIATOR_ERROR 


	  If unsure, say N.



config MSM_GLADIATOR_ERP_V2

	tristate "GLADIATOR coherency interconnect error reporting driver v2"

	help

	  Support dumping debug information for the GLADIATOR

	  cache interconnect in the error interrupt handler.

	  Meant to be used for debug scenarios only.



	  If unsure, say N.



config PANIC_ON_GLADIATOR_ERROR_V2

	depends on MSM_GLADIATOR_ERP_V2

	bool "Panic on GLADIATOR error report v2"

	help

	  Panic upon detection of an Gladiator coherency interconnect error

	  in order to support dumping debug information.

	  Meant to be used for debug scenarios only.



	  If unsure, say N.



config MSM_QDSP6_APRV3

	bool "Audio QDSP6 APRv3 support"

	depends on MSM_SMD

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ ccflags-$(CONFIG_MSM_QBT1000) += -Idrivers/misc/ 


obj-$(CONFIG_MSM_INRUSH_CURRENT_MITIGATION) += inrush-current-mitigation.o

obj-$(CONFIG_MSM_GLADIATOR_ERP) += gladiator_erp.o

obj-$(CONFIG_MSM_GLADIATOR_ERP_V2) += gladiator_erp_v2.o

obj-$(CONFIG_ARM64) += idle-v8.o cpu_ops.o

obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o