lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 145/219] soundwire: intel: fix PDI/stream mapping for Bulk
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ 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>
    ---
    drivers/soundwire/intel.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
    index 29bc99c4a7b6..e49d3c810677 100644
    --- a/drivers/soundwire/intel.c
    +++ b/drivers/soundwire/intel.c
    @@ -352,7 +352,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
    @@ -381,7 +384,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));
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:34    [W:4.027 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site