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

arm/cxd56xx: Add g_ prefix to rtc spin lock

Browse source 
continue work of a68b00206b

| commit a68b00206b
| Author: hujun5 <hujun5@xiaomi.com>
| Date:   Mon Dec 9 20:48:09 2024 +0800
|
|     cxd56_rtc.c: use small lock in arch/arm/src/cxd56xx/cxd56_rtc.c
|
|     reason:
|     We hope to remove all instances of spin_lock_irqsave(NULL).
|
|     Signed-off-by: hujun5 <hujun5@xiaomi.com>

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-12-10 13:53:04 +08:00 committed by Xiang Xiao
parent 52c4408db9
commit a94264ea00
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/src/cxd56xx/cxd56_rtc.c
View file

@ -113,7 +113,7 @@ struct rtc_backup_s
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
static spinlock_t lock = SP_UNLOCKED; static spinlock_t g_rtc_lock = SP_UNLOCKED;
/* Callback to use when the alarm expires */ /* Callback to use when the alarm expires */
@ -436,7 +436,7 @@ int up_rtc_settime(const struct timespec *tp)
irqstate_t flags; irqstate_t flags;
uint64_t count; uint64_t count;
flags = spin_lock_irqsave(&lock); flags = spin_lock_irqsave(&g_rtc_lock);
#ifdef RTC_DIRECT_CONTROL #ifdef RTC_DIRECT_CONTROL
/* wait until previous write request is completed */ /* wait until previous write request is completed */
@ -459,7 +459,7 @@ int up_rtc_settime(const struct timespec *tp)
g_rtc_save->offset = (int64_t)count - (int64_t)cxd56_rtc_count(); g_rtc_save->offset = (int64_t)count - (int64_t)cxd56_rtc_count();
#endif #endif
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&g_rtc_lock, flags);
rtc_dumptime(tp, "Setting time"); rtc_dumptime(tp, "Setting time");
@ -487,12 +487,12 @@ uint64_t cxd56_rtc_count(void)
* 1st post -> 2nd pre, and should be operated in atomic. * 1st post -> 2nd pre, and should be operated in atomic.
*/ */
flags = spin_lock_irqsave(&lock); flags = spin_lock_irqsave(&g_rtc_lock);
val = (uint64_t)getreg32(CXD56_RTC0_RTPOSTCNT) << 15; val = (uint64_t)getreg32(CXD56_RTC0_RTPOSTCNT) << 15;
val |= getreg32(CXD56_RTC0_RTPRECNT); val |= getreg32(CXD56_RTC0_RTPRECNT);
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&g_rtc_lock, flags);
return val; return val;
} }
@ -514,12 +514,12 @@ uint64_t cxd56_rtc_almcount(void)
uint64_t val; uint64_t val;
irqstate_t flags; irqstate_t flags;
flags = spin_lock_irqsave(&lock); flags = spin_lock_irqsave(&g_rtc_lock);
val = (uint64_t)getreg32(CXD56_RTC0_SETALMPOSTCNT(0)) << 15; val = (uint64_t)getreg32(CXD56_RTC0_SETALMPOSTCNT(0)) << 15;
val |= (getreg32(CXD56_RTC0_SETALMPRECNT(0)) & 0x7fff); val |= (getreg32(CXD56_RTC0_SETALMPRECNT(0)) & 0x7fff);
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&g_rtc_lock, flags);
return val; return val;
} }
@ -561,7 +561,7 @@ int cxd56_rtc_setalarm(struct alm_setalarm_s *alminfo)
{ {
/* The set the alarm */ /* The set the alarm */
flags = spin_lock_irqsave(&lock); flags = spin_lock_irqsave(&g_rtc_lock);
cbinfo->ac_cb = alminfo->as_cb; cbinfo->ac_cb = alminfo->as_cb;
cbinfo->ac_arg = alminfo->as_arg; cbinfo->ac_arg = alminfo->as_arg;
@ -592,7 +592,7 @@ int cxd56_rtc_setalarm(struct alm_setalarm_s *alminfo)
while (RTCREG_ALM_BUSY_MASK & getreg32(CXD56_RTC0_ALMOUTEN(id))); while (RTCREG_ALM_BUSY_MASK & getreg32(CXD56_RTC0_ALMOUTEN(id)));
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&g_rtc_lock, flags);
rtc_dumptime(&alminfo->as_time, "New Alarm time"); rtc_dumptime(&alminfo->as_time, "New Alarm time");
ret = OK; ret = OK;
@ -634,7 +634,7 @@ int cxd56_rtc_cancelalarm(enum alm_id_e alarmid)
{ {
/* Unset the alarm */ /* Unset the alarm */
flags = spin_lock_irqsave(&lock); flags = spin_lock_irqsave(&g_rtc_lock);
cbinfo->ac_cb = NULL; cbinfo->ac_cb = NULL;
@ -667,7 +667,7 @@ int cxd56_rtc_cancelalarm(enum alm_id_e alarmid)
putreg32(mask, CXD56_RTC0_ALMCLR); putreg32(mask, CXD56_RTC0_ALMCLR);
} }
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&g_rtc_lock, flags);
ret = OK; ret = OK;
} }