SoundWire: revisit interrupt and lcount handling

[plbossart]

The code in drivers/soundwire/intel_init.c is hardware-dependent and the code does not apply to new generations starting with MeteorLake. Refactor and clean-up the code to make this intel_init.c hardware-agnostic and move all hardware-dependencies in the SOF driver using chip descriptors.

Tested on TGL SKU 0A32

[RanderWang]

LGTM

[plbossart]

Going back to draft, I am not happy with the PR, it needs more work to move the startup and interrupt enabling.

[plbossart]

let's give @bardliao a chance to review.

[plbossart]

changes since last version (comments from @ranj063 and @ujfalusi )

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index bc32636c2014..944f95bd1e92 100644
--- a/sound/soc/sof/intel/hda.c+++ b/sound/soc/sof/intel/hda.c@@ -165,14 +165,9 @@ void hda_common_enable_sdw_irq(struct snd_sof_dev *sdev, bool enable)
if (!hdev->sdw)
return;
- val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC2);-- if (enable)- val |= HDA_DSP_REG_ADSPIC2_SNDW;- else- val &= ~HDA_DSP_REG_ADSPIC2_SNDW;-- snd_sof_dsp_write(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC2, val);+ 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)
@@ -935,6 +930,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
struct hdac_bus *bus = sof_to_bus(sdev);
struct snd_sof_pdata *pdata = sdev->pdata;
struct sof_intel_hda_dev *hdev = pdata->hw_pdata;
+ bool i915_off = false;
u32 link_mask;
int ret;
@@ -975,6 +971,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
ret = hda_sdw_probe(sdev);
if (ret < 0) {
dev_err(sdev->dev, "SoundWire probe error: %d\n", ret);
+ i915_off = true;
goto err;
}
@@ -984,7 +981,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
hda_codec_probe_bus(sdev);
err:
- if (!HDA_IDISP_CODEC(bus->codec_mask))+ if (!HDA_IDISP_CODEC(bus->codec_mask) || i915_off)
hda_codec_i915_display_power(sdev, false);
hda_bus_ml_put_all(bus);
diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index d20f04a19ad6..904ae42534e1 100644
--- a/sound/soc/sof/intel/mtl.c+++ b/sound/soc/sof/intel/mtl.c@@ -576,7 +576,7 @@ static void mtl_ipc_dump(struct snd_sof_dev *sdev)
static int mtl_dsp_disable_interrupts(struct snd_sof_dev *sdev)
{
- hda_sdw_int_enable(sdev, false);+ mtl_enable_sdw_irq(sdev, false);
mtl_disable_ipc_interrupts(sdev);
return mtl_enable_interrupts(sdev, false);
}

[plbossart]

dropped "ASoC: SOF: Intel: hda: improve error handling on SoundWire probe", no other change.