Merge "msm: ipa4: Remove IPA registers dump from dmesg" (5eec577f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v3/ipa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4279,7 +4279,7 @@ static int ipa3_panic_notifier(struct notifier_block *this,
		IPAERR("uC panic handler failed %d\n", res);

		if (atomic_read(&ipa3_ctx->ipa3_active_clients.cnt) != 0)
		ipahal_print_all_regs();
		ipahal_print_all_regs(false);

		return NOTIFY_DONE;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1952,7 +1952,7 @@ static ssize_t ipa3_read_ipahal_regs(struct file file, char __user ubuf,
		size_t count, loff_t *ppos)
		{
		IPA_ACTIVE_CLIENTS_INC_SIMPLE();
		ipahal_print_all_regs();
		ipahal_print_all_regs(true);
		IPA_ACTIVE_CLIENTS_DEC_SIMPLE();

		return 0;

+8 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,14 @@
		" %s:%d " fmt, ## args); \
		} while (0)

		#define IPAHAL_DBG_REG_IPC_ONLY(fmt, args...) \
		do { \
		IPA_IPC_LOGGING(ipa_get_ipc_logbuf(), \
		" %s:%d " fmt, ## args); \
		IPA_IPC_LOGGING(ipa_get_ipc_logbuf_low(), \
		" %s:%d " fmt, ## args); \
		} while (0)

		#define IPAHAL_ERR_RL(fmt, args...) \
		do { \
		pr_err_ratelimited_ipa(IPAHAL_DRV_NAME " %s:%d " fmt, \

+11 −4

Original line number	Diff line number	Diff line
		@@ -2237,7 +2237,7 @@ static struct ipahal_reg_obj ipahal_reg_objs[IPA_HW_MAX][IPA_REG_MAX] = {
		0x00000CC0, 0x70, 10, 23, 1},
		};

		int ipahal_print_all_regs(void)
		int ipahal_print_all_regs(bool print_to_dmesg)
		{
		int i, j;

		@@ -2256,9 +2256,16 @@ int ipahal_print_all_regs(void)

		j = ipahal_reg_objs[ipahal_ctx->hw_type][i].n_start;

		if (j == ipahal_reg_objs[ipahal_ctx->hw_type][i].n_end)
		IPAHAL_DBG_REG("%s=0x%x\n", ipahal_reg_name_str(i),
		if (j == ipahal_reg_objs[ipahal_ctx->hw_type][i].n_end) {
		if (print_to_dmesg)
		IPAHAL_DBG_REG("%s=0x%x\n",
		ipahal_reg_name_str(i),
		ipahal_read_reg_n(i, j));
		else
		IPAHAL_DBG_REG_IPC_ONLY("%s=0x%x\n",
		ipahal_reg_name_str(i),
		ipahal_read_reg_n(i, j));
		}

		for (; j < ipahal_reg_objs[ipahal_ctx->hw_type][i].n_end; j++)
		IPAHAL_DBG_REG("%s_%u=0x%x\n", ipahal_reg_name_str(i),

+1 −1

Original line number	Diff line number	Diff line
		@@ -524,7 +524,7 @@ struct ipahal_ep_cfg_ctrl_scnd {
		};


		int ipahal_print_all_regs(void);
		int ipahal_print_all_regs(bool print_to_dmesg);

		/*
		* ipahal_reg_name_str() - returns string that represent the register