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

Commit f01ea865 authored by Tony Truong's avatar Tony Truong Committed by Gerrit - the friendly Code Review server
Browse files

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: default avatarAndrei Danaila <adanaila@codeaurora.org>
Signed-off-by: default avatarTony Truong <truong@codeaurora.org>
parent 46ff458d

drivers/net/ethernet/msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the msm networking support.

#



ccflags-$(CONFIG_MSM_MHI_DEBUG) := -DDEBUG

obj-$(CONFIG_MSM_RMNET_MHI) += msm_rmnet_mhi.o

obj-$(CONFIG_ECM_IPA) += ecm_ipa.o

obj-$(CONFIG_RNDIS_IPA) += rndis_ipa.o

drivers/net/ethernet/msm/msm_rmnet_mhi.c

+12 −14
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/debugfs.h>

#include <linux/ipc_logging.h>

#include <linux/device.h>

#include <linux/errno.h>



#define RMNET_MHI_DRIVER_NAME "rmnet_mhi"

#define RMNET_MHI_DEV_NAME    "rmnet_mhi%d"
@@ -53,16 +54,18 @@ struct __packed mhi_skb_priv { 
	size_t	   dma_size;

};



enum DBG_LVL rmnet_ipc_log_lvl = MSG_VERBOSE;

enum DBG_LVL rmnet_msg_lvl = MSG_CRITICAL;

static unsigned int rmnet_log_override;



#ifdef CONFIG_MSM_MHI_DEBUG

enum DBG_LVL rmnet_ipc_log_lvl = MSG_VERBOSE;

#else

enum DBG_LVL rmnet_ipc_log_lvl = MSG_ERROR;

#endif



module_param(rmnet_msg_lvl , uint, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(rmnet_msg_lvl, "dbg lvl");

module_param(rmnet_ipc_log_lvl, uint, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(rmnet_ipc_log_lvl, "dbg lvl");

module_param(rmnet_log_override , uint, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(rmnet_log_override, "dbg class");



unsigned int mru = MHI_DEFAULT_MRU;

module_param(mru, uint, S_IRUGO | S_IWUSR);
@@ -71,14 +74,9 @@ MODULE_PARM_DESC(mru, "MRU interface setting"); 
void *rmnet_ipc_log;



#define rmnet_log(_msg_lvl, _msg, ...) do { \

		DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, _msg);	 \

		if ((rmnet_log_override ||				 \

		    unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) &&\

		    (_msg_lvl) >= rmnet_msg_lvl)			 \

		if ((_msg_lvl) >= rmnet_msg_lvl) \

			pr_alert("[%s] " _msg, __func__, ##__VA_ARGS__);\

		if ((rmnet_log_override ||				      \

			unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) && \

			rmnet_ipc_log && ((_msg_lvl) >= rmnet_ipc_log_lvl))   \

		if (rmnet_ipc_log && ((_msg_lvl) >= rmnet_ipc_log_lvl))	\

			ipc_log_string(rmnet_ipc_log,			\

			       "[%s] " _msg, __func__, ##__VA_ARGS__);	\

} while (0)

drivers/platform/msm/mhi/Makefile

+0 −1
Original line number Diff line number Diff line 
# 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

drivers/platform/msm/mhi/mhi_sys.c

+9 −6
Original line number Diff line number Diff line 
/* 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_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)

{

drivers/platform/msm/mhi/mhi_sys.h

+6 −13
Original line number Diff line number Diff line 
/* 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,14 +39,9 @@ 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)			 \

		if ((_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))  \

		if (mhi_ipc_log && ((_msg_lvl) >= mhi_ipc_log_lvl))	\

			ipc_log_string(mhi_ipc_log,			\

			       "[%s] " _msg, __func__, ##__VA_ARGS__);	\

} while (0)