Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0172227 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Greg Kroah-Hartman
Browse files

dmaengine: at_xdmac: Fix lld view setting 



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: ee0fe35c ("dmaengine: xdmac: Handle descriptor's view 3 registers")
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20211215110115.191749-10-tudor.ambarus@microchip.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26bf6166

drivers/dma/at_xdmac.c

+3 −1
Original line number Diff line number Diff line
@@ -100,6 +100,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 */
@@ -359,7 +360,8 @@ static void at_xdmac_start_xfer(struct at_xdmac_chan *atchan, 
	 */

	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;