Changeset 0af682c in rtems

Timestamp:

Nov 9, 2020, 8:16:51 AM (2 months ago)

Author:

Christian Mauderer <christian.mauderer@…>

Branches:

5

Children:

1dbdf94e

Parents:

f84c4a5

git-author:

Christian Mauderer <christian.mauderer@…> (11/09/20 08:16:51)

git-committer:

Christian Mauderer <christian.mauderer@…> (11/12/20 07:31:41)

Message:

bsp/atsam: Fix XDMAD status

In "bsp/atsam: Simplify XDMAD_Handler()" (5f813694f68cee) the interrupt
callback has been made unconditional. That allowed to avoid some special
deadlock situations in error cases. But it removed part of the XDMAD
status handling.

This patch adds the ability to update the XDMAD status from the
callback if that is necessary for the driver.

Fixes #4172

Location:

bsps/arm/atsam

Files:

• contrib/libraries/libchip/source/xdmad.c (modified) (2 diffs)
• include/libchip/include/xdmad.h (modified) (1 diff)

bsps/arm/atsam/contrib/libraries/libchip/source/xdmad.c

@@ -133 +133 @@
 }
 
+/*
+ * Update the internal xdmad state. Returns true if further processing in the
+ * callback is recommended.
+ *
+ * In an earlier version of the API this has been done by the interrupt handler
+ * directly. But in some cases the application might want to process some of the
+ * other interrupts too. Therefore the user callback should now decide itself
+ * whether this is necessary or not.
+ */
+bool XDMAD_UpdateStatusFromCallback(sXdmad *pXdmad,
+                uint32_t Channel,
+                uint32_t status)
+{
+        Xdmac *pXdmac;
+        uint32_t xdmaGlobalChStatus;
+        bool bExec;
+
+        bExec = false;
+        pXdmac = pXdmad->pXdmacs;
+        xdmaGlobalChStatus = XDMAC_GetGlobalChStatus(pXdmac);
+
+        if ((xdmaGlobalChStatus & (XDMAC_GS_ST0 << Channel)) == 0) {
+                uint32_t xdmaChannelIntMask;
+                sXdmadChannel *pCh;
+
+                pCh = &pXdmad->XdmaChannels[Channel];
+
+                xdmaChannelIntMask = XDMAC_GetChannelItMask(pXdmac, Channel);
+                status &= xdmaChannelIntMask;
+
+                if (status & XDMAC_CIS_BIS) {
+                        if ((xdmaChannelIntMask & XDMAC_CIM_LIM) == 0) {
+                                pCh->state = XDMAD_STATE_DONE;
+                                bExec = true;
+                        }
+                }
+
+                if (status & XDMAC_CIS_LIS) {
+                        pCh->state = XDMAD_STATE_DONE;
+                        bExec = true;
+                }
+
+                if (status & XDMAC_CIS_DIS) {
+                        pCh->state = XDMAD_STATE_DONE;
+                        bExec = true;
+                }
+        } else {
+                /* Block end interrupt for LLI dma mode */
+                if (XDMAC_GetChannelIsr(pXdmac, Channel) & XDMAC_CIS_BIS) {
+                        bExec = true;
+                }
+        }
+
+        return bExec;
+}
+
 void XDMAD_DoNothingCallback(uint32_t Channel, void *pArg, uint32_t status)
 {
-        /* Do nothing */
+        /* Do nothing except status update */
+        XDMAD_UpdateStatusFromCallback((sXdmad *)pArg, Channel, status);
 }
 
@@ -158 +215 @@
         for (j = 0; j < pXdmad->numChannels; j ++) {
                 pXdmad->XdmaChannels[j].fCallback = XDMAD_DoNothingCallback;
+                pXdmad->XdmaChannels[j].pArg = (void *)pXdmad;
         }
 

bsps/arm/atsam/include/libchip/include/xdmad.h

@@ -242 +242 @@
 extern void XDMAD_DoNothingCallback(uint32_t Channel, void *pArg, uint32_t status);
 
+extern bool XDMAD_UpdateStatusFromCallback(sXdmad *pXdmad,
+                uint32_t Channel,
+                uint32_t status);
+
 extern eXdmadRC XDMAD_SetCallback(sXdmad *pXdmad,
                                                                    uint32_t dwChannel,