Unverified Commit e3105c0c authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Intel: HDA: Set IPC4-specific DSP ops for CaVS platforms 



Add implementation of low level, platform dependent IPC4 message handling
and set the DSP ops for IPC4 for APL, CNL and TGL platforms.

Co-developed-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220511171648.1622993-2-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/intel/apl.c

+13 −4
Original line number Diff line number Diff line
@@ -37,11 +37,20 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 
	/* probe/remove/shutdown */

	sof_apl_ops.shutdown	= hda_dsp_shutdown;



	if (sdev->pdata->ipc_type == SOF_IPC) {

		/* doorbell */

		sof_apl_ops.irq_thread	= hda_dsp_ipc_irq_thread;



		/* ipc */

		sof_apl_ops.send_msg	= hda_dsp_ipc_send_msg;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {

		sof_apl_ops.irq_thread	= hda_dsp_ipc4_irq_thread;



		/* ipc */

		sof_apl_ops.send_msg	= hda_dsp_ipc4_send_msg;

	}



	/* set DAI driver ops */

	hda_set_dai_drv_ops(sdev, &sof_apl_ops);

sound/soc/sof/intel/cnl.c

+93 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * Hardware interface for audio DSP on Cannonlake.

 */



#include <sound/sof/ipc4/header.h>

#include "../ops.h"

#include "hda.h"

#include "hda-ipc.h"
@@ -29,6 +30,68 @@ static const struct snd_sof_debugfs_map cnl_dsp_debugfs[] = { 
static void cnl_ipc_host_done(struct snd_sof_dev *sdev);

static void cnl_ipc_dsp_done(struct snd_sof_dev *sdev);



irqreturn_t cnl_ipc4_irq_thread(int irq, void *context)

{

	struct sof_ipc4_msg notification_data = {{ 0 }};

	struct snd_sof_dev *sdev = context;

	bool ipc_irq = false;

	u32 hipcida, hipctdr;



	hipcida = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDA);

	if (hipcida & CNL_DSP_REG_HIPCIDA_DONE) {

		/* DSP received the message */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR,

					CNL_DSP_REG_HIPCCTL,

					CNL_DSP_REG_HIPCCTL_DONE, 0);

		cnl_ipc_dsp_done(sdev);



		ipc_irq = true;

	}



	hipctdr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCTDR);

	if (hipctdr & CNL_DSP_REG_HIPCTDR_BUSY) {

		/* Message from DSP (reply or notification) */

		u32 hipctdd = snd_sof_dsp_read(sdev, HDA_DSP_BAR,

					       CNL_DSP_REG_HIPCTDD);

		u32 primary = hipctdr & CNL_DSP_REG_HIPCTDR_MSG_MASK;

		u32 extension = hipctdd & CNL_DSP_REG_HIPCTDD_MSG_MASK;



		if (primary & SOF_IPC4_MSG_DIR_MASK) {

			/* Reply received */

			struct sof_ipc4_msg *data = sdev->ipc->msg.reply_data;



			data->primary = primary;

			data->extension = extension;



			spin_lock_irq(&sdev->ipc_lock);



			snd_sof_ipc_get_reply(sdev);

			snd_sof_ipc_reply(sdev, data->primary);



			spin_unlock_irq(&sdev->ipc_lock);

		} else {

			/* Notification received */

			notification_data.primary = primary;

			notification_data.extension = extension;



			sdev->ipc->msg.rx_data = &notification_data;

			snd_sof_ipc_msgs_rx(sdev);

			sdev->ipc->msg.rx_data = NULL;

		}



		/* Let DSP know that we have finished processing the message */

		cnl_ipc_host_done(sdev);



		ipc_irq = true;

	}



	if (!ipc_irq)

		/* This interrupt is not shared so no need to return IRQ_NONE. */

		dev_dbg_ratelimited(sdev->dev, "nothing to do in IPC IRQ thread\n");



	return IRQ_HANDLED;

}



irqreturn_t cnl_ipc_irq_thread(int irq, void *context)

{

	struct snd_sof_dev *sdev = context;
@@ -176,6 +239,22 @@ static bool cnl_compact_ipc_compress(struct snd_sof_ipc_msg *msg, 
	return false;

}



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

{

	struct sof_ipc4_msg *msg_data = msg->msg_data;



	/* send the message via mailbox */

	if (msg_data->data_size)

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

				  msg_data->data_size);



	snd_sof_dsp_write(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDD, msg_data->extension);

	snd_sof_dsp_write(sdev, HDA_DSP_BAR, CNL_DSP_REG_HIPCIDR,

			  msg_data->primary | CNL_DSP_REG_HIPCIDR_BUSY);



	return 0;

}



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

{

	struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;
@@ -255,11 +334,21 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev) 
	/* probe/remove/shutdown */

	sof_cnl_ops.shutdown	= hda_dsp_shutdown;



	/* ipc */

	if (sdev->pdata->ipc_type == SOF_IPC) {

		/* doorbell */

		sof_cnl_ops.irq_thread	= cnl_ipc_irq_thread;



		/* ipc */

		sof_cnl_ops.send_msg	= cnl_ipc_send_msg;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {

		sof_cnl_ops.irq_thread	= cnl_ipc4_irq_thread;



		/* ipc */

		sof_cnl_ops.send_msg	= cnl_ipc4_send_msg;

	}



	/* set DAI driver ops */

	hda_set_dai_drv_ops(sdev, &sof_cnl_ops);

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

+82 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * Hardware interface for generic Intel audio DSP HDA IP

 */



#include <sound/sof/ipc4/header.h>

#include "../ops.h"

#include "hda.h"
@@ -65,6 +66,22 @@ int hda_dsp_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 
	return 0;

}



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

{

	struct sof_ipc4_msg *msg_data = msg->msg_data;



	/* send the message via mailbox */

	if (msg_data->data_size)

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

				  msg_data->data_size);



	snd_sof_dsp_write(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCIE, msg_data->extension);

	snd_sof_dsp_write(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCI,

			  msg_data->primary | HDA_DSP_REG_HIPCI_BUSY);



	return 0;

}



void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev)

{

	struct snd_sof_ipc_msg *msg = sdev->msg;
@@ -100,6 +117,71 @@ void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev) 
	}

}



irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context)

{

	struct sof_ipc4_msg notification_data = {{ 0 }};

	struct snd_sof_dev *sdev = context;

	bool ipc_irq = false;

	u32 hipcie, hipct;



	hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCIE);

	if (hipcie & HDA_DSP_REG_HIPCIE_DONE) {

		/* DSP received the message */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCCTL,

					HDA_DSP_REG_HIPCCTL_DONE, 0);

		hda_dsp_ipc_dsp_done(sdev);



		ipc_irq = true;

	}



	hipct = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCT);

	if (hipct & HDA_DSP_REG_HIPCT_BUSY) {

		/* Message from DSP (reply or notification) */

		u32 hipcte = snd_sof_dsp_read(sdev, HDA_DSP_BAR,

					      HDA_DSP_REG_HIPCTE);

		u32 primary = hipct & HDA_DSP_REG_HIPCT_MSG_MASK;

		u32 extension = hipcte & HDA_DSP_REG_HIPCTE_MSG_MASK;



		/* mask BUSY interrupt */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCCTL,

					HDA_DSP_REG_HIPCCTL_BUSY, 0);



		if (primary & SOF_IPC4_MSG_DIR_MASK) {

			/* Reply received */

			struct sof_ipc4_msg *data = sdev->ipc->msg.reply_data;



			data->primary = primary;

			data->extension = extension;



			spin_lock_irq(&sdev->ipc_lock);



			snd_sof_ipc_get_reply(sdev);

			snd_sof_ipc_reply(sdev, data->primary);



			spin_unlock_irq(&sdev->ipc_lock);

		} else {

			/* Notification received */



			notification_data.primary = primary;

			notification_data.extension = extension;

			sdev->ipc->msg.rx_data = &notification_data;

			snd_sof_ipc_msgs_rx(sdev);

			sdev->ipc->msg.rx_data = NULL;

		}



		/* Let DSP know that we have finished processing the message */

		hda_dsp_ipc_host_done(sdev);



		ipc_irq = true;

	}



	if (!ipc_irq)

		/* This interrupt is not shared so no need to return IRQ_NONE. */

		dev_dbg_ratelimited(sdev->dev, "nothing to do in IPC IRQ thread\n");



	return IRQ_HANDLED;

}



/* IPC handler thread */

irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)

{

sound/soc/sof/intel/hda.h

+6 −0
Original line number Diff line number Diff line
@@ -764,4 +764,10 @@ extern int sof_hda_position_quirk; 


void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops);



/* IPC4 */

irqreturn_t cnl_ipc4_irq_thread(int irq, void *context);

int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);

irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context);

int hda_dsp_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);



#endif

sound/soc/sof/intel/tgl.c

+14 −4
Original line number Diff line number Diff line
@@ -70,11 +70,21 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev) 
	/* probe/remove/shutdown */

	sof_tgl_ops.shutdown	= hda_dsp_shutdown;



	if (sdev->pdata->ipc_type == SOF_IPC) {

		/* doorbell */

		sof_tgl_ops.irq_thread	= cnl_ipc_irq_thread;



		/* ipc */

		sof_tgl_ops.send_msg	= cnl_ipc_send_msg;

	}



	if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {

		/* doorbell */

		sof_tgl_ops.irq_thread	= cnl_ipc4_irq_thread;



		/* ipc */

		sof_tgl_ops.send_msg	= cnl_ipc4_send_msg;

	}



	/* set DAI driver ops */

	hda_set_dai_drv_ops(sdev, &sof_tgl_ops);