Commit 7afed13b authored by Bard Liao's avatar Bard Liao Committed by Mark Brown

ASoC: SOF: Intel: Compare sdw adr directly

We can exclude the sdw unique id and compare the sdw adr directly when
we are finding out identical parts.
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220120232157.199919-3-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f67c0c0d
...@@ -1179,6 +1179,10 @@ static void hda_generic_machine_select(struct snd_sof_dev *sdev, ...@@ -1179,6 +1179,10 @@ static void hda_generic_machine_select(struct snd_sof_dev *sdev,
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)
#define SDW_CODEC_ADR_MASK(_adr) ((_adr) & (SDW_DISCO_LINK_ID_MASK | SDW_VERSION_MASK | \
SDW_MFG_ID_MASK | SDW_PART_ID_MASK))
/* Check if all Slaves defined on the link can be found */ /* Check if all Slaves defined on the link can be found */
static bool link_slaves_found(struct snd_sof_dev *sdev, static bool link_slaves_found(struct snd_sof_dev *sdev,
const struct snd_soc_acpi_link_adr *link, const struct snd_soc_acpi_link_adr *link,
...@@ -1220,17 +1224,8 @@ static bool link_slaves_found(struct snd_sof_dev *sdev, ...@@ -1220,17 +1224,8 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,
/* find out how many identical parts are expected */ /* find out how many identical parts are expected */
for (k = 0; k < link->num_adr; k++) { for (k = 0; k < link->num_adr; k++) {
u64 adr2 = link->adr_d[k].adr; u64 adr2 = link->adr_d[k].adr;
unsigned int part_id2, link_id2, mfg_id2, version2;
mfg_id2 = SDW_MFG_ID(adr2);
part_id2 = SDW_PART_ID(adr2);
link_id2 = SDW_DISCO_LINK_ID(adr2);
version2 = SDW_VERSION(adr2);
if (link_id2 == link_id && if (SDW_CODEC_ADR_MASK(adr2) == SDW_CODEC_ADR_MASK(adr))
part_id2 == part_id &&
mfg_id2 == mfg_id &&
version2 == version)
expected_part_count++; expected_part_count++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment