soundwire: intel: fix PDI/stream mapping for Bulk

BugLink: https://bugs.launchpad.net/bugs/1860490
[ Upstream commit c134f914e9f55b7817e2bae625ec0e5f1379f7cd ]

The previous formula is incorrect for PDI0/1, the mapping is not
linear but has a discontinuity between PDI1 and PDI2.

This change has no effect on PCM PDIs (same mapping).

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191022232948.17156-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index db9c138adb1ffb412bb6947f05dc3960791862f9..9db09f6563c019de8c361299dc4aebd903df3e20 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -359,7 +359,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
        unsigned int link_id = sdw->instance;
        int pdi_conf = 0;
 
-       pdi->intel_alh_id = (link_id * 16) + pdi->num + 5;
+       /* the Bulk and PCM streams are not contiguous */
+       pdi->intel_alh_id = (link_id * 16) + pdi->num + 3;
+       if (pdi->num >= 2)
+               pdi->intel_alh_id += 2;
 
        /*
         * Program stream parameters to stream SHIM register
@@ -388,7 +391,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)
        unsigned int link_id = sdw->instance;
        unsigned int conf;
 
-       pdi->intel_alh_id = (link_id * 16) + pdi->num + 5;
+       /* the Bulk and PCM streams are not contiguous */
+       pdi->intel_alh_id = (link_id * 16) + pdi->num + 3;
+       if (pdi->num >= 2)
+               pdi->intel_alh_id += 2;
 
        /* Program Stream config ALH register */
        conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id));