Unverified Commit 0bd2891b authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: intel: Use the generic helper to get the reply 



Make use of the generic snd_sof_ipc_process_reply() from the core instead
the local implementation.
snd_sof_ipc_process_reply() handles the reply retrieving and the ipc reply

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20211116152137.52129-4-daniel.baluta@oss.nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 18c45f27

sound/soc/sof/intel/atom.c

+1 −42
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


static void atom_host_done(struct snd_sof_dev *sdev);

static void atom_dsp_done(struct snd_sof_dev *sdev);

static void atom_get_reply(struct snd_sof_dev *sdev);



/*

 * Debug
@@ -154,8 +153,7 @@ irqreturn_t atom_irq_thread(int irq, void *context) 
		 * because the done bit can't be set in cmd_done function

		 * which is triggered by msg

		 */

		atom_get_reply(sdev);

		snd_sof_ipc_reply(sdev, ipcx);

		snd_sof_ipc_process_reply(sdev, ipcx);



		atom_dsp_done(sdev);
@@ -195,45 +193,6 @@ int atom_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 
}

EXPORT_SYMBOL_NS(atom_send_msg, SND_SOC_SOF_INTEL_ATOM_HIFI_EP);



static void atom_get_reply(struct snd_sof_dev *sdev)

{

	struct snd_sof_ipc_msg *msg = sdev->msg;

	struct sof_ipc_reply reply;

	int ret = 0;



	/*

	 * Sometimes, there is unexpected reply ipc arriving. The reply

	 * ipc belongs to none of the ipcs sent from driver.

	 * In this case, the driver must ignore the ipc.

	 */

	if (!msg) {

		dev_warn(sdev->dev, "unexpected ipc interrupt raised!\n");

		return;

	}



	/* get reply */

	sof_mailbox_read(sdev, sdev->host_box.offset, &reply, sizeof(reply));



	if (reply.error < 0) {

		memcpy(msg->reply_data, &reply, sizeof(reply));

		ret = reply.error;

	} else {

		/* reply correct size ? */

		if (reply.hdr.size != msg->reply_size) {

			dev_err(sdev->dev, "error: reply expected %zu got %u bytes\n",

				msg->reply_size, reply.hdr.size);

			ret = -EINVAL;

		}



		/* read the message */

		if (msg->reply_size > 0)

			sof_mailbox_read(sdev, sdev->host_box.offset,

					 msg->reply_data, msg->reply_size);

	}



	msg->reply_error = ret;

}



int atom_get_mailbox_offset(struct snd_sof_dev *sdev)

{

	return MBOX_OFFSET;

sound/soc/sof/intel/bdw.c

+1 −42
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static const struct snd_sof_debugfs_map bdw_debugfs[] = { 


static void bdw_host_done(struct snd_sof_dev *sdev);

static void bdw_dsp_done(struct snd_sof_dev *sdev);

static void bdw_get_reply(struct snd_sof_dev *sdev);



/*

 * DSP Control.
@@ -326,8 +325,7 @@ static irqreturn_t bdw_irq_thread(int irq, void *context) 
		 * because the done bit can't be set in cmd_done function

		 * which is triggered by msg

		 */

		bdw_get_reply(sdev);

		snd_sof_ipc_reply(sdev, ipcx);

		snd_sof_ipc_process_reply(sdev, ipcx);



		bdw_dsp_done(sdev);
@@ -372,45 +370,6 @@ static int bdw_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 
	return 0;

}



static void bdw_get_reply(struct snd_sof_dev *sdev)

{

	struct snd_sof_ipc_msg *msg = sdev->msg;

	struct sof_ipc_reply reply;

	int ret = 0;



	/*

	 * Sometimes, there is unexpected reply ipc arriving. The reply

	 * ipc belongs to none of the ipcs sent from driver.

	 * In this case, the driver must ignore the ipc.

	 */

	if (!msg) {

		dev_warn(sdev->dev, "unexpected ipc interrupt raised!\n");

		return;

	}



	/* get reply */

	sof_mailbox_read(sdev, sdev->host_box.offset, &reply, sizeof(reply));



	if (reply.error < 0) {

		memcpy(msg->reply_data, &reply, sizeof(reply));

		ret = reply.error;

	} else {

		/* reply correct size ? */

		if (reply.hdr.size != msg->reply_size) {

			dev_err(sdev->dev, "error: reply expected %zu got %u bytes\n",

				msg->reply_size, reply.hdr.size);

			ret = -EINVAL;

		}



		/* read the message */

		if (msg->reply_size > 0)

			sof_mailbox_read(sdev, sdev->host_box.offset,

					 msg->reply_data, msg->reply_size);

	}



	msg->reply_error = ret;

}



static int bdw_get_mailbox_offset(struct snd_sof_dev *sdev)

{

	return MBOX_OFFSET;

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

+2 −27
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev) 
	struct snd_sof_ipc_msg *msg = sdev->msg;

	struct sof_ipc_reply reply;

	struct sof_ipc_cmd_hdr *hdr;

	int ret = 0;



	/*

	 * Sometimes, there is unexpected reply ipc arriving. The reply
@@ -94,35 +93,11 @@ void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev) 
		reply.hdr.cmd = SOF_IPC_GLB_REPLY;

		reply.hdr.size = sizeof(reply);

		memcpy(msg->reply_data, &reply, sizeof(reply));

		goto out;

	}



	/* get IPC reply from DSP in the mailbox */

	sof_mailbox_read(sdev, sdev->host_box.offset, &reply,

			 sizeof(reply));



	if (reply.error < 0) {

		memcpy(msg->reply_data, &reply, sizeof(reply));

		ret = reply.error;

		msg->reply_error = 0;

	} else {

		/* reply correct size ? */

		if (reply.hdr.size != msg->reply_size &&

		    /* getter payload is never known upfront */

		    ((reply.hdr.cmd & SOF_GLB_TYPE_MASK) != SOF_IPC_GLB_PROBE)) {

			dev_err(sdev->dev, "error: reply expected %zu got %u bytes\n",

				msg->reply_size, reply.hdr.size);

			ret = -EINVAL;

		snd_sof_ipc_get_reply(sdev);

	}



		/* read the message */

		if (msg->reply_size > 0)

			sof_mailbox_read(sdev, sdev->host_box.offset,

					 msg->reply_data, msg->reply_size);

	}



out:

	msg->reply_error = ret;



}



/* IPC handler thread */