public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: Tudor Ambarus <tudor.ambarus@microchip.com>
To: <vkoul@kernel.org>
Cc: Tudor Ambarus <tudor.ambarus@microchip.com>,
	mripard@kernel.org, linux-kernel@vger.kernel.org,
	ludovic.desroches@microchip.com, dmaengine@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 09/12] dmaengine: at_xdmac: Fix lld view setting
Date: Wed, 15 Dec 2021 13:01:12 +0200	[thread overview]
Message-ID: <20211215110115.191749-10-tudor.ambarus@microchip.com> (raw)
In-Reply-To: <20211215110115.191749-1-tudor.ambarus@microchip.com>

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>
---
 drivers/dma/at_xdmac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 0b09ec752db4..6e5bfc9b3825 100644
--- 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 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;
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-12-15 11:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-15 11:01 [PATCH v3 00/12] dmaengine: at_xdmac: Various fixes Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 01/12] dmaengine: at_xdmac: Don't start transactions at tx_submit level Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 02/12] dmaengine: at_xdmac: Start transfer for cyclic channels in issue_pending Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 03/12] dmaengine: at_xdmac: Print debug message after realeasing the lock Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 04/12] dmaengine: at_xdmac: Fix concurrency over chan's completed_cookie Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 05/12] dmaengine: at_xdmac: Fix race for the tx desc callback Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 06/12] dmaengine: at_xdmac: Move the free desc to the tail of the desc list Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 07/12] dmaengine: at_xdmac: Fix concurrency over xfers_list Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 08/12] dmaengine: at_xdmac: Remove a level of indentation in at_xdmac_advance_work() Tudor Ambarus
2021-12-15 11:01 ` Tudor Ambarus [this message]
2021-12-15 11:01 ` [PATCH v3 10/12] dmaengine: at_xdmac: Fix at_xdmac_lld struct definition Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 11/12] dmaengine: at_xdmac: Remove a level of indentation in at_xdmac_tasklet() Tudor Ambarus
2021-12-15 11:01 ` [PATCH v3 12/12] dmaengine: at_xdmac: Fix race over irq_status Tudor Ambarus
2022-01-05 10:20 ` [PATCH v3 00/12] dmaengine: at_xdmac: Various fixes Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211215110115.191749-10-tudor.ambarus@microchip.com \
    --to=tudor.ambarus@microchip.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ludovic.desroches@microchip.com \
    --cc=mripard@kernel.org \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox