Unverified Commit 6fbbc18e authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: SOF: Do not send cmd via SHIM register 



We use shim registers only to notify the other
side that a message was sent. The actual information
for the message is transmitted via mailbox.

cmd information inside shim register is not used by
the DSP, so we remove it to avoid confusion.

Signed-off-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5c9714f6

sound/soc/sof/intel/byt.c

+1 −4
Original line number Diff line number Diff line
@@ -373,13 +373,10 @@ static irqreturn_t byt_irq_thread(int irq, void *context) 


static int byt_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	u64 cmd = msg->header;



	/* send the message */

	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);

	snd_sof_dsp_write64(sdev, BYT_DSP_BAR, SHIM_IPCX,

			    cmd | SHIM_BYT_IPCX_BUSY);

	snd_sof_dsp_write64(sdev, BYT_DSP_BAR, SHIM_IPCX, SHIM_BYT_IPCX_BUSY);



	return 0;

}

sound/soc/sof/intel/cnl.c

+1 −3
Original line number Diff line number Diff line
@@ -151,13 +151,11 @@ static void cnl_ipc_dsp_done(struct snd_sof_dev *sdev) 
static int cnl_ipc_send_msg(struct snd_sof_dev *sdev,

			    struct snd_sof_ipc_msg *msg)

{

	u32 cmd = msg->header;



	/* send the message */

	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);

	snd_sof_dsp_write(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDR,

			  cmd | CNL_DSP_REG_HIPCIDR_BUSY);

			  CNL_DSP_REG_HIPCIDR_BUSY);



	return 0;

}

sound/soc/sof/intel/hda-ipc.c

+1 −3
Original line number Diff line number Diff line
@@ -56,13 +56,11 @@ static void hda_dsp_ipc_dsp_done(struct snd_sof_dev *sdev) 


int hda_dsp_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	u32 cmd = msg->header;



	/* send IPC message to DSP */

	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);

	snd_sof_dsp_write(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCI,

			  cmd | HDA_DSP_REG_HIPCI_BUSY);

			  HDA_DSP_REG_HIPCI_BUSY);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE