ASoC: SOF: Intel: match sdw version on link_slaves_found

Codecs with the same part id, manufacturer id and part id, but different
sdw version should be treated as different codecs. For example, rt711 and
rt711-sdca are different. So, we should match sdw version as well.

Reported-by: Reddy Muralidhar <muralidhar.reddy@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220120232157.199919-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index c8fb082209ce48c5c12cbbc1ec68d550e7bf078d..67936be54ef7006e49ee4faaa761fc6be7d44b58 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1187,7 +1187,7 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,
        struct hdac_bus *bus = sof_to_bus(sdev);
        struct sdw_intel_slave_id *ids = sdw->ids;
        int num_slaves = sdw->num_slaves;
-       unsigned int part_id, link_id, unique_id, mfg_id;
+       unsigned int part_id, link_id, unique_id, mfg_id, version;
        int i, j, k;
 
        for (i = 0; i < link->num_adr; i++) {
@@ -1197,12 +1197,14 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,
                mfg_id = SDW_MFG_ID(adr);
                part_id = SDW_PART_ID(adr);
                link_id = SDW_DISCO_LINK_ID(adr);
+               version = SDW_VERSION(adr);
 
                for (j = 0; j < num_slaves; j++) {
                        /* find out how many identical parts were reported on that link */
                        if (ids[j].link_id == link_id &&
                            ids[j].id.part_id == part_id &&
-                           ids[j].id.mfg_id == mfg_id)
+                           ids[j].id.mfg_id == mfg_id &&
+                           ids[j].id.sdw_version == version)
                                reported_part_count++;
                }
 
@@ -1211,21 +1213,24 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,
 
                        if (ids[j].link_id != link_id ||
                            ids[j].id.part_id != part_id ||
-                           ids[j].id.mfg_id != mfg_id)
+                           ids[j].id.mfg_id != mfg_id ||
+                           ids[j].id.sdw_version != version)
                                continue;
 
                        /* find out how many identical parts are expected */
                        for (k = 0; k < link->num_adr; k++) {
                                u64 adr2 = link->adr_d[k].adr;
-                               unsigned int part_id2, link_id2, mfg_id2;
+                               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 &&
                                    part_id2 == part_id &&
-                                   mfg_id2 == mfg_id)
+                                   mfg_id2 == mfg_id &&
+                                   version2 == version)
                                        expected_part_count++;
                        }