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

Commit d71c6a00 authored by Mohit Aggarwal's avatar Mohit Aggarwal
Browse files

diag: Featurize IPC logging 



Currently, in case IPC logging related config
is disabled then there are some unwanted error
logs in kernel logs. Featurize IPC logging to
get rid of error logs.

Change-Id: I8455f5e3a13cf58b4d65d1e1a5c4f1ec0adedabf
Signed-off-by: default avatarMohit Aggarwal <maggarwa@codeaurora.org>
parent d69f47b7

drivers/char/diag/diag_debugfs.c

+7 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2018, 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
@@ -797,6 +797,7 @@ static ssize_t diag_dbgfs_read_glinkinfo(struct file *file, char __user *ubuf, 
	return ret;

}



#ifdef CONFIG_IPC_LOGGING

static ssize_t diag_dbgfs_write_debug(struct file *fp, const char __user *buf,

				      size_t count, loff_t *ppos)

{
@@ -827,6 +828,7 @@ static ssize_t diag_dbgfs_write_debug(struct file *fp, const char __user *buf, 
	diag_debug_mask = (uint16_t)value;

	return count;

}

#endif



#ifdef CONFIG_DIAGFWD_BRIDGE_CODE

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
@@ -1086,9 +1088,11 @@ const struct file_operations diag_dbgfs_power_ops = { 
	.read = diag_dbgfs_read_power,

};



#ifdef CONFIG_IPC_LOGGING

const struct file_operations diag_dbgfs_debug_ops = {

	.write = diag_dbgfs_write_debug

};

#endif



int diag_debugfs_init(void)

{
@@ -1145,11 +1149,12 @@ int diag_debugfs_init(void) 
	if (!entry)

		goto err;



#ifdef CONFIG_IPC_LOGGING

	entry = debugfs_create_file("debug", 0444, diag_dbgfs_dent, 0,

				    &diag_dbgfs_debug_ops);

	if (!entry)

		goto err;



#endif

#ifdef CONFIG_DIAGFWD_BRIDGE_CODE

	entry = debugfs_create_file("bridge", 0444, diag_dbgfs_dent, 0,

				    &diag_dbgfs_bridge_ops);

drivers/char/diag/diag_ipc_logging.h

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
#define DIAG_DEBUG_BRIDGE	0x0040

#define DIAG_DEBUG_CONTROL	0x0080



#define DIAG_DEBUG



#ifdef DIAG_DEBUG

#ifdef CONFIG_IPC_LOGGING

extern uint16_t diag_debug_mask;

extern void *diag_ipc_log;

drivers/char/diag/diagchar_core.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static struct mutex apps_data_mutex; 


#define DIAGPKT_MAX_DELAYED_RSP 0xFFFF



#ifdef DIAG_DEBUG

#ifdef CONFIG_IPC_LOGGING

uint16_t diag_debug_mask;

void *diag_ipc_log;

#endif
@@ -3804,7 +3804,7 @@ void diag_ws_release(void) 
		pm_relax(driver->diag_dev);

}



#ifdef DIAG_DEBUG

#ifdef CONFIG_IPC_LOGGING

static void diag_debug_init(void)

{

	diag_ipc_log = ipc_log_context_create(DIAG_IPC_LOG_PAGES, "diag", 0);