Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers: rtc: rtc_ll_stm32: replace k_mutex with k_spinlock #85943

Merged
merged 2 commits into from
Mar 21, 2025
+32 −40
Merged

drivers: rtc: rtc_ll_stm32: replace k_mutex with k_spinlock #85943

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295854b
drivers: rtc: rtc_ll_stm32: replace k_mutex with k_spinlock
Feb 18, 2025
e073fa9
drivers: rtc: rtc_ll_stm32: rework lock usage in rtc_stm32_set_time
Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
drivers: rtc: rtc_ll_stm32: replace k_mutex with k_spinlock 
This allows using this RTC driver from contexts where `k_mutex` use is not
allowed.

Signed-off-by: Jeppe Odgaard <jeppe.odgaard@prevas.dk>
Jeppe Odgaard committed Mar 20, 2025
commit 295854b28fb855ebbc1b5221b25c937ab8d014d8
50 changes: 21 additions & 29 deletions drivers/rtc/rtc_ll_stm32.c
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
#include <zephyr/kernel.h>
#include <zephyr/init.h>
#include <zephyr/devicetree.h>
#include <zephyr/spinlock.h>
#include <zephyr/drivers/rtc.h>
#include <zephyr/drivers/clock_control/stm32_clock_control.h>
#include <zephyr/drivers/clock_control.h>
@@ -132,7 +133,7 @@ struct rtc_stm32_alrm {
#endif /* STM32_RTC_ALARM_ENABLED */

struct rtc_stm32_data {
struct k_mutex lock;
struct k_spinlock lock;
#ifdef STM32_RTC_ALARM_ENABLED
struct rtc_stm32_alrm rtc_alrm_a;
struct rtc_stm32_alrm rtc_alrm_b;
@@ -335,7 +336,7 @@ static int rtc_stm32_init(const struct device *dev)
{
const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
const struct rtc_stm32_config *cfg = dev->config;
struct rtc_stm32_data *data = dev->data;
__maybe_unused struct rtc_stm32_data *data = dev->data;

int err = 0;

@@ -380,8 +381,6 @@ static int rtc_stm32_init(const struct device *dev)
}
#endif /* CONFIG_SOC_SERIES_STM32WB0X */

k_mutex_init(&data->lock);

/* Enable Backup access */
#if RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION
LL_PWR_EnableBkUpAccess();
@@ -426,11 +425,11 @@ static int rtc_stm32_init(const struct device *dev)

ll_func_exti_enable_rtc_alarm_it(RTC_STM32_EXTI_LINE);

k_mutex_lock(&data->lock, K_FOREVER);
memset(&(data->rtc_alrm_a), 0, sizeof(struct rtc_stm32_alrm));
memset(&(data->rtc_alrm_b), 0, sizeof(struct rtc_stm32_alrm));
k_mutex_unlock(&data->lock);
#endif /* STM32_RTC_ALARM_ENABLED */
K_SPINLOCK(&data->lock) {
memset(&(data->rtc_alrm_a), 0, sizeof(struct rtc_stm32_alrm));
memset(&(data->rtc_alrm_b), 0, sizeof(struct rtc_stm32_alrm));
}
#endif /* CONFIG_RTC_ALARM */

return err;
}
@@ -453,10 +452,7 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
return -EINVAL;
}

err = k_mutex_lock(&data->lock, K_NO_WAIT);
if (err) {
return err;
}
k_spinlock_key_t key = k_spin_lock(&data->lock);

LOG_DBG("Setting clock");

@@ -494,7 +490,7 @@ static int rtc_stm32_set_time(const struct device *dev, const struct rtc_time *t
}
#endif /* CONFIG_SOC_SERIES_STM32F2X */

k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);

LOG_DBG("Calendar set : %d/%d/%d - %dh%dm%ds",
LL_RTC_DATE_GetDay(RTC),
@@ -524,18 +520,14 @@ static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr
return -EINVAL;
}

int err = k_mutex_lock(&data->lock, K_NO_WAIT);

if (err) {
return err;
}
k_spinlock_key_t key = k_spin_lock(&data->lock);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same remark here


if (!LL_RTC_IsActiveFlag_INITS(RTC)) {
/* INITS flag is set when the calendar has been initialiazed. This flag is
* reset only on backup domain reset, so it can be read after a system
* reset to check if the calendar has been initialized.
*/
k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);
return -ENODATA;
}

@@ -555,7 +547,7 @@ static int rtc_stm32_get_time(const struct device *dev, struct rtc_time *timeptr
} while (rtc_time != LL_RTC_TIME_Get(RTC));
} while (rtc_date != LL_RTC_DATE_Get(RTC));

k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);

/* tm_year is the value since 1900 and Rtc year is from 2000 */
timeptr->tm_year = bcd2bin(__LL_RTC_GET_YEAR(rtc_date)) + (RTC_YEAR_REF - TM_YEAR_REF);
@@ -757,7 +749,7 @@ static int rtc_stm32_alarm_get_time(const struct device *dev, uint16_t id, uint1
return -EINVAL;
}

k_mutex_lock(&data->lock, K_FOREVER);
k_spinlock_key_t key = k_spin_lock(&data->lock);

if (id == RTC_STM32_ALRM_A) {
p_rtc_alrm = &(data->rtc_alrm_a);
@@ -785,7 +777,7 @@ static int rtc_stm32_alarm_get_time(const struct device *dev, uint16_t id, uint1
timeptr->tm_min, timeptr->tm_sec, *mask);

unlock:
k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);

return err;
}
@@ -799,7 +791,7 @@ static int rtc_stm32_alarm_set_time(const struct device *dev, uint16_t id, uint1
LL_RTC_TimeTypeDef *p_ll_rtc_alrm_time;
int err = 0;

k_mutex_lock(&data->lock, K_FOREVER);
k_spinlock_key_t key = k_spin_lock(&data->lock);

if (id == RTC_STM32_ALRM_A) {
p_rtc_alrm = &(data->rtc_alrm_a);
@@ -918,7 +910,7 @@ static int rtc_stm32_alarm_set_time(const struct device *dev, uint16_t id, uint1
#endif /* RTC_STM32_BACKUP_DOMAIN_WRITE_PROTECTION */

unlock:
k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);

if (id == RTC_STM32_ALRM_A) {
LOG_DBG("Alarm A : %dh%dm%ds mask = 0x%x",
@@ -946,7 +938,7 @@ static int rtc_stm32_alarm_set_callback(const struct device *dev, uint16_t id,
struct rtc_stm32_alrm *p_rtc_alrm;
int err = 0;

k_mutex_lock(&data->lock, K_FOREVER);
k_spinlock_key_t key = k_spin_lock(&data->lock);

if (id == RTC_STM32_ALRM_A) {
p_rtc_alrm = &(data->rtc_alrm_a);
@@ -963,7 +955,7 @@ static int rtc_stm32_alarm_set_callback(const struct device *dev, uint16_t id,
p_rtc_alrm->user_data = user_data;

unlock:
k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);

return err;
}
@@ -974,7 +966,7 @@ static int rtc_stm32_alarm_is_pending(const struct device *dev, uint16_t id)
struct rtc_stm32_alrm *p_rtc_alrm;
int ret = 0;

k_mutex_lock(&data->lock, K_FOREVER);
k_spinlock_key_t key = k_spin_lock(&data->lock);

if (id == RTC_STM32_ALRM_A) {
p_rtc_alrm = &(data->rtc_alrm_a);
@@ -992,7 +984,7 @@ static int rtc_stm32_alarm_is_pending(const struct device *dev, uint16_t id)
__enable_irq();

unlock:
k_mutex_unlock(&data->lock);
k_spin_unlock(&data->lock, key);
return ret;
}
#endif /* STM32_RTC_ALARM_ENABLED */