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

Commit 0f0ad996 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sps: Update debug message format specifier"

parents 6e2982a7 5fa0d3c2

drivers/platform/msm/sps/bam.c

+54 −54
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static inline u32 bam_get_register_offset(void *base, enum bam_regs reg, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}
@@ -756,7 +756,7 @@ static inline u32 bam_read_reg(void *base, enum bam_regs reg, u32 param) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}
@@ -767,7 +767,7 @@ static inline u32 bam_read_reg(void *base, enum bam_regs reg, u32 param) 
		return offset;

	}

	val = ioread32(dev->base + offset);

	SPS_DBG(dev, "sps:bam 0x%p(va) offset 0x%x reg 0x%x r_val 0x%x.\n",

	SPS_DBG(dev, "sps:bam 0x%pK(va) offset 0x%x reg 0x%x r_val 0x%x.\n",

			dev->base, offset, reg, val);

	return val;

}
@@ -788,7 +788,7 @@ static inline u32 bam_read_reg_field(void *base, enum bam_regs reg, u32 param, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}
@@ -802,7 +802,7 @@ static inline u32 bam_read_reg_field(void *base, enum bam_regs reg, u32 param, 
	val = ioread32(dev->base + offset);

	val &= mask;		/* clear other bits */

	val >>= shift;

	SPS_DBG(dev, "sps:bam 0x%p(va) read reg 0x%x mask 0x%x r_val 0x%x.\n",

	SPS_DBG(dev, "sps:bam 0x%pK(va) read reg 0x%x mask 0x%x r_val 0x%x.\n",

			dev->base, offset, mask, val);

	return val;

}
@@ -823,7 +823,7 @@ static inline void bam_write_reg(void *base, enum bam_regs reg, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}
@@ -834,7 +834,7 @@ static inline void bam_write_reg(void *base, enum bam_regs reg, 
		return;

	}

	iowrite32(val, dev->base + offset);

	SPS_DBG(dev, "sps:bam 0x%p(va) write reg 0x%x w_val 0x%x.\n",

	SPS_DBG(dev, "sps:bam 0x%pK(va) write reg 0x%x w_val 0x%x.\n",

			dev->base, offset, val);

}
@@ -854,7 +854,7 @@ static inline void bam_write_reg_field(void *base, enum bam_regs reg, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}
@@ -870,7 +870,7 @@ static inline void bam_write_reg_field(void *base, enum bam_regs reg, 
	tmp &= ~mask;		/* clear written bits */

	val = tmp | (val << shift);

	iowrite32(val, dev->base + offset);

	SPS_DBG(dev, "sps:bam 0x%p(va) write reg 0x%x w_val 0x%x.\n",

	SPS_DBG(dev, "sps:bam 0x%pK(va) write reg 0x%x w_val 0x%x.\n",

			dev->base, offset, val);

}
@@ -888,29 +888,29 @@ int bam_init(void *base, u32 ee, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}



	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%p(va).ee=%d.", __func__,

	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%pK(va).ee=%d.", __func__,

			BAM_ID(dev), dev->base, ee);



	ver = bam_read_reg_field(base, REVISION, 0, BAM_REVISION);



	if ((ver < BAM_MIN_VERSION) || (ver > BAM_MAX_VERSION)) {

		SPS_ERR(dev, "sps:bam 0x%p(va) Invalid BAM REVISION 0x%x.\n",

		SPS_ERR(dev, "sps:bam 0x%pK(va) Invalid BAM REVISION 0x%x.\n",

				dev->base, ver);

		return -ENODEV;

	}



	SPS_DBG(dev, "sps:REVISION of BAM 0x%p is 0x%x.\n",

	SPS_DBG(dev, "sps:REVISION of BAM 0x%pK is 0x%x.\n",

				dev->base, ver);



	if (summing_threshold == 0) {

		summing_threshold = 4;

		SPS_ERR(dev,

			"sps:bam 0x%p(va) summing_threshold is zero,use default 4.\n",

			"sps:bam 0x%pK(va) summing_threshold is zero,use default 4.\n",

			dev->base);

	}
@@ -1010,12 +1010,12 @@ int bam_security_init(void *base, u32 ee, u32 vmid, u32 pipe_mask) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}



	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%p(va).", __func__,

	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%pK(va).", __func__,

			BAM_ID(dev), dev->base);



	/*
@@ -1026,14 +1026,14 @@ int bam_security_init(void *base, u32 ee, u32 vmid, u32 pipe_mask) 
	num_pipes = bam_read_reg_field(base, NUM_PIPES, 0, BAM_NUM_PIPES);

	if (version < 3 || version > 0x1F) {

		SPS_ERR(dev,

			"sps:bam 0x%p(va) security is not supported for this BAM version 0x%x.\n",

			"sps:bam 0x%pK(va) security is not supported for this BAM version 0x%x.\n",

			dev->base, version);

		return -ENODEV;

	}



	if (num_pipes > BAM_MAX_PIPES) {

		SPS_ERR(dev,

		"sps:bam 0x%p(va) the number of pipes is more than the maximum number allowed.\n",

		"sps:bam 0x%pK(va) the number of pipes is more than the maximum number allowed.\n",

			dev->base);

		return -ENODEV;

	}
@@ -1081,12 +1081,12 @@ int bam_check(void *base, u32 *version, u32 ee, u32 *num_pipes) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}



	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%p(va).",

	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%pK(va).",

			__func__, BAM_ID(dev), dev->base);



	if (!enhd_pipe)
@@ -1095,7 +1095,7 @@ int bam_check(void *base, u32 *version, u32 ee, u32 *num_pipes) 
		enabled = bam_get_pipe_attr(base, ee, true);



	if (!enabled) {

		SPS_ERR(dev, "sps:%s:bam 0x%p(va) is not enabled.\n",

		SPS_ERR(dev, "sps:%s:bam 0x%pK(va) is not enabled.\n",

				__func__, dev->base);

		return -ENODEV;

	}
@@ -1111,7 +1111,7 @@ int bam_check(void *base, u32 *version, u32 ee, u32 *num_pipes) 


	/* Check BAM version */

	if ((ver < BAM_MIN_VERSION) || (ver > BAM_MAX_VERSION)) {

		SPS_ERR(dev, "sps:%s:bam 0x%p(va) Invalid BAM version 0x%x.\n",

		SPS_ERR(dev, "sps:%s:bam 0x%pK(va) Invalid BAM version 0x%x.\n",

				__func__, dev->base, ver);

		return -ENODEV;

	}
@@ -1128,11 +1128,11 @@ void bam_exit(void *base, u32 ee) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%p(va).ee=%d.",

	SPS_DBG3(dev, "sps:%s:bam=%pa 0x%pK(va).ee=%d.",

			__func__, BAM_ID(dev), dev->base, ee);



	bam_write_reg_field(base, IRQ_SRCS_MSK_EE, ee, BAM_IRQ, 0);
@@ -1156,7 +1156,7 @@ void bam_output_register_content(void *base, u32 ee) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}
@@ -1167,7 +1167,7 @@ void bam_output_register_content(void *base, u32 ee) 


	num_pipes = bam_read_reg_field(base, NUM_PIPES, 0,

					BAM_NUM_PIPES);

	SPS_INFO(dev, "sps:bam %pa 0x%p(va) has %d pipes.",

	SPS_INFO(dev, "sps:bam %pa 0x%pK(va) has %d pipes.",

			BAM_ID(dev), dev->base, num_pipes);



	pipe_attr = enhd_pipe ?
@@ -1194,7 +1194,7 @@ u32 bam_check_irq_source(void *base, u32 ee, u32 mask, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}
@@ -1208,26 +1208,26 @@ u32 bam_check_irq_source(void *base, u32 ee, u32 mask, 


		if (status & IRQ_STTS_BAM_ERROR_IRQ) {

			SPS_ERR(dev,

				"sps:bam %pa 0x%p(va);bam irq status=0x%x.\nsps: BAM_ERROR_IRQ\n",

				"sps:bam %pa 0x%pK(va);bam irq status=0x%x.\nsps: BAM_ERROR_IRQ\n",

				BAM_ID(dev), dev->base, status);

			bam_output_register_content(base, ee);

			*cb_case = SPS_CALLBACK_BAM_ERROR_IRQ;

		} else if (status & IRQ_STTS_BAM_HRESP_ERR_IRQ) {

			SPS_ERR(dev,

				"sps:bam %pa 0x%p(va);bam irq status=0x%x.\nsps: BAM_HRESP_ERR_IRQ\n",

				"sps:bam %pa 0x%pK(va);bam irq status=0x%x.\nsps: BAM_HRESP_ERR_IRQ\n",

				BAM_ID(dev), dev->base, status);

			bam_output_register_content(base, ee);

			*cb_case = SPS_CALLBACK_BAM_HRESP_ERR_IRQ;

#ifdef CONFIG_SPS_SUPPORT_NDP_BAM

		} else if (status & IRQ_STTS_BAM_TIMER_IRQ) {

			SPS_DBG1(dev,

				"sps:bam 0x%p(va);receive BAM_TIMER_IRQ\n",

				"sps:bam 0x%pK(va);receive BAM_TIMER_IRQ\n",

					dev->base);

			*cb_case = SPS_CALLBACK_BAM_TIMER_IRQ;

#endif

		} else

			SPS_INFO(dev,

				"sps:bam %pa 0x%p(va);bam irq status=0x%x.\n",

				"sps:bam %pa 0x%pK(va);bam irq status=0x%x.\n",

				BAM_ID(dev), dev->base, status);



		bam_write_reg(base, IRQ_CLR, 0, status);
@@ -1245,11 +1245,11 @@ void bam_pipe_reset(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%p(va).pipe=%d.",

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%pK(va).pipe=%d.",

			__func__, BAM_ID(dev), dev->base, pipe);



	bam_write_reg(base, P_RST, pipe, 1);
@@ -1266,11 +1266,11 @@ void bam_disable_pipe(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev, "sps:%s:bam=0x%p(va).pipe=%d.", __func__, base, pipe);

	SPS_DBG2(dev, "sps:%s:bam=0x%pK(va).pipe=%d.", __func__, base, pipe);

	bam_write_reg_field(base, P_CTRL, pipe, P_EN, 0);

	wmb(); /* ensure pipe is disabled */

}
@@ -1283,20 +1283,20 @@ bool bam_pipe_check_zlt(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return false;

	}



	if (bam_read_reg_field(base, P_HALT, pipe, P_HALT_P_LAST_DESC_ZLT)) {

		SPS_DBG(dev,

			"sps:%s:bam=0x%p(va).pipe=%d: the last desc is ZLT.",

			"sps:%s:bam=0x%pK(va).pipe=%d: the last desc is ZLT.",

			__func__, base, pipe);

		return true;

	}



	SPS_DBG(dev,

		"sps:%s:bam=0x%p(va).pipe=%d: the last desc is not ZLT.",

		"sps:%s:bam=0x%pK(va).pipe=%d: the last desc is not ZLT.",

		__func__, base, pipe);

	return false;

}
@@ -1309,20 +1309,20 @@ bool bam_pipe_check_pipe_empty(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return false;

	}



	if (bam_read_reg_field(base, P_HALT, pipe, P_HALT_P_PIPE_EMPTY)) {

		SPS_DBG(dev,

			"sps:%s:bam=0x%p(va).pipe=%d: desc FIFO is empty.",

			"sps:%s:bam=0x%pK(va).pipe=%d: desc FIFO is empty.",

			__func__, base, pipe);

		return true;

	}



	SPS_DBG(dev,

		"sps:%s:bam=0x%p(va).pipe=%d: desc FIFO is not empty.",

		"sps:%s:bam=0x%pK(va).pipe=%d: desc FIFO is not empty.",

		__func__, base, pipe);

	return false;

}
@@ -1336,11 +1336,11 @@ int bam_pipe_init(void *base, u32 pipe, struct bam_pipe_parameters *param, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return SPS_ERROR;

	}

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%p(va).pipe=%d.",

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%pK(va).pipe=%d.",

			__func__, BAM_ID(dev), dev->base, pipe);



	/* Reset the BAM pipe */
@@ -1374,7 +1374,7 @@ int bam_pipe_init(void *base, u32 pipe, struct bam_pipe_parameters *param, 
	bam_write_reg_field(base, P_CTRL, pipe, P_LOCK_GROUP,

				param->lock_group);



	SPS_DBG(dev, "sps:bam=0x%p(va).pipe=%d.lock_group=%d.\n",

	SPS_DBG(dev, "sps:bam=0x%pK(va).pipe=%d.lock_group=%d.\n",

			dev->base, pipe, param->lock_group);

#endif
@@ -1391,7 +1391,7 @@ int bam_pipe_init(void *base, u32 pipe, struct bam_pipe_parameters *param, 
		bam_write_reg(base, P_EVNT_DEST_ADDR, pipe, peer_dest_addr);



		SPS_DBG2(dev,

			"sps:bam=0x%p(va).pipe=%d.peer_bam=0x%x.peer_pipe=%d.\n",

			"sps:bam=0x%pK(va).pipe=%d.peer_bam=0x%x.peer_pipe=%d.\n",

			dev->base, pipe,

			(u32) param->peer_phys_addr,

			param->peer_pipe);
@@ -1426,11 +1426,11 @@ void bam_pipe_exit(void *base, u32 pipe, u32 ee) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%p(va).pipe=%d.",

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%pK(va).pipe=%d.",

			__func__, BAM_ID(dev), dev->base, pipe);



	bam_write_reg(base, P_IRQ_EN, pipe, 0);
@@ -1451,15 +1451,15 @@ void bam_pipe_enable(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%p(va).pipe=%d.",

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%pK(va).pipe=%d.",

			__func__, BAM_ID(dev), dev->base, pipe);



	if (bam_read_reg_field(base, P_CTRL, pipe, P_EN))

		SPS_DBG2(dev, "sps:bam=0x%p(va).pipe=%d is already enabled.\n",

		SPS_DBG2(dev, "sps:bam=0x%pK(va).pipe=%d is already enabled.\n",

				dev->base, pipe);

	else

		bam_write_reg_field(base, P_CTRL, pipe, P_EN, 1);
@@ -1474,11 +1474,11 @@ void bam_pipe_disable(void *base, u32 pipe) 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%p(va).pipe=%d.",

	SPS_DBG2(dev, "sps:%s:bam=%pa 0x%pK(va).pipe=%d.",

			__func__, BAM_ID(dev), dev->base, pipe);



	bam_write_reg_field(base, P_CTRL, pipe, P_EN, 0);
@@ -1503,12 +1503,12 @@ void bam_pipe_set_irq(void *base, u32 pipe, enum bam_enable irq_en, 
	struct sps_bam *dev = to_sps_bam_dev(base);



	if ((dev == NULL) || (&dev->base != base)) {

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%p\n",

		SPS_ERR(sps, "%s:Failed to get dev for base addr 0x%pK\n",

				__func__, base);

		return;

	}

	SPS_DBG2(dev,

		"sps:%s:bam=%pa 0x%p(va).pipe=%d; irq_en:%d; src_mask:0x%x; ee:%d.\n",

		"sps:%s:bam=%pa 0x%pK(va).pipe=%d; irq_en:%d; src_mask:0x%x; ee:%d.\n",

			__func__, BAM_ID(dev), dev->base, pipe,

			irq_en, src_mask, ee);

	if (src_mask & BAM_PIPE_IRQ_RST_ERROR) {

drivers/platform/msm/sps/sps.c

+2 −2
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static int sps_device_init(void) 
		goto exit_err;

	}



	SPS_DBG3(sps, "sps:bamdma_bam.phys=%pa.virt=0x%p.",

	SPS_DBG3(sps, "sps:bamdma_bam.phys=%pa.virt=0x%pK.",

		&bamdma_props.phys_addr,

		bamdma_props.virt_addr);
@@ -960,7 +960,7 @@ static int sps_device_init(void) 
		goto exit_err;

	}



	SPS_DBG3(sps, "sps:bamdma_dma.phys=%pa.virt=0x%p.",

	SPS_DBG3(sps, "sps:bamdma_dma.phys=%pa.virt=0x%pK.",

		&bamdma_props.periph_phys_addr,

		bamdma_props.periph_virt_addr);

drivers/platform/msm/sps/sps_bam.c

+3 −3
Original line number Diff line number Diff line
@@ -512,12 +512,12 @@ int sps_bam_enable(struct sps_bam *dev) 
		if (dev->props.logging_number > 0)

			dev->props.logging_number--;

		SPS_INFO(dev,

			"sps:BAM %pa (va:0x%p) enabled: ver:0x%x, number of pipes:%d\n",

			"sps:BAM %pa (va:0x%pK) enabled: ver:0x%x, number of pipes:%d\n",

			BAM_ID(dev), dev->base, dev->version,

			dev->props.num_pipes);

	} else

		SPS_DBG3(dev,

			"sps:BAM %pa (va:0x%p) enabled: ver:0x%x, number of pipes:%d\n",

			"sps:BAM %pa (va:0x%pK) enabled: ver:0x%x, number of pipes:%d\n",

			BAM_ID(dev), dev->base, dev->version,

			dev->props.num_pipes);
@@ -2134,7 +2134,7 @@ int sps_bam_pipe_get_event(struct sps_bam *dev, 


	if (pipe->sys.no_queue) {

		SPS_ERR(dev,

			"sps:Invalid connection for event: BAM %pa pipe %d context 0x%p\n",

			"sps:Invalid connection for event: BAM %pa pipe %d context 0x%pK\n",

			BAM_ID(dev), pipe_index, pipe);

		notify->event_id = SPS_EVENT_INVALID;

		return SPS_ERROR;

drivers/platform/msm/sps/sps_mem.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, 2015, 2017, The Linux Foundation. All rights

 * reserved.

/* Copyright (c) 2011-2013, 2015, 2017, 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
@@ -129,7 +129,7 @@ int sps_mem_init(phys_addr_t pipemem_phys_base, u32 pipemem_size) 


		iomem_offset = 0;

		SPS_DBG(sps,

			"sps:%s.iomem_phys=%pa,iomem_virt=0x%p.",

			"sps:%s.iomem_phys=%pa,iomem_virt=0x%pK.",

			__func__, &iomem_phys, iomem_virt);

	}

drivers/platform/msm/sps/sps_rm.c

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ int sps_rm_state_change(struct sps_pipe *pipe, u32 state) 
	    state == SPS_STATE_ALLOCATE) {

		if (sps_rm_alloc(pipe)) {

			SPS_ERR(pipe->bam,

				"sps:Fail to allocate resource for BAM 0x%p pipe %d.\n",

				"sps:Fail to allocate resource for BAM 0x%pK pipe %d.\n",

					pipe->bam, pipe->pipe_index);

			return SPS_ERROR;

		}
@@ -746,7 +746,7 @@ int sps_rm_state_change(struct sps_pipe *pipe, u32 state) 
		result = sps_bam_pipe_connect(pipe, &params);

		if (result) {

			SPS_ERR(pipe->bam,

				"sps:Failed to connect BAM 0x%p pipe %d",

				"sps:Failed to connect BAM 0x%pK pipe %d",

					pipe->bam, pipe->pipe_index);

			return SPS_ERROR;

		}