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

[Silabs] Move NVM semaphore creation to nvm3_lockBegin() #26270

Merged
merged 3 commits into from
Apr 27, 2023
Merged

[Silabs] Move NVM semaphore creation to nvm3_lockBegin() #26270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffc2fbf
Move NVM initialization to sl_platform_init() in matter_support submo…
selissia Apr 26, 2023
0fceafd
Merge branch 'master' into nvm_init_fix
selissia Apr 26, 2023
02deebd
Restore the call to nvm3_open(), it's safe to call multiple times
selissia Apr 26, 2023
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
15 changes: 7 additions & 8 deletions src/platform/silabs/SilabsConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ static StaticSemaphore_t nvm3_SemStruct;

void nvm3_lockBegin(void)
{
if (nvm3_Sem == NULL)
{
nvm3_Sem = xSemaphoreCreateBinaryStatic(&nvm3_SemStruct);
xSemaphoreGive(nvm3_Sem);
}

VerifyOrDie(nvm3_Sem != NULL);
xSemaphoreTake(nvm3_Sem, portMAX_DELAY);
}
Expand All @@ -65,15 +71,8 @@ namespace Internal {

CHIP_ERROR SilabsConfig::Init()
{
#ifndef BRD4325A // TODO: fix semaphore usage in nvm3_lock for siwx917. use weak implementation for that board instead
nvm3_Sem = xSemaphoreCreateBinaryStatic(&nvm3_SemStruct);
// nvm3_Sem is created in nvm3_lockBegin()

if (nvm3_Sem == NULL)
{
return CHIP_ERROR_NO_MEMORY;
}
xSemaphoreGive(nvm3_Sem);
#endif // not BRD4325A
return MapNvm3Error(nvm3_open(nvm3_defaultHandle, nvm3_defaultInit));
}

Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/matter_support
Open in desktop
Submodule matter_support updated 18 files
+2 −0 matter/efr32/efr32mg12/BRD4161A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4162A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4163A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4164A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4166A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4170A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg12/BRD4304A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD2601B/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD2703A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD4186A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD4186C/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD4187A/autogen/sl_event_handler.c
+2 −0 matter/efr32/efr32mg24/BRD4187C/autogen/sl_event_handler.c
+2 −1 matter/efr32/mgm24/BRD2704A/autogen/sl_event_handler.c
+2 −0 matter/efr32/mgm24/BRD4316A/autogen/sl_event_handler.c
+2 −0 matter/efr32/mgm24/BRD4317A/autogen/sl_event_handler.c
+2 −1 matter/efr32/mgm24/BRD4318A/autogen/sl_event_handler.c
+2 −0 matter/efr32/mgm24/BRD4319A/autogen/sl_event_handler.c