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

ASoC: SOF: Intel: hda: add per-chip enable_sdw_irq() callback 



Different generations of Intel hardware rely on different programming
sequences to enable SoundWire IP. In existing hardware, the SoundWire
interrupt is enabled with a register field in the DSP register
space. With HDaudio multi-link extensions registers, the SoundWire
interrupt will be enabled with a generic interrupt enable field in
LCTL, without any dependency on the DSP being enabled.

Add a per-chip callback following the example of the check_sdw_irq()
model already upstream.

Note that the callback is not populated yet for MeteorLake (MTL) since
the interrupts are already enabled in the init. A follow-up patch will
move the functionality to this callback after a couple of cleanups.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221111042653.45520-3-yung-chuan.liao@linux.intel.com


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

sound/soc/sof/intel/cnl.c

+2 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.sdw_shim_base = SDW_SHIM_BASE,

	.sdw_alh_base = SDW_ALH_BASE,

	.d0i3_offset = SOF_HDA_VS_D0I3C,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,
@@ -490,6 +491,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.sdw_shim_base = SDW_SHIM_BASE,

	.sdw_alh_base = SDW_ALH_BASE,

	.d0i3_offset = SOF_HDA_VS_D0I3C,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

sound/soc/sof/intel/hda.c

+19 −1
Original line number Diff line number Diff line
@@ -155,9 +155,27 @@ struct sdw_intel_ops sdw_callback = { 
	.free_stream = sdw_free_stream,

};



void hda_common_enable_sdw_irq(struct snd_sof_dev *sdev, bool enable)

{

	struct sof_intel_hda_dev *hdev;



	hdev = sdev->pdata->hw_pdata;



	if (!hdev->sdw)

		return;



	snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC2,

				HDA_DSP_REG_ADSPIC2_SNDW,

				enable ? HDA_DSP_REG_ADSPIC2_SNDW : 0);

}



void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable)

{

	sdw_intel_enable_irq(sdev->bar[HDA_DSP_BAR], enable);

	const struct sof_intel_dsp_desc *chip;



	chip = get_chip_info(sdev->pdata);

	if (chip && chip->enable_sdw_irq)

		chip->enable_sdw_irq(sdev, enable);

}



static int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

sound/soc/sof/intel/hda.h

+6 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ 
#define HDA_DSP_REG_ADSPIC2		(HDA_DSP_GEN_BASE + 0x10)

#define HDA_DSP_REG_ADSPIS2		(HDA_DSP_GEN_BASE + 0x14)



#define HDA_DSP_REG_ADSPIC2_SNDW	BIT(5)

#define HDA_DSP_REG_ADSPIS2_SNDW	BIT(5)



/* Intel HD Audio Inter-Processor Communication Registers */
@@ -795,6 +796,7 @@ int hda_dsp_trace_trigger(struct snd_sof_dev *sdev, int cmd); 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)



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);

void hda_sdw_process_wakeen(struct snd_sof_dev *sdev);

bool hda_common_check_sdw_irq(struct snd_sof_dev *sdev);
@@ -806,6 +808,10 @@ static inline int hda_sdw_startup(struct snd_sof_dev *sdev) 
	return 0;

}



static inline void hda_common_enable_sdw_irq(struct snd_sof_dev *sdev, bool enable)

{

}



static inline void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable)

{

}

sound/soc/sof/intel/icl.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	.sdw_shim_base = SDW_SHIM_BASE,

	.sdw_alh_base = SDW_ALH_BASE,

	.d0i3_offset = SOF_HDA_VS_D0I3C,

	.enable_sdw_irq	= hda_common_enable_sdw_irq,

	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

sound/soc/sof/intel/shim.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ struct sof_intel_dsp_desc { 
	u32 d0i3_offset;

	u32 quirks;

	enum sof_intel_hw_ip_version hw_ip_version;

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

	bool (*check_sdw_irq)(struct snd_sof_dev *sdev);

	bool (*check_ipc_irq)(struct snd_sof_dev *sdev);

	int (*power_down_dsp)(struct snd_sof_dev *sdev);