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

ASoC: SOF: Intel: hda: add helper to extract SoundWire link count 



The register changed with the HDaudio integration, the information is
present in the extended link descriptor and not in the SHIM.

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 avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230602205620.310879-10-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/hda.c

+25 −0
Original line number Diff line number Diff line
@@ -222,6 +222,31 @@ int hda_sdw_check_lcount_common(struct snd_sof_dev *sdev) 
	return 0;

}



int hda_sdw_check_lcount_ext(struct snd_sof_dev *sdev)

{

	struct sof_intel_hda_dev *hdev;

	struct sdw_intel_ctx *ctx;

	struct hdac_bus *bus;

	u32 slcount;



	bus = sof_to_bus(sdev);



	hdev = sdev->pdata->hw_pdata;

	ctx = hdev->sdw;



	slcount = hdac_bus_eml_get_count(bus, true, AZX_REG_ML_LEPTR_ID_SDW);



	/* Check HW supported vs property value */

	if (slcount < ctx->count) {

		dev_err(sdev->dev,

			"%s: BIOS master count %d is larger than hardware capabilities %d\n",

			__func__, ctx->count, slcount);

		return -EINVAL;

	}



	return 0;

}



static int hda_sdw_check_lcount(struct snd_sof_dev *sdev)

{

	const struct sof_intel_dsp_desc *chip;

sound/soc/sof/intel/hda.h

+6 −0
Original line number Diff line number Diff line
@@ -781,6 +781,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_check_lcount_common(struct snd_sof_dev *sdev);

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);
@@ -794,6 +795,11 @@ static inline int hda_sdw_check_lcount_common(struct snd_sof_dev *sdev) 
	return 0;

}



static inline int hda_sdw_check_lcount_ext(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_startup(struct snd_sof_dev *sdev)

{

	return 0;