sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s32k3xx:edma clear state before callback add idle check

Browse Source 
This prevents dma stop operations called of a completion
   call back from rentering, the callback and ensures that
   the call back will see the idle state.
This commit is contained in:
David Sidrane 2023-12-05 04:07:53 -08:00 committed by Xiang Xiao
parent bffe858e47
commit 7f0643de6d
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/src/s32k3xx/s32k3xx_edma.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/s32k3xx/s32k3xx_edma.c * arch/arm/src/s32k3xx/s32k3xx_edma.c
* *
* Copyright (C) 2019, 2021 Gregory Nutt. All rights reserved. * Copyright (C) 2019, 2021, 2023 Gregory Nutt. All rights reserved.
* Copyright 2022 NXP * Copyright 2022 NXP
* Authors: Gregory Nutt <gnutt@nuttx.org> * Authors: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david.sidrane@nscdg.com> * David Sidrane <david.sidrane@nscdg.com>
@ -708,6 +708,8 @@ static void s32k3xx_dmaterminate(struct s32k3xx_dmach_s *dmach, int result)
struct s32k3xx_edmatcd_s *next; struct s32k3xx_edmatcd_s *next;
#endif #endif
uint8_t chan; uint8_t chan;
edma_callback_t callback;
void *arg;
chan = dmach->chan; chan = dmach->chan;
@ -749,14 +751,17 @@ static void s32k3xx_dmaterminate(struct s32k3xx_dmach_s *dmach, int result)
/* Perform the DMA complete callback */ /* Perform the DMA complete callback */
if (dmach->callback) callback = dmach->callback;
{ arg = dmach->arg;
dmach->callback((DMACH_HANDLE)dmach, dmach->arg, true, result);
}
dmach->callback = NULL; dmach->callback = NULL;
dmach->arg = NULL; dmach->arg = NULL;
dmach->state = S32K3XX_DMA_IDLE; dmach->state = S32K3XX_DMA_IDLE;
if (callback)
{
callback((DMACH_HANDLE)dmach, arg, true, result);
}
} }
/**************************************************************************** /****************************************************************************
@ -1495,6 +1500,24 @@ unsigned int s32k3xx_dmach_getcount(DMACH_HANDLE *handle)
return remaining; return remaining;
} }
/****************************************************************************
* Name: s32k3xx_dmach_idle
*
* Description:
* This function checks if the dma is idle
*
* Returned Value:
* 0 - if idle
* !0 - not
*
****************************************************************************/
unsigned int s32k3xx_dmach_idle(DMACH_HANDLE handle)
{
struct s32k3xx_dmach_s *dmach = (struct s32k3xx_dmach_s *)handle;
return dmach->state == S32K3XX_DMA_IDLE ? 0 : -1;
}
/**************************************************************************** /****************************************************************************
* Name: s32k3xx_dmasample * Name: s32k3xx_dmasample
* *

16
arch/arm/src/s32k3xx/s32k3xx_edma.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/s32k3xx/s32k3xx_edma.h * arch/arm/src/s32k3xx/s32k3xx_edma.h
* *
* Copyright (C) 2019, 2021 Gregory Nutt. All rights reserved. * Copyright (C) 2019, 2021, 2023 Gregory Nutt. All rights reserved.
* Copyright 2022 NXP * Copyright 2022 NXP
* Authors: Gregory Nutt <gnutt@nuttx.org> * Authors: Gregory Nutt <gnutt@nuttx.org>
* David Sidrane <david.sidrane@nscdg.com> * David Sidrane <david.sidrane@nscdg.com>
@ -431,6 +431,20 @@ void s32k3xx_dmach_stop(DMACH_HANDLE handle);
unsigned int s32k3xx_dmach_getcount(DMACH_HANDLE *handle); unsigned int s32k3xx_dmach_getcount(DMACH_HANDLE *handle);
/****************************************************************************
* Name: s32k3xx_dmach_idle
*
* Description:
* This function checks if the dma is idle
*
* Returned Value:
* 0 - if idle
* !0 - not
*
****************************************************************************/
unsigned int s32k3xx_dmach_idle(DMACH_HANDLE handle);
/**************************************************************************** /****************************************************************************
* Name: s32k3xx_dmasample * Name: s32k3xx_dmasample
* *