ASoC: SOF: Intel: SoundWire: refine ACPI match

We have existing platforms where the wrong machine is selected. We
need to make sure the number of devices reported on a link matches
what we expect for a link descriptor. This helps avoid using the
TGL-RVP configuration for an HP platform or vice-versa, depending on
the order in which they are inserted in the table.

Co-developed-by: Bard Liao <yung-chuan.liao@linux.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>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Link: https://lore.kernel.org/r/20210208233336.59449-9-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 4471634..db86837 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1071,32 +1071,63 @@ static bool link_slaves_found(struct snd_sof_dev *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;
-       int i, j;
+       int i, j, k;
 
        for (i = 0; i < link->num_adr; i++) {
                u64 adr = link->adr_d[i].adr;
+               int reported_part_count = 0;
 
                mfg_id = SDW_MFG_ID(adr);
                part_id = SDW_PART_ID(adr);
                link_id = SDW_DISCO_LINK_ID(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)
+                               reported_part_count++;
+               }
+
                for (j = 0; j < num_slaves; j++) {
+                       int expected_part_count = 0;
+
                        if (ids[j].link_id != link_id ||
                            ids[j].id.part_id != part_id ||
                            ids[j].id.mfg_id != mfg_id)
                                continue;
-                       /*
-                        * we have to check unique id
-                        * if there is more than one
-                        * Slave on the link
-                        */
-                       unique_id = SDW_UNIQUE_ID(adr);
-                       if (link->num_adr == 1 ||
-                           ids[j].id.unique_id == SDW_IGNORED_UNIQUE_ID ||
-                           ids[j].id.unique_id == unique_id) {
-                               dev_dbg(bus->dev,
-                                       "found %x at link %d\n",
-                                       part_id, link_id);
-                               break;
+
+                       /* find out how many identical parts are expected */
+                       for (k = 0; k < link->num_adr; k++) {
+                               u64 adr2 = link->adr_d[i].adr;
+                               unsigned int part_id2, link_id2, mfg_id2;
+
+                               mfg_id2 = SDW_MFG_ID(adr2);
+                               part_id2 = SDW_PART_ID(adr2);
+                               link_id2 = SDW_DISCO_LINK_ID(adr2);
+
+                               if (link_id2 == link_id &&
+                                   part_id2 == part_id &&
+                                   mfg_id2 == mfg_id)
+                                       expected_part_count++;
+                       }
+
+                       if (reported_part_count == expected_part_count) {
+                               /*
+                                * we have to check unique id
+                                * if there is more than one
+                                * Slave on the link
+                                */
+                               unique_id = SDW_UNIQUE_ID(adr);
+                               if (reported_part_count == 1 ||
+                                   ids[j].id.unique_id == unique_id) {
+                                       dev_dbg(bus->dev, "found %x at link %d\n",
+                                               part_id, link_id);
+                                       break;
+                               }
+                       } else {
+                               dev_dbg(bus->dev, "part %x reported %d expected %d on link %d, skipping\n",
+                                       part_id, reported_part_count, expected_part_count, link_id);
                        }
                }
                if (j == num_slaves) {