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

Commit 0f2675de authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 6bf0d2c0 8b4497fd

drivers/platform/msm/sps/sps.c

+17 −13
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2019, 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
@@ -675,7 +675,8 @@ int sps_get_bam_debug_info(unsigned long dev, u32 option, u32 para, 
	/* Search for the target BAM device */

	bam = sps_h2bam(dev);

	if (bam == NULL) {

		pr_err("sps:Can't find any BAM with handle 0x%lx.", dev);

		pr_err("sps:Can't find any BAM with handle 0x%pK.",

					(void *)dev);

		mutex_unlock(&sps->lock);

		return SPS_ERROR;

	}
@@ -1226,7 +1227,7 @@ struct sps_bam *sps_h2bam(unsigned long h) 
{

	struct sps_bam *bam;



	SPS_DBG1(sps, "sps:%s: BAM handle:0x%lx.", __func__, h);

	SPS_DBG1(sps, "sps:%s: BAM handle:0x%pK.", __func__, (void *)h);



	if (h == SPS_DEV_HANDLE_MEM || h == SPS_DEV_HANDLE_INVALID)

		return NULL;
@@ -1236,7 +1237,7 @@ struct sps_bam *sps_h2bam(unsigned long h) 
			return bam;

	}



	SPS_ERR(sps, "sps:Can't find BAM device for handle 0x%lx.", h);

	SPS_ERR(sps, "sps:Can't find BAM device for handle 0x%pK.", (void *)h);



	return NULL;

}
@@ -1341,17 +1342,18 @@ int sps_connect(struct sps_pipe *h, struct sps_connect *connect) 


	bam = sps_h2bam(dev);

	if (bam == NULL) {

		SPS_ERR(sps, "sps:Invalid BAM device handle: 0x%lx", dev);

		SPS_ERR(sps, "sps:Invalid BAM device handle: 0x%pK",

					(void *)dev);

		result = SPS_ERROR;

		goto exit_err;

	}



	mutex_lock(&bam->lock);

	SPS_DBG2(bam, "sps:%s: bam %pa src 0x%lx dest 0x%lx mode %s",

	SPS_DBG2(bam, "sps:%s: bam %pa src 0x%pK dest 0x%pK mode %s",

			__func__,

			BAM_ID(bam),

			connect->source,

			connect->destination,

			(void *)connect->source,

			(void *)connect->destination,

			connect->mode == SPS_MODE_SRC ? "SRC" : "DEST");



	/* Allocate resources for the specified connection */
@@ -1415,11 +1417,11 @@ int sps_disconnect(struct sps_pipe *h) 
	}



	SPS_DBG2(bam,

		"sps:%s: bam %pa src 0x%lx dest 0x%lx mode %s",

		"sps:%s: bam %pa src 0x%pK dest 0x%pK mode %s",

		__func__,

		BAM_ID(bam),

		pipe->connect.source,

		pipe->connect.destination,

		(void *)pipe->connect.source,

		(void *)pipe->connect.destination,

		pipe->connect.mode == SPS_MODE_SRC ? "SRC" : "DEST");



	result = SPS_ERROR;
@@ -1815,7 +1817,8 @@ int sps_device_reset(unsigned long dev) 
	/* Search for the target BAM device */

	bam = sps_h2bam(dev);

	if (bam == NULL) {

		SPS_ERR(sps, "sps:Invalid BAM device handle: 0x%lx", dev);

		SPS_ERR(sps, "sps:Invalid BAM device handle: 0x%pK",

					(void *)dev);

		result = SPS_ERROR;

		goto exit_err;

	}
@@ -1826,7 +1829,8 @@ int sps_device_reset(unsigned long dev) 
	result = sps_bam_reset(bam);

	mutex_unlock(&bam->lock);

	if (result) {

		SPS_ERR(sps, "sps:Fail to reset BAM device: 0x%lx", dev);

		SPS_ERR(sps, "sps:Fail to reset BAM device: 0x%pK",

					(void *)dev);

		goto exit_err;

	}

drivers/platform/msm/sps/sps_bam.c

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

/* Copyright (c) 2011-2017, 2019, 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
@@ -888,8 +888,8 @@ int sps_bam_pipe_connect(struct sps_pipe *bam_pipe, 
			else

				iova = bam_pipe->connect.source_iova;

			SPS_DBG2(dev,

				"sps:BAM %pa pipe %d uses IOVA 0x%lx.\n",

				 BAM_ID(dev), pipe_index, iova);

				"sps:BAM %pa pipe %d uses IOVA 0x%pK.\n",

				 BAM_ID(dev), pipe_index, (void *)iova);

			hw_params.peer_phys_addr = (u32)iova;

		} else {

			hw_params.peer_phys_addr = peer_bam->props.phys_addr;
@@ -911,9 +911,9 @@ int sps_bam_pipe_connect(struct sps_pipe *bam_pipe, 
			hw_params.data_base =

				(phys_addr_t)bam_pipe->connect.data.iova;

			SPS_DBG2(dev,

				"sps:BAM %pa pipe %d uses IOVA 0x%lx for data FIFO.\n",

				"sps:BAM %pa pipe %d uses IOVA 0x%pK for data FIFO.\n",

				 BAM_ID(dev), pipe_index,

				 bam_pipe->connect.data.iova);

				 (void *)(bam_pipe->connect.data.iova));

		} else {

			hw_params.data_base = map->data.phys_base;

		}
@@ -964,9 +964,9 @@ int sps_bam_pipe_connect(struct sps_pipe *bam_pipe, 
			hw_params.desc_base =

				(phys_addr_t)bam_pipe->connect.desc.iova;

			SPS_DBG2(dev,

				"sps:BAM %pa pipe %d uses IOVA 0x%lx for desc FIFO.\n",

				"sps:BAM %pa pipe %d uses IOVA 0x%pK for desc FIFO.\n",

				 BAM_ID(dev), pipe_index,

				 bam_pipe->connect.desc.iova);

				 (void *)(bam_pipe->connect.desc.iova));

		} else {

			hw_params.desc_base = map->desc.phys_base;

		}
@@ -1417,8 +1417,9 @@ int sps_bam_pipe_transfer_one(struct sps_bam *dev, 
	u32 next_write;

	static int show_recom;



	SPS_DBG(dev, "sps:BAM %pa pipe %d addr 0x%x size 0x%x flags 0x%x\n",

			BAM_ID(dev), pipe_index, addr, size, flags);

	SPS_DBG(dev, "sps:BAM %pa pipe %d addr 0x%pK size 0x%x flags 0x%x\n",

			BAM_ID(dev), pipe_index,

			(void *)(long)addr, size, flags);



	/* Is this a BAM-to-BAM or satellite connection? */

	if ((pipe->state & (BAM_STATE_BAM2BAM | BAM_STATE_REMOTE))) {
@@ -1944,8 +1945,8 @@ static void pipe_handler_eot(struct sps_bam *dev, struct sps_pipe *pipe) 
	user = &pipe->sys.user_ptrs[offset / sizeof(struct sps_iovec)];

	for (;;) {

		SPS_DBG(dev,

			"sps:%s; pipe index:%d; iovec addr:0x%x; size:0x%x; flags:0x%x; enabled:0x%x; *user is %s NULL.\n",

			__func__, pipe->pipe_index, cache->addr,

			"sps:%s; pipe index:%d; iovec addr:0x%pK; size:0x%x; flags:0x%x; enabled:0x%x; *user is %s NULL.\n",

			__func__, pipe->pipe_index, (void *)(long)cache->addr,

			cache->size, cache->flags, enabled,

			(*user == NULL) ? "" : "not");
@@ -2233,8 +2234,8 @@ int sps_bam_pipe_get_iovec(struct sps_bam *dev, u32 pipe_index, 
		pipe->sys.acked_offset = 0;



	SPS_DBG(dev,

		"sps:%s; pipe index:%d; iovec addr:0x%x; size:0x%x; flags:0x%x; acked_offset:0x%x.\n",

		__func__, pipe->pipe_index, desc->addr,

		"sps:%s; pipe index:%d; iovec addr:0x%pK; size:0x%x; flags:0x%x; acked_offset:0x%x.\n",

		__func__, pipe->pipe_index, (void *)(long)desc->addr,

		desc->size, desc->flags, pipe->sys.acked_offset);



	return 0;

drivers/platform/msm/sps/sps_dma.c

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

/* Copyright (c) 2011-2013, 2015, 2017, 2019, The Linux Foundation. All rights

 * reserved.

 *

 * This program is free software; you can redistribute it and/or modify
@@ -381,7 +381,7 @@ int sps_dma_device_de_init(unsigned long h) 


	dev = sps_dma_find_device(h);

	if (dev == NULL) {

		SPS_ERR(sps, "sps:BAM-DMA: not registered: %lx", h);

		SPS_ERR(sps, "sps:BAM-DMA: not registered: %pK", (void *)h);

		result = SPS_ERROR;

		goto exit_err;

	}
@@ -547,8 +547,8 @@ int sps_alloc_dma_chan(const struct sps_alloc_dma_chan *alloc, 


	dev = sps_dma_find_device(alloc->dev);

	if (dev == NULL) {

		SPS_ERR(sps, "sps:BAM-DMA: invalid BAM handle: %lx",

							alloc->dev);

		SPS_ERR(sps, "sps:BAM-DMA: invalid BAM handle: %pK",

							(void *)alloc->dev);

		goto exit_err;

	}
@@ -621,7 +621,8 @@ int sps_free_dma_chan(struct sps_dma_chan *chan) 


	dev = sps_dma_find_device(chan->dev);

	if (dev == NULL) {

		SPS_ERR(sps, "sps:BAM-DMA: invalid BAM handle: %lx", chan->dev);

		SPS_ERR(sps, "sps:BAM-DMA: invalid BAM handle: %pK",

			(void *)chan->dev);

		result = SPS_ERROR;

		goto exit_err;

	}

drivers/platform/msm/sps/sps_mem.c

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

/* Copyright (c) 2011-2013, 2015, 2017, 2019, The Linux Foundation.

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify
@@ -75,8 +75,8 @@ phys_addr_t sps_mem_alloc_io(u32 bytes) 
		return SPS_ADDR_INVALID;

	}



	SPS_DBG3(sps, "sps:%s.phys=%pa.virt=0x%lx.size=0x%x.",

		__func__, &phys_addr, virt_addr, bytes);

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

		__func__, &phys_addr, (void *)virt_addr, bytes);



	return phys_addr;

}
@@ -92,8 +92,8 @@ void sps_mem_free_io(phys_addr_t phys_addr, u32 bytes) 
	iomem_offset = phys_addr - iomem_phys;

	virt_addr = (uintptr_t) iomem_virt + iomem_offset;



	SPS_DBG3(sps, "sps:%s.phys=%pa.virt=0x%lx.size=0x%x.",

		__func__, &phys_addr, virt_addr, bytes);

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

		__func__, &phys_addr, (void *)virt_addr, bytes);



	gen_pool_free(pool, virt_addr, bytes);

	total_free += bytes;

drivers/platform/msm/sps/sps_rm.c

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

/* Copyright (c) 2011-2015, 2017-2019, 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
@@ -398,8 +398,8 @@ static struct sps_connection *sps_rm_create(struct sps_pipe *pipe) 
	map->src.bam = sps_h2bam(map->src.dev);

	if (map->src.bam == NULL) {

		if (map->src.dev != SPS_DEV_HANDLE_MEM) {

			SPS_ERR(sps, "sps:Invalid BAM handle: %pa",

							&map->src.dev);

			SPS_ERR(sps, "sps:Invalid BAM handle: %pK",

					(void *)(&map->src.dev));

			goto exit_err;

		}

		map->src.pipe_index = SPS_BAM_PIPE_INVALID;
@@ -407,8 +407,8 @@ static struct sps_connection *sps_rm_create(struct sps_pipe *pipe) 
	map->dest.bam = sps_h2bam(map->dest.dev);

	if (map->dest.bam == NULL) {

		if (map->dest.dev != SPS_DEV_HANDLE_MEM) {

			SPS_ERR(sps, "sps:Invalid BAM handle: %pa",

							&map->dest.dev);

			SPS_ERR(sps, "sps:Invalid BAM handle: %pK",

					(void *)(&map->dest.dev));

			goto exit_err;

		}

		map->dest.pipe_index = SPS_BAM_PIPE_INVALID;
@@ -417,8 +417,8 @@ static struct sps_connection *sps_rm_create(struct sps_pipe *pipe) 
	/* Check the BAM device for the pipe */

	if ((dir == SPS_MODE_SRC && map->src.bam == NULL) ||

	    (dir != SPS_MODE_SRC && map->dest.bam == NULL)) {

		SPS_ERR(sps, "sps:Invalid BAM endpt: dir %d src %pa dest %pa",

			dir, &map->src.dev, &map->dest.dev);

		SPS_ERR(sps, "sps:Invalid BAM endpt: dir %d src %pK dest %pK",

			dir, (void *)(&map->src.dev), (void *)(&map->dest.dev));

		goto exit_err;

	}