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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20211116152137.52129-4-daniel.baluta@oss.nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/atom.c b/sound/soc/sof/intel/atom.c
index 74c630bb9847185f952a16ee72c0908768dec765..cdc96a7df4937768c9ab030c53fa6108bd1353fe 100644 (file)
--- a/sound/soc/sof/intel/atom.c
+++ b/sound/soc/sof/intel/atom.c
@@ -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;

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 2c09a523288e55ba38513f899cde58d488269c1d..156006bed01749b16be4b79b4d9e7bdd4eaa6d8f 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -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;

diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
index 11f20a5a62dfaf8401b14c0ce2a6d2a1359ff4ac..2019087a84cecc49ad1a512aa81267efd399d9e2 100644 (file)
--- a/sound/soc/sof/intel/hda-ipc.c
+++ b/sound/soc/sof/intel/hda-ipc.c
@@ -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;
-               }
-
-               /* read the message */
-               if (msg->reply_size > 0)
-                       sof_mailbox_read(sdev, sdev->host_box.offset,
-                                        msg->reply_data, msg->reply_size);
+               snd_sof_ipc_get_reply(sdev);
        }
-
-out:
-       msg->reply_error = ret;
-
 }
 
 /* IPC handler thread */