lkml.org 
[lkml]   [2019]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] soundwire: intel: fix PDI/stream mapping for Bulk
On 22-10-19, 18:29, Pierre-Louis Bossart wrote:
> 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>
> ---
> 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 b403ccc832b6..c984261fcc33 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -480,7 +480,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
> @@ -509,7 +512,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;

The change is repeated so how about:

intel_pdi_update_alh() or similar which does this rather than
repeat the pattern

>
> /* Program Stream config ALH register */
> conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id));
> --
> 2.20.1

--
~Vinod

\
 
 \ /
  Last update: 2019-10-24 13:24    [W:0.033 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site