lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0998/1039] dmaengine: at_xdmac: Fix lld view setting
    Date
    From: Tudor Ambarus <tudor.ambarus@microchip.com>

    commit 1385eb4d14d447cc5d744bc2ac34f43be66c9963 upstream.

    AT_XDMAC_CNDC_NDVIEW_NDV3 was set even for AT_XDMAC_MBR_UBC_NDV2,
    because of the wrong bit handling. Fix it.

    Fixes: ee0fe35c8dcd ("dmaengine: xdmac: Handle descriptor's view 3 registers")
    Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
    Link: https://lore.kernel.org/r/20211215110115.191749-10-tudor.ambarus@microchip.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/dma/at_xdmac.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/dma/at_xdmac.c
    +++ b/drivers/dma/at_xdmac.c
    @@ -99,6 +99,7 @@
    #define AT_XDMAC_CNDC_NDE (0x1 << 0) /* Channel x Next Descriptor Enable */
    #define AT_XDMAC_CNDC_NDSUP (0x1 << 1) /* Channel x Next Descriptor Source Update */
    #define AT_XDMAC_CNDC_NDDUP (0x1 << 2) /* Channel x Next Descriptor Destination Update */
    +#define AT_XDMAC_CNDC_NDVIEW_MASK GENMASK(28, 27)
    #define AT_XDMAC_CNDC_NDVIEW_NDV0 (0x0 << 3) /* Channel x Next Descriptor View 0 */
    #define AT_XDMAC_CNDC_NDVIEW_NDV1 (0x1 << 3) /* Channel x Next Descriptor View 1 */
    #define AT_XDMAC_CNDC_NDVIEW_NDV2 (0x2 << 3) /* Channel x Next Descriptor View 2 */
    @@ -402,7 +403,8 @@ static void at_xdmac_start_xfer(struct a
    */
    if (at_xdmac_chan_is_cyclic(atchan))
    reg = AT_XDMAC_CNDC_NDVIEW_NDV1;
    - else if (first->lld.mbr_ubc & AT_XDMAC_MBR_UBC_NDV3)
    + else if ((first->lld.mbr_ubc &
    + AT_XDMAC_CNDC_NDVIEW_MASK) == AT_XDMAC_MBR_UBC_NDV3)
    reg = AT_XDMAC_CNDC_NDVIEW_NDV3;
    else
    reg = AT_XDMAC_CNDC_NDVIEW_NDV2;

    \
     
     \ /
      Last update: 2022-01-24 23:54    [W:4.027 / U:23.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site