nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

lc823450_dma: use small lock in arch/arm/src/lc823450/lc823450_dma.c

Browse source 
reason:
We hope to remove all instances of spin_lock_irqsave(NULL).

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2024-12-09 20:59:31 +08:00 committed by Xiang Xiao
parent bae0b64da3
commit c8bdfb537e
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
arch/arm/src/lc823450/lc823450_dma.c
View file

@ -106,7 +106,7 @@ struct lc823450_dmach_s
struct lc823450_dma_s struct lc823450_dma_s
{ {
mutex_t lock; /* For exclusive access to the DMA channel list */ spinlock_t lock; /* For exclusive access to the DMA channel list */
/* This is the state of each DMA channel */ /* This is the state of each DMA channel */
@ -123,7 +123,7 @@ static int phydmastart(struct lc823450_phydmach_s *pdmach);
static struct lc823450_dma_s g_dma = static struct lc823450_dma_s g_dma =
{ {
.lock = NXMUTEX_INITIALIZER, .lock = SP_UNLOCKED,
}; };
volatile uint8_t g_dma_inprogress; volatile uint8_t g_dma_inprogress;
@ -144,7 +144,7 @@ static int dma_interrupt_core(void *context)
pdmach = (struct lc823450_phydmach_s *)context; pdmach = (struct lc823450_phydmach_s *)context;
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&g_dma.lock);
q_ent = pdmach->req_q.tail; q_ent = pdmach->req_q.tail;
DEBUGASSERT(q_ent != NULL); DEBUGASSERT(q_ent != NULL);
dmach = (struct lc823450_dmach_s *)q_ent; dmach = (struct lc823450_dmach_s *)q_ent;
@ -154,18 +154,20 @@ static int dma_interrupt_core(void *context)
/* finish one transfer */ /* finish one transfer */
sq_remlast(&pdmach->req_q); sq_remlast(&pdmach->req_q);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&g_dma.lock, flags);
if (dmach->callback) if (dmach->callback)
dmach->callback((DMA_HANDLE)dmach, dmach->arg, 0); dmach->callback((DMA_HANDLE)dmach, dmach->arg, 0);
} }
else else
{ {
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&g_dma.lock, flags);
} }
up_disable_clk(LC823450_CLOCK_DMA); up_disable_clk(LC823450_CLOCK_DMA);
flags = spin_lock_irqsave(&g_dma.lock);
phydmastart(pdmach); phydmastart(pdmach);
spin_unlock_irqrestore(&g_dma.lock, flags);
return OK; return OK;
} }
@ -212,20 +214,16 @@ static int dma_interrupt(int irq, void *context, void *arg)
static int phydmastart(struct lc823450_phydmach_s *pdmach) static int phydmastart(struct lc823450_phydmach_s *pdmach)
{ {
irqstate_t flags;
int trnum; int trnum;
struct lc823450_dmach_s *dmach; struct lc823450_dmach_s *dmach;
sq_entry_t *q_ent; sq_entry_t *q_ent;
flags = spin_lock_irqsave(NULL);
q_ent = pdmach->req_q.tail; q_ent = pdmach->req_q.tail;
if (!q_ent) if (!q_ent)
{ {
pdmach->inprogress = 0; pdmach->inprogress = 0;
spin_unlock_irqrestore(NULL, flags);
return 0; return 0;
} }
@ -288,7 +286,6 @@ static int phydmastart(struct lc823450_phydmach_s *pdmach)
modifyreg32(DMACCFG(dmach->chn), 0, DMACCFG_ITC | DMACCFG_E); modifyreg32(DMACCFG(dmach->chn), 0, DMACCFG_ITC | DMACCFG_E);
spin_unlock_irqrestore(NULL, flags);
return 0; return 0;
} }
@ -613,7 +610,7 @@ int lc823450_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
/* select physical channel */ /* select physical channel */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&g_dma.lock);
sq_addfirst(&dmach->q_ent, &g_dma.phydmach[dmach->chn].req_q); sq_addfirst(&dmach->q_ent, &g_dma.phydmach[dmach->chn].req_q);
@ -627,7 +624,7 @@ int lc823450_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
phydmastart(&g_dma.phydmach[dmach->chn]); phydmastart(&g_dma.phydmach[dmach->chn]);
} }
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&g_dma.lock, flags);
return OK; return OK;
} }
@ -644,7 +641,7 @@ void lc823450_dmastop(DMA_HANDLE handle)
DEBUGASSERT(dmach != NULL); DEBUGASSERT(dmach != NULL);
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&g_dma.lock);
modifyreg32(DMACCFG(dmach->chn), DMACCFG_ITC | DMACCFG_E, 0); modifyreg32(DMACCFG(dmach->chn), DMACCFG_ITC | DMACCFG_E, 0);
@ -660,5 +657,5 @@ void lc823450_dmastop(DMA_HANDLE handle)
sq_rem(&dmach->q_ent, &pdmach->req_q); sq_rem(&dmach->q_ent, &pdmach->req_q);
} }
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&g_dma.lock, flags);
} }