Unverified Commit 9362ab78 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: add abstraction for SoundWire wake-ups 



The existing code cannot work for LunarLake, let's add a layer of
abstraction.

No functional change in this patch.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20230807210959.506849-17-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.read_sdw_lcount =  hda_sdw_check_lcount_common,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_sdw_wakeen_irq = hda_sdw_check_wakeen_irq_common,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,
@@ -501,6 +502,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.read_sdw_lcount =  hda_sdw_check_lcount_common,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_sdw_wakeen_irq = hda_sdw_check_wakeen_irq_common,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,

sound/soc/sof/intel/hda.c

+15 −5
Original line number Diff line number Diff line
@@ -399,14 +399,10 @@ static irqreturn_t hda_dsp_sdw_thread(int irq, void *context) 
	return sdw_intel_thread(irq, context);

}



static bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

bool hda_sdw_check_wakeen_irq_common(struct snd_sof_dev *sdev)

{

	u32 interface_mask = hda_get_interface_mask(sdev);

	struct sof_intel_hda_dev *hdev;



	if (!(interface_mask & BIT(SOF_DAI_INTEL_ALH)))

		return false;



	hdev = sdev->pdata->hw_pdata;

	if (hdev->sdw &&

	    snd_sof_dsp_read(sdev, HDA_DSP_BAR,
@@ -416,6 +412,20 @@ static bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev) 
	return false;

}



static bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

{

	u32 interface_mask = hda_get_interface_mask(sdev);

	const struct sof_intel_dsp_desc *chip;



	if (!(interface_mask & BIT(SOF_DAI_INTEL_ALH)))

		return false;



	if (chip && chip->check_sdw_wakeen_irq)

		return chip->check_sdw_wakeen_irq(sdev);



	return false;

}



void hda_sdw_process_wakeen(struct snd_sof_dev *sdev)

{

	u32 interface_mask = hda_get_interface_mask(sdev);

sound/soc/sof/intel/hda.h

+6 −0
Original line number Diff line number Diff line
@@ -785,6 +785,7 @@ int hda_sdw_check_lcount_ext(struct snd_sof_dev *sdev); 
int hda_sdw_startup(struct snd_sof_dev *sdev);

void hda_common_enable_sdw_irq(struct snd_sof_dev *sdev, bool enable);

void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable);

bool hda_sdw_check_wakeen_irq_common(struct snd_sof_dev *sdev);

void hda_sdw_process_wakeen(struct snd_sof_dev *sdev);

bool hda_common_check_sdw_irq(struct snd_sof_dev *sdev);
@@ -813,6 +814,11 @@ static inline void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable) 
{

}



static inline bool hda_sdw_check_wakeen_irq_common(struct snd_sof_dev *sdev)

{

	return false;

}



static inline void hda_sdw_process_wakeen(struct snd_sof_dev *sdev)

{

}

sound/soc/sof/intel/icl.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	.read_sdw_lcount =  hda_sdw_check_lcount_common,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_sdw_wakeen_irq = hda_sdw_check_wakeen_irq_common,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,

sound/soc/sof/intel/mtl.c

+1 −0
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ const struct sof_intel_dsp_desc mtl_chip_info = { 
	.read_sdw_lcount =  hda_sdw_check_lcount_common,

	.enable_sdw_irq = mtl_enable_sdw_irq,

	.check_sdw_irq = mtl_dsp_check_sdw_irq,

	.check_sdw_wakeen_irq = hda_sdw_check_wakeen_irq_common,

	.check_ipc_irq = mtl_dsp_check_ipc_irq,

	.cl_init = mtl_dsp_cl_init,

	.power_down_dsp = mtl_power_down_dsp,