Skip to content

nrfx: fix errata7 workaround in nrfx_nvmc_uicr_word_read/write #146

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

Open
campbellyoung wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nrfx: fix errata7 workaround in nrfx_nvmc_uicr_word_read/write #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions drivers/include/nrfx_nvmc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,9 @@ NRFX_STATIC_INLINE bool nrfx_nvmc_write_done_check(void)
NRFX_STATIC_INLINE uint32_t nrfx_nvmc_uicr_word_read(uint32_t const volatile *address)
{
#if NRF_ERRATA_STATIC_CHECK(91, 7)
const bool errata_7 = NRF_ERRATA_DYNAMIC_CHECK(91, 7);
bool irq_disabled = __get_PRIMASK() == 1;
if (NRF_ERRATA_DYNAMIC_CHECK(91, 7) && !irq_disabled)
if (errata_7 && !irq_disabled)
{
__disable_irq();
}
Expand All @@ -380,7 +381,7 @@ NRFX_STATIC_INLINE uint32_t nrfx_nvmc_uicr_word_read(uint32_t const volatile *ad
uint32_t value = nrf_nvmc_word_read((uint32_t)address);

#if NRF_ERRATA_STATIC_CHECK(91, 7)
if (NRF_ERRATA_DYNAMIC_CHECK(91, 7))
if (errata_7)
{
__DSB();
if (!irq_disabled)
Expand All @@ -396,8 +397,9 @@ NRFX_STATIC_INLINE uint32_t nrfx_nvmc_uicr_word_read(uint32_t const volatile *ad
NRFX_STATIC_INLINE void nrfx_nvmc_uicr_word_write(uint32_t volatile *address, uint32_t value)
{
#if NRF_ERRATA_STATIC_CHECK(91, 7)
const bool errata_7 = NRF_ERRATA_DYNAMIC_CHECK(91, 7);
bool irq_disabled = __get_PRIMASK() == 1;
if (NRF_ERRATA_DYNAMIC_CHECK(91, 7) && !irq_disabled)
if (errata_7 && !irq_disabled)
{
__disable_irq();
}
Expand All @@ -406,7 +408,7 @@ NRFX_STATIC_INLINE void nrfx_nvmc_uicr_word_write(uint32_t volatile *address, ui
nrfx_nvmc_word_write((uint32_t)address, value);

#if NRF_ERRATA_STATIC_CHECK(91, 7)
if (NRF_ERRATA_DYNAMIC_CHECK(91, 7))
if (errata_7)
{
__DSB();
if (!irq_disabled)
Expand Down