evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: Add support to enable gladiator main error logger only"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-03 17:56:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3ed5f01b00
2 changed files with 16 additions and 1 deletions

9
drivers/soc/qcom/Kconfig
View file

@ -483,6 +483,15 @@ config PANIC_ON_GLADIATOR_ERROR_V2
If unsure, say N.
config MSM_GLADIATOR_ERROR_V2_MAIN_LOGGER_ONLY
depends on MSM_GLADIATOR_ERP_V2
bool "QCOM Gladiator error v2 main logger support only"
help
Gladiator has two error loggers to report error captured.
By default, two error loggers will both be enabled.
This option enables only the main error logger.
If unsure, say no
config MSM_GLADIATOR_HANG_DETECT
tristate "MSM Gladiator Hang Detection Support"
help

8
drivers/soc/qcom/gladiator_erp_v2.c
View file

@ -23,6 +23,11 @@
#include <linux/clk.h>
#define MODULE_NAME "gladiator-v2_error_reporting"
#ifdef CONFIG_MSM_GLADIATOR_ERROR_V2_MAIN_LOGGER_ONLY
#define OBSERVER_ERROR_ENABLE 0
#else
#define OBSERVER_ERROR_ENABLE 1
#endif
/* Register Offsets */
#define GLADIATOR_ID_COREID 0x0
@ -733,7 +738,8 @@ static int parse_dt_node(struct platform_device *pdev,
static inline void gladiator_irq_init(void __iomem *gladiator_virt_base)
{
writel_relaxed(1, gladiator_virt_base + GLADIATOR_FAULTEN);
writel_relaxed(1, gladiator_virt_base + OBSERVER_0_FAULTEN);
writel_relaxed(OBSERVER_ERROR_ENABLE,
gladiator_virt_base + OBSERVER_0_FAULTEN);
}
#define CCI_LEVEL 2