Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 05:16:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

max32660_wdt: use small lock in arch/arm/src/max326xx/max32660/max32660_wdt.c

Browse Source 
reason:
we plan to remove all instances of spin_lock_irqsave(NULL)

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5
2024-12-02 11:02:10 +08:00
committed by Xiang Xiao
parent 257339a442
commit c116b6578a
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/max326xx/max32660/max32660_wdt.c
+19 -16
View File
@@ -83,6 +83,7 @@ struct max326_wdt_lowerhalf_s
uint8_t exp; /* log12(Reset time period) */ uint8_t exp; /* log12(Reset time period) */
xcpt_t handler; /* User interrupt handler */ xcpt_t handler; /* User interrupt handler */
clock_t lastping; /* Time of last WDT reset */ clock_t lastping; /* Time of last WDT reset */
spinlock_t lock; /* Spinlock */
}; };
/**************************************************************************** /****************************************************************************
@@ -360,7 +361,7 @@ static int max326_start(struct watchdog_lowerhalf_s *lower)
/* Perform the reset sequence */ /* Perform the reset sequence */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
max326_wdog_reset(priv); max326_wdog_reset(priv);
/* Enable reset or interrupt */ /* Enable reset or interrupt */
@@ -373,7 +374,7 @@ static int max326_start(struct watchdog_lowerhalf_s *lower)
ctrl |= WDT0_CTRL_WDTEN; ctrl |= WDT0_CTRL_WDTEN;
putreg32(ctrl, MAX326_WDT0_CTRL); putreg32(ctrl, MAX326_WDT0_CTRL);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
return OK; return OK;
} }
@@ -394,6 +395,8 @@ static int max326_start(struct watchdog_lowerhalf_s *lower)
static int max326_stop(struct watchdog_lowerhalf_s *lower) static int max326_stop(struct watchdog_lowerhalf_s *lower)
{ {
struct max326_wdt_lowerhalf_s *priv =
(struct max326_wdt_lowerhalf_s *)lower;
irqstate_t flags; irqstate_t flags;
uint32_t ctrl; uint32_t ctrl;
@@ -405,14 +408,14 @@ static int max326_stop(struct watchdog_lowerhalf_s *lower)
/* Disable the watchdog timer, reset, and interrupts */ /* Disable the watchdog timer, reset, and interrupts */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
ctrl = getreg32(MAX326_WDT0_CTRL); ctrl = getreg32(MAX326_WDT0_CTRL);
ctrl &= ~(WDT0_CTRL_WDTEN | WDT0_CTRL_INTEN | WDT0_CTRL_RSTEN); ctrl &= ~(WDT0_CTRL_WDTEN | WDT0_CTRL_INTEN | WDT0_CTRL_RSTEN);
up_disable_irq(MAX326_IRQ_WDT0); up_disable_irq(MAX326_IRQ_WDT0);
irq_detach(MAX326_IRQ_WDT0); irq_detach(MAX326_IRQ_WDT0);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
return OK; return OK;
} }
@@ -443,9 +446,9 @@ static int max326_keepalive(struct watchdog_lowerhalf_s *lower)
/* Reset WDT timer */ /* Reset WDT timer */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
max326_wdog_reset(priv); max326_wdog_reset(priv);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
return OK; return OK;
} }
@@ -501,9 +504,9 @@ static int max326_getstatus(struct watchdog_lowerhalf_s *lower,
status->timeleft = max326_time_left(priv); status->timeleft = max326_time_left(priv);
wdinfo("Status :\n"); wdinfo("Status :\n");
wdinfo(" flags : %08x\n", status->flags); wdinfo(" flags : %08lx\n", status->flags);
wdinfo(" timeout : %d\n", status->timeout); wdinfo(" timeout : %ld\n", status->timeout);
wdinfo(" timeleft : %d\n", status->timeleft); wdinfo(" timeleft : %ld\n", status->timeleft);
return OK; return OK;
} }
@@ -537,7 +540,7 @@ static int max326_settimeout(struct watchdog_lowerhalf_s *lower,
/* Reset WDT timer */ /* Reset WDT timer */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
max326_wdog_reset(priv); max326_wdog_reset(priv);
/* Convert the timeout value in milliseconds to time exponent used by the /* Convert the timeout value in milliseconds to time exponent used by the
@@ -559,7 +562,7 @@ static int max326_settimeout(struct watchdog_lowerhalf_s *lower,
ctrl |= (WDT0_CTRL_INTPERIOD(exp) | WDT0_CTRL_RSTPERIOD(exp)); ctrl |= (WDT0_CTRL_INTPERIOD(exp) | WDT0_CTRL_RSTPERIOD(exp));
putreg32(ctrl, MAX326_WDT0_CTRL); putreg32(ctrl, MAX326_WDT0_CTRL);
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
return OK; return OK;
} }
@@ -587,12 +590,12 @@ static xcpt_t max326_capture(struct watchdog_lowerhalf_s *lower,
irqstate_t flags; irqstate_t flags;
xcpt_t oldhandler; xcpt_t oldhandler;
DEBUGASSERT(priv != NULL) DEBUGASSERT(priv != NULL);
wdinfo("Handler=%p\n", handler); wdinfo("Handler=%p\n", handler);
/* Get the old handler */ /* Get the old handler */
flags = spin_lock_irqsave(NULL); flags = spin_lock_irqsave(&priv->lock);
oldhandler = priv->handler; oldhandler = priv->handler;
/* Save the new handler */ /* Save the new handler */
@@ -613,7 +616,7 @@ static xcpt_t max326_capture(struct watchdog_lowerhalf_s *lower,
max326_int_enable(priv); max326_int_enable(priv);
} }
spin_unlock_irqrestore(NULL, flags); spin_unlock_irqrestore(&priv->lock, flags);
return oldhandler; return oldhandler;
} }
@@ -667,12 +670,12 @@ int max326_wdt_initialize(const char *devpath)
struct max326_wdt_lowerhalf_s *priv = &g_wdtdev; struct max326_wdt_lowerhalf_s *priv = &g_wdtdev;
void *handle; void *handle;
wdinfo("Entry: devpath=%s, mode_sleep=%d, mode_halt=%d\n", wdinfo("Entry: devpath=%s, \n", devpath);
devpath, mode_sleep, mode_halt);
/* Initialize the driver state structure. */ /* Initialize the driver state structure. */
priv->ops = &g_wdtops; priv->ops = &g_wdtops;
spin_lock_init(&priv->lock);
/* Register the watchdog driver as /dev/watchdog0 */ /* Register the watchdog driver as /dev/watchdog0 */