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

ASoC: SOF: Intel: remove circular dependency on hda_sdw_process_wakeen() 



hda_sdw_process_wakeen() is used in hda-loader.c, but defined in
hda.c. This code split will create a circular dependency when hda.c is
moved to a different module. Rather than an invasive code change, this
patch follows the model used for sdw_check_wakeen_irq() with an
abstraction. For now all abstractions point to the same common
routine, which is arguably not great, but this also provides us with a
future-proof way of addressing platform-specific wake processing.

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 avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20240503135221.229202-7-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.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,

	.sdw_process_wakeen = hda_sdw_process_wakeen_common,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,
@@ -508,6 +509,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.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,

	.sdw_process_wakeen = hda_sdw_process_wakeen_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-dsp.c

+15 −0
Original line number Diff line number Diff line
@@ -1311,6 +1311,21 @@ int hda_sdw_check_lcount(struct snd_sof_dev *sdev) 


	return 0;

}



void hda_sdw_process_wakeen(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;



	chip = get_chip_info(sdev->pdata);

	if (chip && chip->sdw_process_wakeen)

		chip->sdw_process_wakeen(sdev);

}

EXPORT_SYMBOL_NS(hda_sdw_process_wakeen, SND_SOC_SOF_INTEL_HDA_COMMON);



#endif



int hda_dsp_disable_interrupts(struct snd_sof_dev *sdev)

sound/soc/sof/intel/hda.c

+2 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev) 
	return false;

}



void hda_sdw_process_wakeen(struct snd_sof_dev *sdev)

void hda_sdw_process_wakeen_common(struct snd_sof_dev *sdev)

{

	u32 interface_mask = hda_get_interface_mask(sdev);

	struct sof_intel_hda_dev *hdev;
@@ -345,6 +345,7 @@ void hda_sdw_process_wakeen(struct snd_sof_dev *sdev) 


	sdw_intel_process_wakeen_event(hdev->sdw);

}

EXPORT_SYMBOL_NS(hda_sdw_process_wakeen_common, SND_SOC_SOF_INTEL_HDA_COMMON);



#else /* IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) */

static inline int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

sound/soc/sof/intel/hda.h

+5 −0
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ 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_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);
@@ -853,6 +854,10 @@ static inline bool hda_sdw_check_wakeen_irq_common(struct snd_sof_dev *sdev) 
	return false;

}



static inline void hda_sdw_process_wakeen_common(struct snd_sof_dev *sdev)

{

}



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
@@ -187,6 +187,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	.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,

	.sdw_process_wakeen = hda_sdw_process_wakeen_common,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,