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

Commit 8ac4cbb4 authored by Banajit Goswami's avatar Banajit Goswami
Browse files

ASoC: msm: qdsp6v2: Add LPAE support 



APQ8084 supports 64-bit addressing for all physical addresses. All
references to physical addresses should be as per LPAE specification

Change-Id: Ic4a7d494ee129e0ad68d8ec97c40931f5d74935d
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 1e6f19ab

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

+2 −2
Original line number Diff line number Diff line
@@ -899,10 +899,10 @@ static int msm_compr_hw_params(struct snd_pcm_substream *substream, 
	dma_buf->addr =  buf[0].phys;

	dma_buf->bytes = runtime->hw.buffer_bytes_max;



	pr_debug("%s: buf[%p]dma_buf->area[%p]dma_buf->addr[%p]\n"

	pr_debug("%s: buf[%p]dma_buf->area[%p]dma_buf->addr[%pa]\n"

		 "dma_buf->bytes[%d]\n", __func__,

		 (void *)buf, (void *)dma_buf->area,

		 (void *)dma_buf->addr, dma_buf->bytes);

		 &dma_buf->addr, dma_buf->bytes);

	if (!dma_buf->area)

		return -ENOMEM;

sound/soc/msm/qdsp6v2/msm-pcm-host-voice-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -504,9 +504,9 @@ static int hpcm_allocate_shared_memory(struct hpcm_drv *prtd) 


	sess->tp_mem_table.size = sizeof(struct vss_imemory_table_t);



	pr_debug("%s: data 0x%x phys 0x%x\n", __func__,

	pr_debug("%s: data 0x%x phys %pa\n", __func__,

		 (unsigned int) sess->tp_mem_table.data,

		 sess->tp_mem_table.phys);

		 &sess->tp_mem_table.phys);



	/* Split 4096 block into four 1024 byte blocks for each dai */

	txtp->capture_dai_data.vocpcm_ion_buffer.paddr =

sound/soc/msm/qdsp6v2/q6afe.c

+4 −4
Original line number Diff line number Diff line
@@ -1923,9 +1923,9 @@ int q6afe_audio_client_buf_alloc_contiguous(unsigned int dir, 
			buf[cnt].used = dir ^ 1;

			buf[cnt].size = bufsz;

			buf[cnt].actual_size = bufsz;

			pr_debug("%s data[%p]phys[%p][%p]\n", __func__,

			pr_debug("%s data[%p]phys[%pa][%p]\n", __func__,

				   (void *)buf[cnt].data,

				   (void *)buf[cnt].phys,

				   &buf[cnt].phys,

				   (void *)&buf[cnt].phys);

		}

		cnt++;
@@ -2118,10 +2118,10 @@ int q6afe_audio_client_buf_free_contiguous(unsigned int dir, 
	cnt = port->max_buf_cnt - 1;



	if (port->buf[0].data) {

		pr_debug("%s:data[%p]phys[%p][%p] , client[%p] handle[%p]\n",

		pr_debug("%s:data[%p]phys[%pa][%p] , client[%p] handle[%p]\n",

			__func__,

			(void *)port->buf[0].data,

			(void *)port->buf[0].phys,

			&port->buf[0].phys,

			(void *)&port->buf[0].phys,

			(void *)port->buf[0].client,

			(void *)port->buf[0].handle);

sound/soc/msm/qdsp6v2/q6asm.c

+18 −18
Original line number Diff line number Diff line
@@ -688,10 +688,10 @@ int q6asm_audio_client_buf_free_contiguous(unsigned int dir, 
	}



	if (port->buf[0].data) {

		pr_debug("%s:data[%p]phys[%p][%p] , client[%p] handle[%p]\n",

		pr_debug("%s:data[%p]phys[%pa][%p] , client[%p] handle[%p]\n",

			__func__,

			(void *)port->buf[0].data,

			(void *)port->buf[0].phys,

			&port->buf[0].phys,

			(void *)&port->buf[0].phys,

			(void *)port->buf[0].client,

			(void *)port->buf[0].handle);
@@ -923,10 +923,10 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, 
					buf[cnt].used = 1;

					buf[cnt].size = bufsz;

					buf[cnt].actual_size = bufsz;

					pr_debug("%s data[%p]phys[%p][%p]\n",

					pr_debug("%s data[%p]phys[%pa][%p]\n",

						__func__,

					   (void *)buf[cnt].data,

					   (void *)buf[cnt].phys,

					   &buf[cnt].phys,

					   (void *)&buf[cnt].phys);

					cnt++;

				}
@@ -1016,9 +1016,9 @@ int q6asm_audio_client_buf_alloc_contiguous(unsigned int dir, 
			buf[cnt].used = dir ^ 1;

			buf[cnt].size = bufsz;

			buf[cnt].actual_size = bufsz;

			pr_debug("%s data[%p]phys[%p][%p]\n", __func__,

			pr_debug("%s data[%p]phys[%pa][%p]\n", __func__,

				   (void *)buf[cnt].data,

				   (void *)buf[cnt].phys,

				   &buf[cnt].phys,

				   (void *)&buf[cnt].phys);

		}

		cnt++;
@@ -1288,8 +1288,8 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv) 
			spin_lock_irqsave(&port->dsp_lock, dsp_flags);

			if (port->buf[data->token].phys !=

				payload[0]) {

				pr_err("Buf expected[%p]rxed[%p]\n",\

				   (void *)port->buf[data->token].phys,\

				pr_err("Buf expected[%pa]rxed[%p]\n",

				   &port->buf[data->token].phys,

				   (void *)payload[0]);

				spin_unlock_irqrestore(&port->dsp_lock,

								dsp_flags);
@@ -1345,8 +1345,8 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv) 
			port->buf[token].used = 0;

			if (port->buf[token].phys !=

				payload[READDONE_IDX_BUFADD_LSW]) {

				pr_err("Buf expected[%p]rxed[%p]\n",\

				   (void *)port->buf[token].phys,\

				pr_err("Buf expected[%pa]rxed[%p]\n",

				   &port->buf[token].phys,

				   (void *)payload[READDONE_IDX_BUFADD_LSW]);

				spin_unlock_irqrestore(&port->dsp_lock,

							dsp_flags);
@@ -3477,13 +3477,13 @@ int q6asm_read(struct audio_client *ac) 
		dsp_buf = port->dsp_buf;

		ab = &port->buf[dsp_buf];



		pr_debug("%s:session[%d]dsp-buf[%d][%p]cpu_buf[%d][%p]\n",

		pr_debug("%s:session[%d]dsp-buf[%d][%p]cpu_buf[%d][%pa]\n",

					__func__,

					ac->session,

					dsp_buf,

					(void *)port->buf[dsp_buf].data,

					port->cpu_buf,

					(void *)port->buf[port->cpu_buf].phys);

					&port->buf[port->cpu_buf].phys);



		read.hdr.opcode = ASM_DATA_CMD_READ_V2;

		read.buf_addr_lsw = ab->phys;
@@ -3539,13 +3539,13 @@ int q6asm_read_nolock(struct audio_client *ac) 
		dsp_buf = port->dsp_buf;

		ab = &port->buf[dsp_buf];



		pr_debug("%s:session[%d]dsp-buf[%d][%p]cpu_buf[%d][%p]\n",

		pr_debug("%s:session[%d]dsp-buf[%d][%p]cpu_buf[%d][%pa]\n",

					__func__,

					ac->session,

					dsp_buf,

					(void *)port->buf[dsp_buf].data,

					port->cpu_buf,

					(void *)port->buf[port->cpu_buf].phys);

					&port->buf[port->cpu_buf].phys);



		read.hdr.opcode = ASM_DATA_CMD_READ_V2;

		read.buf_addr_lsw = ab->phys;
@@ -3757,9 +3757,9 @@ int q6asm_write(struct audio_client *ac, uint32_t len, uint32_t msw_ts, 
						list);

		write.mem_map_handle = buf_node->mmap_hdl;



		pr_debug("%s:ab->phys[0x%x]bufadd[0x%x] token[0x%x]buf_id[0x%x]buf_size[0x%x]mmaphdl[0x%x]"

		pr_debug("%s:ab->phys[%pa]bufadd[0x%x] token[0x%x]buf_id[0x%x]buf_size[0x%x]mmaphdl[0x%x]"

						, __func__,

						ab->phys,

						&ab->phys,

						write.buf_addr_lsw,

						write.hdr.token,

						write.seq_id,
@@ -3824,9 +3824,9 @@ int q6asm_write_nolock(struct audio_client *ac, uint32_t len, uint32_t msw_ts, 
			write.flags = (0x80000000 | flags);

		port->dsp_buf = (port->dsp_buf + 1) & (port->max_buf_cnt - 1);



		pr_debug("%s:ab->phys[0x%x]bufadd[0x%x]token[0x%x] buf_id[0x%x]buf_size[0x%x]mmaphdl[0x%x]"

		pr_debug("%s:ab->phys[%pa]bufadd[0x%x]token[0x%x] buf_id[0x%x]buf_size[0x%x]mmaphdl[0x%x]"

							, __func__,

							ab->phys,

							&ab->phys,

							write.buf_addr_lsw,

							write.hdr.token,

							write.seq_id,

sound/soc/msm/qdsp6v2/q6voice.c

+17 −17
Original line number Diff line number Diff line
@@ -3499,8 +3499,8 @@ static int voice_send_cvs_packet_exchange_config_cmd(struct voice_data *v) 
	struct vss_istream_cmd_set_oob_packet_exchange_config_t

						 packet_exchange_config_pkt;

	int ret = 0;

	uint64_t *dec_buf;

	uint64_t *enc_buf;

	phys_addr_t dec_buf;

	phys_addr_t enc_buf;

	void *apr_cvs;

	u16 cvs_handle;
@@ -3508,8 +3508,8 @@ static int voice_send_cvs_packet_exchange_config_cmd(struct voice_data *v) 
		pr_err("%s: v is NULL\n", __func__);

		return -EINVAL;

	}

	dec_buf = (uint64_t *)v->shmem_info.sh_buf.buf[0].phys;

	enc_buf = (uint64_t *)v->shmem_info.sh_buf.buf[1].phys;

	dec_buf = (phys_addr_t)v->shmem_info.sh_buf.buf[0].phys;

	enc_buf = (phys_addr_t)v->shmem_info.sh_buf.buf[1].phys;



	apr_cvs = common.apr_q6_cvs;
@@ -3538,11 +3538,11 @@ static int voice_send_cvs_packet_exchange_config_cmd(struct voice_data *v) 
	packet_exchange_config_pkt.enc_buf_addr = (uint32_t)enc_buf;

	packet_exchange_config_pkt.enc_buf_size = 4096;



	pr_debug("%s: dec buf: add %p, size %d, enc buf: add %p, size %d\n",

	pr_debug("%s: dec buf: add %pa, size %d, enc buf: add %pa, size %d\n",

		__func__,

		dec_buf,

		&dec_buf,

		packet_exchange_config_pkt.dec_buf_size,

		enc_buf,

		&enc_buf,

		packet_exchange_config_pkt.enc_buf_size);



	v->cvs_state = CMD_STATUS_FAIL;
@@ -5579,15 +5579,15 @@ static int voice_alloc_oob_shared_mem(void) 
		cnt++;

	}



	pr_debug("%s buf[0].data:[%p], buf[0].phys:[%p], &buf[0].phys:[%p],\n",

	pr_debug("%s buf[0].data:[%p], buf[0].phys:[%pa], &buf[0].phys:[%p],\n",

		 __func__,

		(void *)v->shmem_info.sh_buf.buf[0].data,

		(void *)v->shmem_info.sh_buf.buf[0].phys,

		&v->shmem_info.sh_buf.buf[0].phys,

		(void *)&v->shmem_info.sh_buf.buf[0].phys);

	pr_debug("%s: buf[1].data:[%p], buf[1].phys[%p], &buf[1].phys[%p]\n",

	pr_debug("%s: buf[1].data:[%p], buf[1].phys[%pa], &buf[1].phys[%p]\n",

		__func__,

		(void *)v->shmem_info.sh_buf.buf[1].data,

		(void *)v->shmem_info.sh_buf.buf[1].phys,

		&v->shmem_info.sh_buf.buf[1].phys,

		(void *)&v->shmem_info.sh_buf.buf[1].phys);



	memset((void *)v->shmem_info.sh_buf.buf[0].data, 0, (bufsz * bufcnt));
@@ -5626,9 +5626,9 @@ static int voice_alloc_oob_mem_table(void) 
	}



	v->shmem_info.memtbl.size = sizeof(struct vss_imemory_table_t);

	pr_debug("%s data[%p]phys[%p][%p]\n", __func__,

	pr_debug("%s data[%p]phys[%pa][%p]\n", __func__,

		 (void *)v->shmem_info.memtbl.data,

		 (void *)v->shmem_info.memtbl.phys,

		 &v->shmem_info.memtbl.phys,

		 (void *)&v->shmem_info.memtbl.phys);



done:
@@ -5876,9 +5876,9 @@ static int voice_alloc_cal_mem_map_table(void) 
	}



	common.cal_mem_map_table.size = sizeof(struct vss_imemory_table_t);

	pr_debug("%s: data 0x%x phys 0x%x\n", __func__,

	pr_debug("%s: data 0x%x phys %pa\n", __func__,

		 (unsigned int) common.cal_mem_map_table.data,

		 common.cal_mem_map_table.phys);

		 &common.cal_mem_map_table.phys);



done:

	return ret;
@@ -5903,9 +5903,9 @@ static int voice_alloc_rtac_mem_map_table(void) 
	}



	common.rtac_mem_map_table.size = sizeof(struct vss_imemory_table_t);

	pr_debug("%s: data 0x%x phys 0x%x\n", __func__,

	pr_debug("%s: data 0x%x phys %pa\n", __func__,

		 (unsigned int) common.rtac_mem_map_table.data,

		 common.rtac_mem_map_table.phys);

		 &common.rtac_mem_map_table.phys);



done:

	return ret;