Skip to content

changes from the thread direct branch 07/27 #239

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
Suvesh Pratapa (suveshpratapa) wants to merge 1 commit into
base: feature/thread-direct
Choose a base branch
from
Open

changes from the thread direct branch 07/27 #239

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
50 changes: 24 additions & 26 deletions sdk-copies/openthread/platform-abstraction/efr32/radio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/*
* Copyright (c) 2025, The OpenThread Authors.
* All rights reserved.
Expand Down Expand Up @@ -286,7 +287,7 @@

#if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)

#if OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE
#if (OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE || OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE)
static uint8_t sAckIeData[OT_ACK_IE_MAX_SIZE + SLI_OT_RADIO_DIRECT_ENH_ACK_IE_MAX_SIZE];
#else
static uint8_t sAckIeData[OT_ACK_IE_MAX_SIZE];
Expand Down Expand Up @@ -319,15 +320,15 @@
}
#endif

#if OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE
{
uint8_t available = (uint8_t)(sizeof(sAckIeData) - offset);
offset +=
sli_ot_radio_direct_generate_enh_ack_ie_data(aInstance, aReceivedFrame, sAckIeData + offset, available);
}
#if (OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE || OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE)
{
uint8_t available = (uint8_t)(sizeof(sAckIeData) - offset);

offset +=
sli_ot_radio_direct_generate_enh_ack_ie_data(aInstance, aReceivedFrame, sAckIeData + offset, available);
}

@cursor cursor Bot Jul 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Listener Enh-ACK wait missing

Medium Severity

Listener support was added for Thread Direct Enh-ACK IE buffer sizing and generateAckIeData, but the receive-side spin-poll that waits for Challenge LTV bytes before building the Enh-ACK stays under OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE only. In listener-only builds, sli_ot_radio_direct_generate_enh_ack_ie_data can run against incomplete early frame data after DATA_REQUEST_COMMAND, so Challenge echo or related TD Enh-ACK content can be wrong or missing.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 4575df0. Configure here.

#endif

exit:
return offset;
}
Expand Down Expand Up @@ -647,7 +648,7 @@
{
setInternalFlag(FLAG_SCHEDULED_RX_PENDING | EVENT_SCHEDULED_RX_STARTED, false);
}

SL_CODE_CLASSIFY(SL_CODE_COMPONENT_OT_PLATFORM_ABSTRACTION, SL_CODE_CLASS_TIME_CRITICAL)
bool sli_ot_radio_state_is_receiving_frame(void)
{
Expand Down Expand Up @@ -740,7 +741,7 @@

if (status != SL_RAIL_STATUS_NO_ERROR)
{
otLogWarnPlat("Failed to configure radio events: %lu", static_cast<unsigned long>(status));
otLogWarnPlat("Failed to configure radio events: %" PRIu32, status);
}
sCurrentEventConfig = newEventConfig;
}
Expand Down Expand Up @@ -1240,8 +1241,7 @@

sli_init_power_manager();

sl_rail_handle_t handle = sli_ot_radio_interface_rail_init(commonConfig);
OT_ASSERT(handle != nullptr);
OT_ASSERT(sli_ot_radio_interface_rail_init(commonConfig) != nullptr);

sli_ot_radio_events_update_config(SL_RAIL_EVENTS_ALL,
(0 | SL_RAIL_EVENT_RX_ACK_TIMEOUT | SL_RAIL_EVENT_RX_PACKET_RECEIVED
Expand Down Expand Up @@ -1483,7 +1483,7 @@
sli_ot_radio_interface_rail_idle();
sli_ot_radio_state_clear_scheduled_rx_events();
}

txPower = sl_get_tx_power_for_current_channel(aInstance);
error = sli_ot_radio_interface_load_channel_config(aChannel, txPower);
otEXPECT(error == OT_ERROR_NONE);
Expand Down Expand Up @@ -1584,7 +1584,6 @@
setRadioTxToIdleOrRxTransition(true);
}
#endif

OT_ASSERT(!sli_ot_radio_state_is_tx_data_ongoing());

sli_ot_radio_state_clear_all_tx_events();
Expand All @@ -1595,7 +1594,7 @@

#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
sli_ot_radio_csl_set_present(aInstance, aFrame->mInfo.mTxInfo.mCslPresent);

// ToDo: Simplify following ifdefs.
#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE \
|| (OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE || OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE)
Expand All @@ -1609,14 +1608,15 @@
||
#endif
#if (OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE || OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE)
(otMacFrameIsTdLinkCommand(&sCurrentTxPacket->frame) && sli_ot_radio_direct_slw_is_present(aInstance))
(otMacFrameHasThreadDirectScaLtv(&sCurrentTxPacket->frame)
&& sli_ot_radio_direct_slw_is_present(aInstance))
#endif
))
{
// Only called for CSL children (CSL period > 0)
// Note: Our SSEDs "schedule" transmissions to their parent in order to know
// exactly when in the future the data packets go out so they can calculate
// the accurate CSL phase to send to their parent.
// Only called for CSL children (CSL period > 0) or Thread Direct frames carrying
// an SCA LTV. Note: Our SSEDs "schedule" transmissions to their parent in order to
// know exactly when in the future the data packets go out so they can calculate
// the accurate CSL or SCA phase to send to their peer.
sCurrentTxPacket->frame.mInfo.mTxInfo.mTxDelayBaseTime = sl_rail_get_time(SL_RAIL_EFR32_HANDLE);
sCurrentTxPacket->frame.mInfo.mTxInfo.mTxDelay =
SCHEDULE_TX_DELAY_US; // Chosen after internal certification testing
Expand Down Expand Up @@ -1709,7 +1709,7 @@
#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE

#if (OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_INITIATOR_ENABLE || OPENTHREAD_CONFIG_THREAD_DIRECT_WAKE_LISTENER_ENABLE)
if (otMacFrameIsTdLinkCommand(&sCurrentTxPacket->frame) && sli_ot_radio_direct_slw_is_present(instance))
if (otMacFrameHasThreadDirectScaLtv(&sCurrentTxPacket->frame) && sli_ot_radio_direct_slw_is_present(instance))
{
uint16_t slwPhase;
int16_t ramOffsetUs;
Expand Down Expand Up @@ -1970,7 +1970,7 @@
otEXPECT_ACTION(sl_ot_rtos_task_can_access_pal(), error = OT_ERROR_REJECTED);

shouldDefer = sli_ot_radio_instance_energy_scan_should_defer();
otEXPECT_ACTION(!shouldDefer, error = OT_ERROR_BUSY);
otEXPECT_ACTION(!shouldDefer, sli_ot_radio_instance_energy_scan_defer(aInstance, aScanChannel, aScanDuration));

error = sli_ot_energy_scan_status_to_ot_error(
sli_ot_energy_scan_async(aInstance, aScanChannel, (sl_rail_time_t)aScanDuration * US_IN_MS));
Expand Down Expand Up @@ -2003,7 +2003,7 @@
{
sli_ot_radio_security_set_mac_frame_counter_if_larger(aInstance, aMacFrameCounter);
}

// Thread Direct platform APIs (otPlatRadioSetWakeKey + platform/thread_direct.h stubs)
// are implemented in radio_direct.cpp.
#endif // (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
Expand Down Expand Up @@ -2148,8 +2148,6 @@

sAckIeDataLength = generateAckIeData(instance, dataPtr, linkMetricsDataLen, &receivedFrame);

// Set the radioType to 0 to let mac know that this frame is intended for a 802.15.4 radio
enhAckFrame.mRadioType = 0;
otEXPECT(otMacFrameGenerateEnhAck(&receivedFrame, setFramePending, sAckIeData, sAckIeDataLength, &enhAckFrame)
== OT_ERROR_NONE);

Expand Down
Loading