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

Commit d47276eb authored by Gagan Malvi's avatar Gagan Malvi
Browse files

drivers/misc/mediatek: mtk-ccci: Drop CCCI logging. 



Signed-off-by: default avatarGagan Malvi <malvi@aospa.co>
parent 93575456

drivers/misc/mediatek/ccci_util/ccci_private_log.c

+14 −14
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int ccci_log_write(const char *fmt, ...) 


	temp_log = kmalloc(CCCI_LOG_MAX_WRITE, GFP_ATOMIC);

	if (temp_log == NULL) {

		/*pr_notice("[ccci0/util]alloc local buff fail p01\n");*/

		/*pr_debug("[ccci0/util]alloc local buff fail p01\n");*/

		return -ENODEV;

	}
@@ -130,7 +130,7 @@ int ccci_log_write_raw(unsigned int set_flags, const char *fmt, ...) 


	temp_log = kmalloc(CCCI_LOG_MAX_WRITE, GFP_ATOMIC);

	if (temp_log == NULL) {

		/*pr_notice("[ccci0/util]alloc local buff fail p1\n");*/

		/*pr_debug("[ccci0/util]alloc local buff fail p1\n");*/

		return -ENODEV;

	}
@@ -433,7 +433,7 @@ int ccci_dump_write(int md_id, int buf_type, 


	temp_log = kmalloc(CCCI_LOG_MAX_WRITE, GFP_ATOMIC);

	if (temp_log == NULL) {

		/*pr_notice("[ccci0/util]alloc local buff fail p2\n");*/

		/*pr_debug("[ccci0/util]alloc local buff fail p2\n");*/

		return -7;

	}
@@ -506,7 +506,7 @@ int ccci_dump_write(int md_id, int buf_type, 
		ptr->max_num = ptr->write_pos;

	spin_unlock_irqrestore(&ptr->lock, flags);



	/* pr_notice("[ccci0/util][ccci_log] has write %d, %d\n",

	/* pr_debug("[ccci0/util][ccci_log] has write %d, %d\n",

	 *		write_len, ptr->write_pos);

	 */

	kfree(temp_log);
@@ -611,7 +611,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
				left -= read_len;

				user_info->sep_cnt2[i] += read_len;

			} else

				pr_notice("[ccci0/util]dump copy to ser fail%d[-1]\n",

				pr_debug("[ccci0/util]dump copy to ser fail%d[-1]\n",

					ret);

		}
@@ -640,7 +640,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
					user_info->sep_cnt1[i][index]

						+= read_len;

				} else

					pr_notice(

					pr_debug(

					"[ccci0/util]dump copy to ser fail%d[-2]\n",

						ret);

			}
@@ -665,7 +665,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
					user_info->read_idx[i][index]

						+= read_len;

				} else

					pr_notice(

					pr_debug(

					"[ccci0/util]dump copy to ser fail%d\n",

						ret);

			} else { /* ring buffer read */
@@ -696,7 +696,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
						user_info->read_idx[i][index]

							+= read_len;

					} else

						pr_notice("[ccci0/util]dump copy to ser fail%d[1]\n",

						pr_debug("[ccci0/util]dump copy to ser fail%d[1]\n",

									ret);

					ret = copy_to_user(&buf[has_read],

						ptr->buffer,
@@ -708,7 +708,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
						user_info->read_idx[i][index]

							+= available - read_len;

					} else

						pr_notice("[ccci0/util]dump copy to ser fail%d[2]\n",

						pr_debug("[ccci0/util]dump copy to ser fail%d[2]\n",

									ret);

				} else {

					ret = copy_to_user(&buf[has_read],
@@ -720,7 +720,7 @@ static ssize_t ccci_dump_read(struct file *file, char __user *buf, 
						user_info->read_idx[i][index]

							+= available;

					} else

						pr_notice("[ccci0/util]dump copy to ser fail%d[3]\n",

						pr_debug("[ccci0/util]dump copy to ser fail%d[3]\n",

									ret);

				}

			}
@@ -746,7 +746,7 @@ static int ccci_dump_open(struct inode *inode, struct file *file) 


	user_info = kzalloc(sizeof(struct ccci_user_ctlb), GFP_KERNEL);

	if (user_info == NULL) {

		/*pr_notice("[ccci0/util]fail to alloc memory for ctlb\n"); */

		/*pr_debug("[ccci0/util]fail to alloc memory for ctlb\n"); */

		return -1;

	}
@@ -802,7 +802,7 @@ static void ccci_dump_buffer_init(void) 


	ccci_dump_proc = proc_create("ccci_dump", 0444, NULL, &ccci_dump_fops);

	if (ccci_dump_proc == NULL) {

		pr_notice("[ccci0/util]fail to create proc entry for dump\n");

		pr_debug("[ccci0/util]fail to create proc entry for dump\n");

		return;

	}
@@ -848,7 +848,7 @@ static void ccci_dump_buffer_init(void) 
					ptr->buf_size = node_ptr->init_size;

					ptr->attr = node_ptr->init_attr;

				} else

					pr_notice("[ccci0/util]fail to allocate buff index %d\n",

					pr_debug("[ccci0/util]fail to allocate buff index %d\n",

						node_ptr->index);

			}

			node_ptr++;
@@ -1147,7 +1147,7 @@ void ccci_log_init(void) 


	ccci_log_proc = proc_create("ccci_log", 0444, NULL, &ccci_log_fops);

	if (ccci_log_proc == NULL) {

		pr_notice("[ccci0/util]fail to create proc entry for log\n");

		pr_debug("[ccci0/util]fail to create proc entry for log\n");

		return;

	}

	ccci_log_buf.buffer = kmalloc(CCCI_LOG_BUF_SIZE, GFP_KERNEL);

drivers/misc/mediatek/ccci_util/ccci_util_broadcast.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int get_lock_rst_user_list(int md_id, char list_buff[], int size) 
	unsigned long flag;



	if (list_buff == NULL) {

		pr_info("ccci: NULL buffer for lock list\r\n");

		pr_debug("ccci: NULL buffer for lock list\r\n");

		return 0;

	}
@@ -535,7 +535,7 @@ static long ccci_util_bc_ioctl(struct file *filp, unsigned int cmd, 
			md_id = 0;

			buf[0] = 0;

		}

		pr_info("ccci: Lock reset user list: %s\r\n", buf);

		pr_debug("ccci: Lock reset user list: %s\r\n", buf);

		kfree(buf);



		break;

drivers/misc/mediatek/ccci_util/ccci_util_dummy.c

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


bool __weak spm_is_md1_sleep(void)

{

	pr_notice("[ccci/dummy] %s is not supported!\n", __func__);

	pr_debug("[ccci/dummy] %s is not supported!\n", __func__);

	return 0;

}



void __weak spm_ap_mdsrc_req(u8 lock)

{

	pr_notice("[ccci/dummy] %s is not supported!\n", __func__);

	pr_debug("[ccci/dummy] %s is not supported!\n", __func__);

}



void __weak ccci_power_off(void)

drivers/misc/mediatek/ccci_util/ccci_util_log.h

+10 −10
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ do {\ 
do {\

	ccci_dump_write(0, CCCI_DUMP_INIT,\

		CCCI_DUMP_TIME_FLAG, "[0/util]" fmt, ##args);\

	pr_notice("[ccci0/util]" fmt, ##args);\

	pr_debug("[ccci0/util]" fmt, ##args);\

} while (0)



/* With MD id message part */
@@ -64,14 +64,14 @@ do {\ 
do {\

	ccci_dump_write(id, CCCI_DUMP_INIT,\

		CCCI_DUMP_TIME_FLAG, "[%d/util]" fmt, (id+1), ##args);\

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args);\

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args);\

} while (0)



#define CCCI_UTIL_ERR_MSG_WITH_ID(id, fmt, args...) \

do {\

	ccci_dump_write(id, CCCI_DUMP_INIT,\

		CCCI_DUMP_TIME_FLAG, "[%d/util]" fmt, (id+1), ##args);\

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args);\

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args);\

} while (0)



#else
@@ -80,19 +80,19 @@ do {\ 
/* For bring up stage log */

/* ------------------------------------------------------------------------- */

/* No MD id message part */

#define CCCI_UTIL_DBG_MSG(fmt, args...) pr_notice("[ccci0/util]" fmt, ##args)

#define CCCI_UTIL_INF_MSG(fmt, args...) pr_notice("[ccci0/util]" fmt, ##args)

#define CCCI_UTIL_ERR_MSG(fmt, args...) pr_notice("[ccci0/util]" fmt, ##args)

#define CCCI_UTIL_DBG_MSG(fmt, args...) pr_debug("[ccci0/util]" fmt, ##args)

#define CCCI_UTIL_INF_MSG(fmt, args...) pr_debug("[ccci0/util]" fmt, ##args)

#define CCCI_UTIL_ERR_MSG(fmt, args...) pr_debug("[ccci0/util]" fmt, ##args)



/* With MD id message part */

#define CCCI_UTIL_DBG_MSG_WITH_ID(id, fmt, args...) \

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args)

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args)

#define CCCI_UTIL_INF_MSG_WITH_ID(id, fmt, args...) \

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args)

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args)

#define CCCI_UTIL_NOTICE_MSG_WITH_ID(id, fmt, args...) \

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args)

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args)

#define CCCI_UTIL_ERR_MSG_WITH_ID(id, fmt, args...) \

	pr_notice("[ccci%d/util]" fmt, (id+1), ##args)

	pr_debug("[ccci%d/util]" fmt, (id+1), ##args)





#endif /* end of #ifndef BRING_UP_LOG_MODE */

drivers/misc/mediatek/eccci/hif/ccci_hif_ccif.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline int ccci_ccif_hif_set_wakeup_src(unsigned char hif_id, int value) 


	if (md_ctrl) {

		que_bitmap = ccif_read32(md_ctrl->ccif_ap_base, APCCIF_RCHNUM);

		pr_notice("[ccci1/cif] CCIF wakeup channel: 0x%0x\n",

		pr_debug("[ccci1/cif] CCIF wakeup channel: 0x%0x\n",

			que_bitmap);

		if (que_bitmap != 0x1 << AP_MD_PEER_WAKEUP &&

			que_bitmap != 0x0)