mhi: Enable logging based on defconfig option

Enable logging based on MHI defconfig option. This
avoids excessive logging in secondary boot image.

Change-Id: Ie22d56d781feadb2d484e6117c9c25ee29aa5299
Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
Signed-off-by: Tony Truong <truong@codeaurora.org>

5 files changed, 27 insertions, 36 deletions

diff --git a/drivers/platform/msm/mhi/Makefile b/drivers/platform/msm/mhi/Makefile
index da6cfcb14555..1f7d056ca580 100644
--- a/drivers/platform/msm/mhi/Makefile
+++ b/drivers/platform/msm/mhi/Makefile
@@ -1,5 +1,4 @@
 # Makefile for MHI driver
-ccflags-$(CONFIG_MSM_MHI_DEBUG) := -DDEBUG
 obj-y += mhi_main.o
 obj-y += mhi_iface.o
 obj-y += mhi_init.o
diff --git a/drivers/platform/msm/mhi/mhi_sys.c b/drivers/platform/msm/mhi/mhi_sys.c
index e1b862675f25..e1bd39dfeb34 100644
--- a/drivers/platform/msm/mhi/mhi_sys.c
+++ b/drivers/platform/msm/mhi/mhi_sys.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -18,8 +18,14 @@
 
 #include "mhi_sys.h"
 
-enum MHI_DEBUG_LEVEL mhi_msg_lvl = MHI_MSG_VERBOSE;
-enum MHI_DEBUG_LEVEL mhi_ipc_log_lvl = MHI_MSG_VERBOSE;
+enum MHI_DEBUG_LEVEL mhi_msg_lvl = MHI_MSG_ERROR;
+
+#ifdef CONFIG_MSM_MHI_DEBUG
+	enum MHI_DEBUG_LEVEL mhi_ipc_log_lvl = MHI_MSG_VERBOSE;
+#else
+	enum MHI_DEBUG_LEVEL mhi_ipc_log_lvl = MHI_MSG_ERROR;
+#endif
+
 unsigned int mhi_log_override;
 
 module_param(mhi_msg_lvl , uint, S_IRUGO | S_IWUSR);
@@ -28,9 +34,6 @@ MODULE_PARM_DESC(mhi_msg_lvl, "dbg lvl");
 module_param(mhi_ipc_log_lvl, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(mhi_ipc_log_lvl, "dbg lvl");
 
-module_param(mhi_log_override , uint, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(mhi_log_override, "dbg class");
-
 static ssize_t mhi_dbgfs_chan_read(struct file *fp, char __user *buf,
 				size_t count, loff_t *offp)
 {
diff --git a/drivers/platform/msm/mhi/mhi_sys.h b/drivers/platform/msm/mhi/mhi_sys.h
index 8ba88b297a11..765fd46ef2dd 100644
--- a/drivers/platform/msm/mhi/mhi_sys.h
+++ b/drivers/platform/msm/mhi/mhi_sys.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -17,13 +17,11 @@
 #include <linux/ipc_logging.h>
 #include <linux/sysfs.h>
 #include <linux/delay.h>
-#include <linux/device.h>
 
 #include "mhi.h"
 
 extern enum MHI_DEBUG_LEVEL mhi_msg_lvl;
 extern enum MHI_DEBUG_LEVEL mhi_ipc_log_lvl;
-extern unsigned int mhi_log_override;
 extern u32 m3_timer_val_ms;
 
 extern enum MHI_DEBUG_LEVEL mhi_xfer_db_interval;
@@ -41,16 +39,11 @@ extern void *mhi_ipc_log;
 	} while (0)
 
 #define mhi_log(_msg_lvl, _msg, ...) do { \
-		DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, _msg);	 \
-		if ((mhi_log_override ||				 \
-		    unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) &&\
-			(_msg_lvl) >= mhi_msg_lvl)			 \
-			pr_alert("[%s] " _msg, __func__, ##__VA_ARGS__); \
-		if ((mhi_log_override ||				      \
-			unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) && \
-			mhi_ipc_log && ((_msg_lvl) >= mhi_ipc_log_lvl))  \
-			ipc_log_string(mhi_ipc_log,			 \
-				"[%s] " _msg, __func__, ##__VA_ARGS__);  \
+		if ((_msg_lvl) >= mhi_msg_lvl) \
+			pr_alert("[%s] " _msg, __func__, ##__VA_ARGS__);\
+		if (mhi_ipc_log && ((_msg_lvl) >= mhi_ipc_log_lvl))	\
+			ipc_log_string(mhi_ipc_log,			\
+			       "[%s] " _msg, __func__, ##__VA_ARGS__);	\
 } while (0)
 
 irqreturn_t mhi_msi_handlr(int msi_number, void *dev_id);
diff --git a/drivers/platform/msm/mhi_uci/Makefile b/drivers/platform/msm/mhi_uci/Makefile
index 506a5830c8b2..5709e186abb0 100644
--- a/drivers/platform/msm/mhi_uci/Makefile
+++ b/drivers/platform/msm/mhi_uci/Makefile
@@ -1,3 +1,2 @@
 # Makefile for MHI UCI driver
-ccflags-$(CONFIG_MSM_MHI_DEBUG) := -DDEBUG
 obj-y += mhi_uci.o
diff --git a/drivers/platform/msm/mhi_uci/mhi_uci.c b/drivers/platform/msm/mhi_uci/mhi_uci.c
index 928cedb4d2a8..10a2dcc47fda 100644
--- a/drivers/platform/msm/mhi_uci/mhi_uci.c
+++ b/drivers/platform/msm/mhi_uci/mhi_uci.c
@@ -24,6 +24,7 @@
 #include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/ipc_logging.h>
+#include <linux/errno.h>
 #include <linux/device.h>
 
 #define MHI_DEV_NODE_NAME_LEN 13
@@ -48,10 +49,14 @@ enum UCI_DBG_LEVEL {
 	UCI_DBG_CRITICAL = 0x5,
 	UCI_DBG_reserved = 0x80000000
 };
-
 enum UCI_DBG_LEVEL mhi_uci_msg_lvl = UCI_DBG_CRITICAL;
-enum UCI_DBG_LEVEL mhi_uci_ipc_log_lvl = UCI_DBG_INFO;
-static unsigned int uci_log_override;
+
+#ifdef CONFIG_MSM_MHI_DEBUG
+enum UCI_DBG_LEVEL mhi_uci_ipc_log_lvl = UCI_DBG_VERBOSE;
+#else
+enum UCI_DBG_LEVEL mhi_uci_ipc_log_lvl = UCI_DBG_ERROR;
+#endif
+
 void *mhi_uci_ipc_log;
 
 struct __packed rs232_ctrl_msg {
@@ -214,15 +219,10 @@ struct mhi_uci_ctxt_t {
 };
 
 #define uci_log(_msg_lvl, _msg, ...) do { \
-	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, _msg);	 \
-	if ((uci_log_override ||				 \
-		    unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) &&\
-		    (_msg_lvl >= mhi_uci_msg_lvl)) {			 \
-		pr_err("[%s] "_msg, __func__, ##__VA_ARGS__);		 \
-	}								 \
-	if ((uci_log_override ||				 \
-		    unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) && \
-		    mhi_uci_ipc_log && (_msg_lvl >= mhi_uci_ipc_log_lvl)) { \
+	if (_msg_lvl >= mhi_uci_msg_lvl) { \
+		pr_err("[%s] "_msg, __func__, ##__VA_ARGS__); \
+	} \
+	if (mhi_uci_ipc_log && (_msg_lvl >= mhi_uci_ipc_log_lvl)) { \
 		ipc_log_string(mhi_uci_ipc_log,                     \
 			"[%s] " _msg, __func__, ##__VA_ARGS__);     \
 	} \
@@ -234,9 +234,6 @@ MODULE_PARM_DESC(mhi_uci_msg_lvl, "uci dbg lvl");
 module_param(mhi_uci_ipc_log_lvl, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(mhi_uci_ipc_log_lvl, "ipc dbg lvl");
 
-module_param(uci_log_override , uint, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(uci_log_override, "dbg class");
-
 static ssize_t mhi_uci_client_read(struct file *file, char __user *buf,
 		size_t count, loff_t *offp);
 static ssize_t mhi_uci_client_write(struct file *file,