From 3a6e590934a9d1b61101b722b734718d1861e088 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Tue, 27 Nov 2018 22:22:08 -0700
Subject: [PATCH] misc: Allow kernel to be compiled with SEC_DEBUG disabled

* Guards of sec_debug.h include removed in those files that call
  functions declared in that header. The header defines empty
  functions when CONFIG_SEC_DEBUG is not defined.
* Expose extern declaration of sec_class in qpnp-power-on.c when
  CONFIG_SEC_DEBUG is not defined.
* Guard debug level sysfs tuneables.

Change-Id: I4e8b1ae7dd1dce0dec5434da64832165b2659aff
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
---
 arch/arm/kernel/traps.c     |  2 --
 arch/arm/mach-msm/msm-pm.c  |  3 +--
 arch/arm/mach-msm/restart.c | 12 ++++++------
 drivers/misc/sec_misc.c     |  4 ++++
 kernel/panic.c              |  2 --
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index b83419aded1..464bed18122 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -36,9 +36,7 @@
 #include <asm/tls.h>
 #include <asm/system_misc.h>
 
-#ifdef CONFIG_SEC_DEBUG
 #include <mach/sec_debug.h>
-#endif
 
 #include <trace/events/exception.h>
 
diff --git a/arch/arm/mach-msm/msm-pm.c b/arch/arm/mach-msm/msm-pm.c
index a18e379b090..c0836ac8c76 100644
--- a/arch/arm/mach-msm/msm-pm.c
+++ b/arch/arm/mach-msm/msm-pm.c
@@ -43,9 +43,8 @@
 #include "spm.h"
 #include "pm-boot.h"
 #include "clock.h"
-#ifdef CONFIG_SEC_DEBUG
+
 #include <mach/sec_debug.h>
-#endif
 
 #define CREATE_TRACE_POINTS
 #include <mach/trace_msm_low_power.h>
diff --git a/arch/arm/mach-msm/restart.c b/arch/arm/mach-msm/restart.c
index 8c5948cb8e8..e8e6100fefe 100644
--- a/arch/arm/mach-msm/restart.c
+++ b/arch/arm/mach-msm/restart.c
@@ -32,11 +32,11 @@
 #include <mach/msm_iomap.h>
 #include <mach/restart.h>
 #include <mach/socinfo.h>
-#ifdef CONFIG_SEC_DEBUG
+
 #include <mach/sec_debug.h>
 #include <linux/notifier.h>
 #include <linux/ftrace.h>
-#endif
+
 #include <mach/irqs.h>
 #include <mach/scm.h>
 #include "msm_watchdog.h"
@@ -66,9 +66,9 @@
 #endif
 
 static int restart_mode;
-#ifndef CONFIG_SEC_DEBUG
+
 void *restart_reason;
-#endif
+
 
 #ifdef CONFIG_USER_RESET_DEBUG
 #define RESET_CAUSE_LPM_REBOOT 0x95
@@ -334,11 +334,11 @@ static void msm_restart_prepare(const char *cmd)
 	printk(KERN_NOTICE "Going down for restart now\n");
 	warm_reboot_set = 0;
 
-#ifdef CONFIG_SEC_DEBUG
+
 		if (!restart_reason)
 			restart_reason = ioremap_nocache((unsigned long)(MSM_IMEM_BASE \
 							+ RESTART_REASON_ADDR), SZ_4K);
-#endif
+
 	if (cmd != NULL) {
 		printk(KERN_NOTICE " Reboot cmd=%s\n",cmd);
 		if (!strncmp(cmd, "bootloader", 10)) {
diff --git a/drivers/misc/sec_misc.c b/drivers/misc/sec_misc.c
index 18569b6c2f0..53f515225b8 100644
--- a/drivers/misc/sec_misc.c
+++ b/drivers/misc/sec_misc.c
@@ -164,6 +164,7 @@ static DEVICE_ATTR(qsc_control, S_IRUGO | S_IWUSR ,
 		qsc_control_show, qsc_control_store);
 #endif /*QSC_CONTROL*/
 
+#ifdef CONFIG_SEC_DEBUG
 static unsigned int convert_debug_level_str(const char *str)
 {
 	if (strncasecmp(str, "0xA0A0", 6) == 0)
@@ -222,6 +223,7 @@ static ssize_t debug_level_store(struct device *dev,
 
 static DEVICE_ATTR(debug_level, S_IRUGO | S_IWUSR ,
 		debug_level_show, debug_level_store);
+#endif // CONFIG_SEC_DEBUG
 
 #if defined(CONFIG_MACH_APEXQ) || defined(CONFIG_MACH_AEGIS2)
 static ssize_t slideCount_show
@@ -363,7 +365,9 @@ static struct device_attribute *sec_misc_attrs[] = {
 	&dev_attr_emmc_checksum_done,
 	&dev_attr_emmc_checksum_pass,
 	&dev_attr_rory_control,
+#ifdef CONFIG_SEC_DEBUG
 	&dev_attr_debug_level,
+#endif // CONFIG_SEC_DEBUG
 #if defined(CONFIG_MACH_APEXQ) || defined(CONFIG_MACH_AEGIS2)
 	&dev_attr_slideCount,
 #endif
diff --git a/kernel/panic.c b/kernel/panic.c
index 93f90dccff0..d949593ba7b 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -24,9 +24,7 @@
 #include <linux/nmi.h>
 #include <linux/dmi.h>
 #include <linux/coresight.h>
-#ifdef CONFIG_SEC_DEBUG
 #include <mach/sec_debug.h>
-#endif
 
 #define PANIC_TIMER_STEP 100
 #define PANIC_BLINK_SPD 18