lkml.org 
[lkml]   [2019]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 096/166] soundwire: intel: fix channel number reported by hardware
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit 18046335643de6d21327f5ae034c8fb8463f6715 ]

    On all released Intel controllers (CNL/CML/ICL), PDI2 reports an
    invalid count, force the correct hardware-supported value

    This may have to be revisited with platform-specific values if the
    hardware changes, but for now this is good enough.

    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20190806005522.22642-3-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, 10 insertions(+)

    diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
    index 317873bc0555d..ec25a71d08873 100644
    --- a/drivers/soundwire/intel.c
    +++ b/drivers/soundwire/intel.c
    @@ -289,6 +289,16 @@ intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)

    if (pcm) {
    count = intel_readw(shim, SDW_SHIM_PCMSYCHC(link_id, pdi_num));
    +
    + /*
    + * WORKAROUND: on all existing Intel controllers, pdi
    + * number 2 reports channel count as 1 even though it
    + * supports 8 channels. Performing hardcoding for pdi
    + * number 2.
    + */
    + if (pdi_num == 2)
    + count = 7;
    +
    } else {
    count = intel_readw(shim, SDW_SHIM_PDMSCAP(link_id));
    count = ((count & SDW_SHIM_PDMSCAP_CPSS) >>
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-06 19:49    [W:6.343 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site