Commit b640e8f5 authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Drop log level mechanisms 



Drop the log level remnants since the logs are now ported to use
dynamic logging. Drop macros, externs and global variables which
were used in the log level mechanisms along with debugfs log entries.

Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Link: https://lore.kernel.org/r/20231024114428.443528-9-umang.jain@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1d7fd5f

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ 
#define KEEPALIVE_VER 1

#define KEEPALIVE_VER_MIN KEEPALIVE_VER



/* Run time control of log level, based on KERN_XXX level. */

int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT;

int vchiq_susp_log_level = VCHIQ_LOG_ERROR;



DEFINE_SPINLOCK(msg_queue_spinlock);

struct vchiq_state g_state;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h

+0 −3
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ struct dump_context { 
	loff_t offset;

};



extern int vchiq_arm_log_level;

extern int vchiq_susp_log_level;



extern spinlock_t msg_queue_spinlock;

extern struct vchiq_state g_state;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+33 −54
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ static_assert((unsigned int)VCHIQ_PORT_MAX < 


#define BULK_INDEX(x) ((x) & (VCHIQ_NUM_SERVICE_BULKS - 1))



#define SRVTRACE_ENABLED(srv, lev) \

	(((srv) && (srv)->trace) || (vchiq_core_msg_log_level >= (lev)))



#define NO_CLOSE_RECVD	0

#define CLOSE_RECVD	1
@@ -152,11 +149,6 @@ static inline void check_sizes(void) 
	BUILD_BUG_ON_NOT_POWER_OF_2(VCHIQ_MAX_SERVICES);

}



/* Run time control of log level, based on KERN_XXX level. */

int vchiq_core_log_level = VCHIQ_LOG_DEFAULT;

int vchiq_core_msg_log_level = VCHIQ_LOG_DEFAULT;

int vchiq_sync_log_level = VCHIQ_LOG_DEFAULT;



DEFINE_SPINLOCK(bulk_waiter_spinlock);

static DEFINE_SPINLOCK(quota_spinlock);
@@ -1048,8 +1040,6 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, 
			return -EINVAL;

		}



		if (SRVTRACE_ENABLED(service,

				     VCHIQ_LOG_INFO))

		vchiq_log_dump_mem(state->dev, "Sent", 0,

				   header->data,

				   min_t(size_t, 16, callback_result));
@@ -1157,6 +1147,7 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, 
	struct vchiq_shared_state *local;

	struct vchiq_header *header;

	ssize_t callback_result;

	int svc_fourcc;



	local = state->local;
@@ -1197,8 +1188,6 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, 
	}



	if (service) {

		if (SRVTRACE_ENABLED(service,

				     VCHIQ_LOG_INFO))

		vchiq_log_dump_mem(state->dev, "Sent", 0,

				   header->data,

				   min_t(size_t, 16, callback_result));
@@ -1212,11 +1201,8 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, 
	header->size = size;

	header->msgid = msgid;



	if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) {

		int svc_fourcc;



		svc_fourcc = service

			? service->base.fourcc

	svc_fourcc = service ? service->base.fourcc

			     : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');



	vchiq_log_trace(state->dev, VCHIQ_SYNC,
@@ -1224,7 +1210,6 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, 
			msg_type_str(VCHIQ_MSG_TYPE(msgid)), VCHIQ_MSG_TYPE(msgid),

			VCHIQ_FOURCC_AS_4CHARS(svc_fourcc), VCHIQ_MSG_SRCPORT(msgid),

			VCHIQ_MSG_DSTPORT(msgid), size);

	}



	remote_event_signal(&state->remote->sync_trigger);
@@ -1586,6 +1571,7 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header) 
	struct vchiq_service *service = NULL;

	unsigned int localport, remoteport;

	int msgid, size, type, ret = -EINVAL;

	int svc_fourcc;



	DEBUG_INITIALISE(state->local);
@@ -1641,11 +1627,8 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header) 
		break;

	}



	if (SRVTRACE_ENABLED(service, VCHIQ_LOG_INFO)) {

		int svc_fourcc;



		svc_fourcc = service

			? service->base.fourcc

	svc_fourcc = service ? service->base.fourcc

			     : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');



	vchiq_log_debug(state->dev, VCHIQ_CORE_MSG,
@@ -1654,7 +1637,6 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header) 
			remoteport, localport, size);

	if (size > 0)

		vchiq_log_dump_mem(state->dev, "Rcvd", 0, header->data, min(16, size));

	}



	if (((unsigned long)header & VCHIQ_SLOT_MASK) +

	    calc_stride(size) > VCHIQ_SLOT_SIZE) {
@@ -2028,6 +2010,7 @@ sync_func(void *v) 
	struct vchiq_header *header =

		(struct vchiq_header *)SLOT_DATA_FROM_INDEX(state,

			state->remote->slot_sync);

	int svc_fourcc;



	while (1) {

		struct vchiq_service *service;
@@ -2057,19 +2040,15 @@ sync_func(void *v) 
			continue;

		}



		if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) {

			int svc_fourcc;



			svc_fourcc = service

				? service->base.fourcc

		svc_fourcc = service ? service->base.fourcc

				     : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');



		vchiq_log_trace(state->dev, VCHIQ_SYNC,

				"Rcvd Msg %s from %c%c%c%c s:%d d:%d len:%d",

				msg_type_str(type), VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),

				remoteport, localport, size);

		if (size > 0)

			vchiq_log_dump_mem(state->dev, "Rcvd", 0, header->data, min(16, size));

		}



		switch (type) {

		case VCHIQ_MSG_OPENACK:

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+0 −11
Original line number Diff line number Diff line
@@ -31,13 +31,6 @@ 
#define VCHIQ_SLOT_SIZE     4096

#define VCHIQ_MAX_MSG_SIZE  (VCHIQ_SLOT_SIZE - sizeof(struct vchiq_header))



/* Run time control of log level, based on KERN_XXX level. */

#define VCHIQ_LOG_DEFAULT  4

#define VCHIQ_LOG_ERROR    3

#define VCHIQ_LOG_WARNING  4

#define VCHIQ_LOG_INFO     6

#define VCHIQ_LOG_TRACE    7



enum vchiq_log_category {

	VCHIQ_ARM,

	VCHIQ_CORE,
@@ -476,10 +469,6 @@ struct vchiq_config { 


extern spinlock_t bulk_waiter_spinlock;



extern int vchiq_core_log_level;

extern int vchiq_core_msg_log_level;

extern int vchiq_sync_log_level;



extern const char *

get_conn_state_name(enum vchiq_connstate conn_state);

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c

+0 −103
Original line number Diff line number Diff line
@@ -13,102 +13,10 @@ 


#define DEBUGFS_WRITE_BUF_SIZE 256



#define VCHIQ_LOG_ERROR_STR   "error"

#define VCHIQ_LOG_WARNING_STR "warning"

#define VCHIQ_LOG_INFO_STR    "info"

#define VCHIQ_LOG_TRACE_STR   "trace"



/* Global 'vchiq' debugfs and clients entry used by all instances */

static struct dentry *vchiq_dbg_dir;

static struct dentry *vchiq_dbg_clients;



/* Log category debugfs entries */

struct vchiq_debugfs_log_entry {

	const char *name;

	void *plevel;

};



static struct vchiq_debugfs_log_entry vchiq_debugfs_log_entries[] = {

	{ "core", &vchiq_core_log_level },

	{ "msg",  &vchiq_core_msg_log_level },

	{ "sync", &vchiq_sync_log_level },

	{ "susp", &vchiq_susp_log_level },

	{ "arm",  &vchiq_arm_log_level },

};



static int debugfs_log_show(struct seq_file *f, void *offset)

{

	int *levp = f->private;

	char *log_value = NULL;



	switch (*levp) {

	case VCHIQ_LOG_ERROR:

		log_value = VCHIQ_LOG_ERROR_STR;

		break;

	case VCHIQ_LOG_WARNING:

		log_value = VCHIQ_LOG_WARNING_STR;

		break;

	case VCHIQ_LOG_INFO:

		log_value = VCHIQ_LOG_INFO_STR;

		break;

	case VCHIQ_LOG_TRACE:

		log_value = VCHIQ_LOG_TRACE_STR;

		break;

	default:

		break;

	}



	seq_printf(f, "%s\n", log_value ? log_value : "(null)");



	return 0;

}



static int debugfs_log_open(struct inode *inode, struct file *file)

{

	return single_open(file, debugfs_log_show, inode->i_private);

}



static ssize_t debugfs_log_write(struct file *file,

	const char __user *buffer,

	size_t count, loff_t *ppos)

{

	struct seq_file *f = (struct seq_file *)file->private_data;

	int *levp = f->private;

	char kbuf[DEBUGFS_WRITE_BUF_SIZE + 1];



	memset(kbuf, 0, DEBUGFS_WRITE_BUF_SIZE + 1);

	if (count >= DEBUGFS_WRITE_BUF_SIZE)

		count = DEBUGFS_WRITE_BUF_SIZE;



	if (copy_from_user(kbuf, buffer, count))

		return -EFAULT;

	kbuf[count - 1] = 0;



	if (strncmp("error", kbuf, strlen("error")) == 0)

		*levp = VCHIQ_LOG_ERROR;

	else if (strncmp("warning", kbuf, strlen("warning")) == 0)

		*levp = VCHIQ_LOG_WARNING;

	else if (strncmp("info", kbuf, strlen("info")) == 0)

		*levp = VCHIQ_LOG_INFO;

	else if (strncmp("trace", kbuf, strlen("trace")) == 0)

		*levp = VCHIQ_LOG_TRACE;

	else

		*levp = VCHIQ_LOG_DEFAULT;



	*ppos += count;



	return count;

}



static const struct file_operations debugfs_log_fops = {

	.owner		= THIS_MODULE,

	.open		= debugfs_log_open,

	.write		= debugfs_log_write,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};



static int debugfs_usecount_show(struct seq_file *f, void *offset)

{

	struct vchiq_instance *instance = f->private;
@@ -205,19 +113,8 @@ void vchiq_debugfs_remove_instance(struct vchiq_instance *instance) 


void vchiq_debugfs_init(void)

{

	struct dentry *dir;

	int i;



	vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL);

	vchiq_dbg_clients = debugfs_create_dir("clients", vchiq_dbg_dir);



	/* create an entry under <debugfs>/vchiq/log for each log category */

	dir = debugfs_create_dir("log", vchiq_dbg_dir);



	for (i = 0; i < ARRAY_SIZE(vchiq_debugfs_log_entries); i++)

		debugfs_create_file(vchiq_debugfs_log_entries[i].name, 0644,

				    dir, vchiq_debugfs_log_entries[i].plevel,

				    &debugfs_log_fops);

}



/* remove all the debugfs entries */