Merge "ASoC: msm: qdsp6v2: Change audio drivers to use %pK" (8096a67d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/qdsp6v2/apr.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -496,7 +496,7 @@ void apr_cb_func(void buf, int len, void priv)
	pr_debug("\n*****************\n");		pr_debug("\n*****************\n");

	if (!buf \|\| len <= APR_HDR_SIZE) {		if (!buf \|\| len <= APR_HDR_SIZE) {
	pr_err("APR: Improper apr pkt received:%p %d\n", buf, len);		pr_err("APR: Improper apr pkt received:%pK %d\n", buf, len);
	return;		return;
	}		}
	hdr = buf;		hdr = buf;
	@@ -584,7 +584,7 @@ void apr_cb_func(void buf, int len, void priv)
	return;		return;
	}		}
	pr_debug("svc_idx = %d\n", i);		pr_debug("svc_idx = %d\n", i);
	pr_debug("%x %x %x %p %p\n", c_svc->id, c_svc->dest_id,		pr_debug("%x %x %x %pK %pK\n", c_svc->id, c_svc->dest_id,
	c_svc->client_id, c_svc->fn, c_svc->priv);		c_svc->client_id, c_svc->fn, c_svc->priv);
	data.payload_size = hdr->pkt_size - hdr_size;		data.payload_size = hdr->pkt_size - hdr_size;
	data.opcode = hdr->opcode;		data.opcode = hdr->opcode;
	@@ -648,7 +648,7 @@ static void apr_reset_deregister(struct work_struct *work)
	container_of(work, struct apr_reset_work, work);		container_of(work, struct apr_reset_work, work);

	handle = apr_reset->handle;		handle = apr_reset->handle;
	pr_debug("%s:handle[%p]\n", __func__, handle);		pr_debug("%s:handle[%pK]\n", __func__, handle);
	apr_deregister(handle);		apr_deregister(handle);
	kfree(apr_reset);		kfree(apr_reset);
	}		}
	@@ -681,7 +681,7 @@ int apr_deregister(void *handle)
	client[dest_id][client_id].svc_cnt--;		client[dest_id][client_id].svc_cnt--;
	if (!client[dest_id][client_id].svc_cnt) {		if (!client[dest_id][client_id].svc_cnt) {
	svc->need_reset = 0x0;		svc->need_reset = 0x0;
	pr_debug("%s: service is reset %p\n", __func__, svc);		pr_debug("%s: service is reset %pK\n", __func__, svc);
	}		}
	}		}

	@@ -709,7 +709,7 @@ void apr_reset(void *handle)

	if (!handle)		if (!handle)
	return;		return;
	pr_debug("%s: handle[%p]\n", __func__, handle);		pr_debug("%s: handle[%pK]\n", __func__, handle);

	if (apr_reset_workqueue == NULL) {		if (apr_reset_workqueue == NULL) {
	pr_err("%s: apr_reset_workqueue is NULL\n", __func__);		pr_err("%s: apr_reset_workqueue is NULL\n", __func__);

drivers/soc/qcom/qdsp6v2/msm_audio_ion.c

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -157,11 +157,11 @@ int msm_audio_ion_alloc(const char name, struct ion_client *client,
	pr_err("%s: ION memory mapping for AUDIO failed\n", __func__);		pr_err("%s: ION memory mapping for AUDIO failed\n", __func__);
	goto err_ion_handle;		goto err_ion_handle;
	}		}
	pr_debug("%s: mapped address = %p, size=%zd\n", __func__,		pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
	*vaddr, bufsz);		*vaddr, bufsz);

	if (bufsz != 0) {		if (bufsz != 0) {
	pr_debug("%s: memset to 0 %p %zd\n", __func__, *vaddr, bufsz);		pr_debug("%s: memset to 0 %pK %zd\n", __func__, *vaddr, bufsz);
	memset((void )vaddr, 0, bufsz);		memset((void )vaddr, 0, bufsz);
	}		}

	@@ -208,7 +208,7 @@ int msm_audio_ion_import(const char name, struct ion_client *client,
	bufsz should be 0 and fd shouldn't be 0 as of now		bufsz should be 0 and fd shouldn't be 0 as of now
	*/		*/
	handle = ion_import_dma_buf(client, fd);		handle = ion_import_dma_buf(client, fd);
	pr_debug("%s: DMA Buf name=%s, fd=%d handle=%p\n", __func__,		pr_debug("%s: DMA Buf name=%s, fd=%d handle=%pK\n", __func__,
	name, fd, *handle);		name, fd, *handle);
	if (IS_ERR_OR_NULL((void ) (handle))) {		if (IS_ERR_OR_NULL((void ) (handle))) {
	pr_err("%s: ion import dma buffer failed\n",		pr_err("%s: ion import dma buffer failed\n",
	@@ -239,7 +239,7 @@ int msm_audio_ion_import(const char name, struct ion_client *client,
	rc = -ENOMEM;		rc = -ENOMEM;
	goto err_ion_handle;		goto err_ion_handle;
	}		}
	pr_debug("%s: mapped address = %p, size=%zd\n", __func__,		pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
	*vaddr, bufsz);		*vaddr, bufsz);

	return 0;		return 0;
	@@ -321,7 +321,7 @@ int msm_audio_ion_mmap(struct audio_buffer *ab,
	offset = 0;		offset = 0;
	}		}
	len = min(len, remainder);		len = min(len, remainder);
	pr_debug("vma=%p, addr=%x len=%ld vm_start=%x vm_end=%x vm_page_prot=%ld\n",		pr_debug("vma=%pK, addr=%x len=%ld vm_start=%x vm_end=%x vm_page_prot=%ld\n",
	vma, (unsigned int)addr, len,		vma, (unsigned int)addr, len,
	(unsigned int)vma->vm_start,		(unsigned int)vma->vm_start,
	(unsigned int)vma->vm_end,		(unsigned int)vma->vm_end,
	@@ -344,8 +344,8 @@ int msm_audio_ion_mmap(struct audio_buffer *ab,
	, __func__ , ret);		, __func__ , ret);
	return ret;		return ret;
	}		}
	pr_debug("phys=%pa len=%zd\n", &phys_addr, phys_len);		pr_debug("phys=%pK len=%zd\n", &phys_addr, phys_len);
	pr_debug("vma=%p, vm_start=%x vm_end=%x vm_pgoff=%ld vm_page_prot=%ld\n",		pr_debug("vma=%pK, vm_start=%x vm_end=%x vm_pgoff=%ld vm_page_prot=%ld\n",
	vma, (unsigned int)vma->vm_start,		vma, (unsigned int)vma->vm_start,
	(unsigned int)vma->vm_end, vma->vm_pgoff,		(unsigned int)vma->vm_end, vma->vm_pgoff,
	(unsigned long int)vma->vm_page_prot);		(unsigned long int)vma->vm_page_prot);
	@@ -380,7 +380,7 @@ struct ion_client msm_audio_ion_client_create(const char name)

	void msm_audio_ion_client_destroy(struct ion_client *client)		void msm_audio_ion_client_destroy(struct ion_client *client)
	{		{
	pr_debug("%s: client = %p smmu_enabled = %d\n", __func__,		pr_debug("%s: client = %pK smmu_enabled = %d\n", __func__,
	client, msm_audio_ion_data.smmu_enabled);		client, msm_audio_ion_data.smmu_enabled);

	ion_client_destroy(client);		ion_client_destroy(client);
	@@ -402,7 +402,7 @@ int msm_audio_ion_import_legacy(const char name, struct ion_client client,
	bufsz should be 0 and fd shouldn't be 0 as of now		bufsz should be 0 and fd shouldn't be 0 as of now
	*/		*/
	*handle = ion_import_dma_buf(client, fd);		*handle = ion_import_dma_buf(client, fd);
	pr_debug("%s: DMA Buf name=%s, fd=%d handle=%p\n", __func__,		pr_debug("%s: DMA Buf name=%s, fd=%d handle=%pK\n", __func__,
	name, fd, *handle);		name, fd, *handle);
	if (IS_ERR_OR_NULL((void )(handle))) {		if (IS_ERR_OR_NULL((void )(handle))) {
	pr_err("%s: ion import dma buffer failed\n",		pr_err("%s: ion import dma buffer failed\n",
	@@ -468,7 +468,7 @@ int msm_audio_ion_cache_operations(struct audio_buffer *abuff, int cache_op)
	int msm_cache_ops = 0;		int msm_cache_ops = 0;

	if (!abuff) {		if (!abuff) {
	pr_err("Invalid params: %p, %p\n", __func__, abuff);		pr_err("%s: Invalid params: %pK\n", __func__, abuff);
	return -EINVAL;		return -EINVAL;
	}		}
	rc = ion_handle_get_flags(abuff->client, abuff->handle,		rc = ion_handle_get_flags(abuff->client, abuff->handle,
	@@ -641,7 +641,7 @@ static int msm_audio_dma_buf_unmap(struct ion_client *client,

	if (!found) {		if (!found) {
	dev_err(cb_dev,		dev_err(cb_dev,
	"%s: cannot find allocation, ion_handle %p, ion_client %p",		"%s: cannot find allocation, ion_handle %pK, ion_client %pK",
	__func__, handle, client);		__func__, handle, client);
	rc = -EINVAL;		rc = -EINVAL;
	}		}
	@@ -671,7 +671,7 @@ static int msm_audio_ion_get_phys(struct ion_client *client,
	rc = ion_phys(client, handle, addr, len);		rc = ion_phys(client, handle, addr, len);
	}		}

	pr_debug("phys=%pa, len=%zd, rc=%d\n", &(addr), len, rc);		pr_debug("phys=%pK, len=%zd, rc=%d\n", &(addr), len, rc);
	err:		err:
	return rc;		return rc;
	}		}

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -633,7 +633,7 @@ static struct cal_block_data create_cal_block(struct cal_type_data cal_type,
	goto err;		goto err;
	}		}
	cal_block->buffer_number = basic_cal->cal_hdr.buffer_number;		cal_block->buffer_number = basic_cal->cal_hdr.buffer_number;
	pr_debug("%s: created block for cal type %d, buf num %d, map handle %d, map size %zd paddr 0x%pa!\n",		pr_debug("%s: created block for cal type %d, buf num %d, map handle %d, map size %zd paddr 0x%pK!\n",
	__func__, cal_type->info.reg.cal_type,		__func__, cal_type->info.reg.cal_type,
	cal_block->buffer_number,		cal_block->buffer_number,
	cal_block->map_data.ion_map_handle,		cal_block->map_data.ion_map_handle,

sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c

+8 −8

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2117,7 +2117,7 @@ static int msm_compr_get_caps(struct snd_compr_stream *cstream,
	memcpy(arg, &prtd->compr_cap, sizeof(struct snd_compr_caps));		memcpy(arg, &prtd->compr_cap, sizeof(struct snd_compr_caps));
	} else {		} else {
	ret = -EINVAL;		ret = -EINVAL;
	pr_err("%s: arg (0x%p), prtd (0x%p)\n", __func__, arg, prtd);		pr_err("%s: arg (0x%pK), prtd (0x%pK)\n", __func__, arg, prtd);
	}		}

	return ret;		return ret;

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -187,7 +187,7 @@ static void compr_event_handler(uint32_t opcode,
	pr_debug("%s:writing %d bytes of buffer[%d] to dsp 2\n",		pr_debug("%s:writing %d bytes of buffer[%d] to dsp 2\n",
	__func__, prtd->pcm_count, prtd->out_head);		__func__, prtd->pcm_count, prtd->out_head);
	temp = buf[0].phys + (prtd->out_head * prtd->pcm_count);		temp = buf[0].phys + (prtd->out_head * prtd->pcm_count);
	pr_debug("%s:writing buffer[%d] from 0x%pa\n",		pr_debug("%s:writing buffer[%d] from 0x%pK\n",
	__func__, prtd->out_head, &temp);		__func__, prtd->out_head, &temp);

	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)		if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
	@@ -238,7 +238,7 @@ static void compr_event_handler(uint32_t opcode,
	break;		break;
	case ASM_DATA_EVENT_READ_DONE_V2: {		case ASM_DATA_EVENT_READ_DONE_V2: {
	pr_debug("ASM_DATA_EVENT_READ_DONE\n");		pr_debug("ASM_DATA_EVENT_READ_DONE\n");
	pr_debug("buf = %p, data = 0x%X, *data = %p,\n"		pr_debug("buf = %pK, data = 0x%X, *data = %pK,\n"
	"prtd->pcm_irq_pos = %d\n",		"prtd->pcm_irq_pos = %d\n",
	prtd->audio_client->port[OUT].buf,		prtd->audio_client->port[OUT].buf,
	(uint32_t )prtd->audio_client->port[OUT].buf->data,		(uint32_t )prtd->audio_client->port[OUT].buf->data,
	@@ -248,7 +248,7 @@ static void compr_event_handler(uint32_t opcode,
	memcpy(prtd->audio_client->port[OUT].buf->data +		memcpy(prtd->audio_client->port[OUT].buf->data +
	prtd->pcm_irq_pos, (ptrmem + READDONE_IDX_SIZE),		prtd->pcm_irq_pos, (ptrmem + READDONE_IDX_SIZE),
	COMPRE_CAPTURE_HEADER_SIZE);		COMPRE_CAPTURE_HEADER_SIZE);
	pr_debug("buf = %p, updated data = 0x%X, *data = %p\n",		pr_debug("buf = %pK, updated data = 0x%X, *data = %pK\n",
	prtd->audio_client->port[OUT].buf,		prtd->audio_client->port[OUT].buf,
	(uint32_t )(prtd->audio_client->port[OUT].buf->data +		(uint32_t )(prtd->audio_client->port[OUT].buf->data +
	prtd->pcm_irq_pos),		prtd->pcm_irq_pos),
	@@ -264,7 +264,7 @@ static void compr_event_handler(uint32_t opcode,
	}		}
	buf = prtd->audio_client->port[OUT].buf;		buf = prtd->audio_client->port[OUT].buf;

	pr_debug("pcm_irq_pos=%d, buf[0].phys = 0x%pa\n",		pr_debug("pcm_irq_pos=%d, buf[0].phys = 0x%pK\n",
	prtd->pcm_irq_pos, &buf[0].phys);		prtd->pcm_irq_pos, &buf[0].phys);
	read_param.len = prtd->pcm_count - COMPRE_CAPTURE_HEADER_SIZE;		read_param.len = prtd->pcm_count - COMPRE_CAPTURE_HEADER_SIZE;
	read_param.paddr = buf[0].phys +		read_param.paddr = buf[0].phys +
	@@ -290,7 +290,7 @@ static void compr_event_handler(uint32_t opcode,
	pr_debug("%s: writing %d bytes of buffer[%d] to dsp\n",		pr_debug("%s: writing %d bytes of buffer[%d] to dsp\n",
	__func__, prtd->pcm_count, prtd->out_head);		__func__, prtd->pcm_count, prtd->out_head);
	buf = prtd->audio_client->port[IN].buf;		buf = prtd->audio_client->port[IN].buf;