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] Fix race condition in the UART driver used by the matter shell #37874

Closed
wants to merge 2 commits into from
Closed

[Silabs] Fix race condition in the UART driver used by the matter shell #37874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc33ea
[Silabs] Fix race condition in the uart driver use by the matter shell
silabs-olivierb Mar 4, 2025
c3c63bd
Restyled by clang-format
restyled-commits Mar 4, 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
12 changes: 11 additions & 1 deletion examples/platform/silabs/uart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,16 @@ static bool InitFifo(Fifo_t * fifo, uint8_t * pDataBuffer, uint16_t bufferSize)
static uint16_t AvailableDataCount(Fifo_t * fifo)
{
uint16_t size = 0;
CORE_DECLARE_IRQ_STATE;

CORE_ENTER_ATOMIC();
// if equal there is no data return 0 directly
if (fifo->Tail != fifo->Head)
{
// determine if a wrap around occurred to get the right data size avalaible.
size = (fifo->Tail < fifo->Head) ? (fifo->MaxSize - fifo->Head + fifo->Tail) : (fifo->Tail - fifo->Head);
}
CORE_EXIT_ATOMIC();

return size;
}
Expand All @@ -249,10 +252,12 @@ static void WriteToFifo(Fifo_t * fifo, uint8_t * pDataToWrite, uint16_t SizeToWr
VerifyOrDie(fifo != nullptr);
VerifyOrDie(pDataToWrite != nullptr);
VerifyOrDie(SizeToWrite <= fifo->MaxSize);
CORE_DECLARE_IRQ_STATE;

// Overwrite is not allowed
if (RemainingSpace(fifo) >= SizeToWrite)
{
CORE_ENTER_ATOMIC();
uint16_t nBytesBeforWrap = (fifo->MaxSize - fifo->Tail);
if (SizeToWrite > nBytesBeforWrap)
{
Expand All @@ -267,6 +272,7 @@ static void WriteToFifo(Fifo_t * fifo, uint8_t * pDataToWrite, uint16_t SizeToWr
}

fifo->Tail = (fifo->Tail + SizeToWrite) % fifo->MaxSize; // increment tail with wraparound
CORE_EXIT_ATOMIC();
}
}

Expand All @@ -280,8 +286,11 @@ static uint16_t RetrieveFromFifo(Fifo_t * fifo, uint8_t * pData, uint16_t SizeTo
VerifyOrDie(fifo != nullptr);
VerifyOrDie(pData != nullptr);
VerifyOrDie(SizeToRead <= fifo->MaxSize);
CORE_DECLARE_IRQ_STATE;

uint16_t ReadSize = std::min(SizeToRead, AvailableDataCount(fifo));
uint16_t ReadSize = std::min(SizeToRead, AvailableDataCount(fifo));

CORE_ENTER_ATOMIC();
uint16_t nBytesBeforWrap = (fifo->MaxSize - fifo->Head);

if (ReadSize > nBytesBeforWrap)
Expand All @@ -295,6 +304,7 @@ static uint16_t RetrieveFromFifo(Fifo_t * fifo, uint8_t * pData, uint16_t SizeTo
}

fifo->Head = (fifo->Head + ReadSize) % fifo->MaxSize; // increment tail with wraparound
CORE_EXIT_ATOMIC();

return ReadSize;
}
Expand Down
Loading