RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

leon, grcan: split hw_stop() into hw and sw stop

Browse Source 
this is to avoid owning the spin-lock during semaphore operations.
This commit is contained in:
Daniel Hellstrom
2017-04-11 10:47:39 +02:00
parent 3a650d3b2c
commit 9855690300
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
c/src/lib/libbsp/sparc/shared/can/grcan.c
View File

@@ -488,7 +488,10 @@ static void grcan_hw_stop(struct grcan_priv *pDev)
/* Disable receiver & transmitter */ /* Disable receiver & transmitter */
pDev->regs->rx0ctrl = 0; pDev->regs->rx0ctrl = 0;
pDev->regs->tx0ctrl = 0; pDev->regs->tx0ctrl = 0;
}
static void grcan_sw_stop(struct grcan_priv *pDev)
{
/* Reset semaphores to the initial state and wakeing /* Reset semaphores to the initial state and wakeing
* all threads waiting for an IRQ. The threads that * all threads waiting for an IRQ. The threads that
* get woken up must check for RTEMS_UNSATISFIED in * get woken up must check for RTEMS_UNSATISFIED in
@@ -1577,6 +1580,7 @@ int grcan_stop(void *d)
{ {
struct grcan_priv *pDev = d; struct grcan_priv *pDev = d;
SPIN_IRQFLAGS(oldLevel); SPIN_IRQFLAGS(oldLevel);
int do_sw_stop;
FUNCDBG(); FUNCDBG();
@@ -1586,6 +1590,7 @@ int grcan_stop(void *d)
SPIN_LOCK_IRQ(&pDev->devlock, oldLevel); SPIN_LOCK_IRQ(&pDev->devlock, oldLevel);
if (pDev->started == STATE_STARTED) { if (pDev->started == STATE_STARTED) {
grcan_hw_stop(pDev); grcan_hw_stop(pDev);
do_sw_stop = 1;
DBGC(DBG_STATE, "STARTED->STOPPED\n"); DBGC(DBG_STATE, "STARTED->STOPPED\n");
} else { } else {
/* /*
@@ -1593,10 +1598,14 @@ int grcan_stop(void *d)
* might already been called from ISR. * might already been called from ISR.
*/ */
DBGC(DBG_STATE, "[STOPPED|BUSOFF|AHBERR]->STOPPED\n"); DBGC(DBG_STATE, "[STOPPED|BUSOFF|AHBERR]->STOPPED\n");
do_sw_stop = 0;
} }
pDev->started = STATE_STOPPED; pDev->started = STATE_STOPPED;
SPIN_UNLOCK_IRQ(&pDev->devlock, oldLevel); SPIN_UNLOCK_IRQ(&pDev->devlock, oldLevel);
if (do_sw_stop)
grcan_sw_stop(pDev);
/* Disable interrupts */ /* Disable interrupts */
drvmgr_interrupt_unregister(pDev->dev, 0, grcan_interrupt, pDev); drvmgr_interrupt_unregister(pDev->dev, 0, grcan_interrupt, pDev);
@@ -1932,6 +1941,10 @@ static void grcan_interrupt(void *arg)
* again with grcan_start(). * again with grcan_start().
*/ */
SPIN_UNLOCK(&pDev->devlock, irqflags); SPIN_UNLOCK(&pDev->devlock, irqflags);
/* flush semaphores to wake blocked threads */
grcan_sw_stop(pDev);
/* /*
* NOTE: Another interrupt may be pending now so ISR could be * NOTE: Another interrupt may be pending now so ISR could be
* executed one more time aftert this (first) return. * executed one more time aftert this (first) return.