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

Cherrypick fixes for ACK header IE related bugs #1470

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Cherrypick fixes for ACK header IE related bugs #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce11280
Revert "[nrf noup] drivers: ieee802154: temporary fix for ACK header …
maciejbaczmanski Jan 26, 2024
545a2db
[nrf fromtree] drivers: ieee802154: fix ACK header IE implementation
maciejbaczmanski Jan 23, 2024
e4c93ac
[nrf fromtree] drivers: ieee802154: fix handling of `struct ieee80215…
maciejbaczmanski Jan 23, 2024
104e695
[nrf fromtree] net: openthread: upmerge to `7761b81`
maciejbaczmanski Jan 23, 2024
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
51 changes: 22 additions & 29 deletions drivers/ieee802154/ieee802154_nrf5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,17 +899,11 @@ static int nrf5_configure(const struct device *dev,
uint8_t ext_addr_le[EXTENDED_ADDRESS_SIZE];
uint8_t short_addr_le[SHORT_ADDRESS_SIZE];
uint8_t element_id;
bool valid_vendor_specific_ie = false;

if (config->ack_ie.ext_addr == NULL &&
config->ack_ie.header_ie == NULL &&
config->ack_ie.short_addr == IEEE802154_NO_SHORT_ADDRESS_ASSIGNED) {
/* Hotfix for case when `EnableCsl()` has been called with arguments:
* - `aCslPeriod` == 0
* - `aShortAddr` == IEEE802154_NO_SHORT_ADDRESS_ASSIGNED
* - `aExtAddr` == NULL
* In this case skip configuring ACK header IE until proper resetting of
* configuration is implemented.
*/
if (config->ack_ie.purge_ie) {
nrf_802154_ack_data_remove_all(false, NRF_802154_ACK_DATA_IE);
nrf_802154_ack_data_remove_all(true, NRF_802154_ACK_DATA_IE);
break;
}

Expand All @@ -918,29 +912,31 @@ static int nrf5_configure(const struct device *dev,
return -ENOTSUP;
}

element_id = ieee802154_header_ie_get_element_id(config->ack_ie.header_ie);
sys_put_le16(config->ack_ie.short_addr, short_addr_le);
sys_memcpy_swap(ext_addr_le, config->ack_ie.ext_addr, EXTENDED_ADDRESS_SIZE);

if (element_id != IEEE802154_HEADER_IE_ELEMENT_ID_CSL_IE &&
(!IS_ENABLED(CONFIG_NET_L2_OPENTHREAD) ||
element_id != IEEE802154_HEADER_IE_ELEMENT_ID_VENDOR_SPECIFIC_IE)) {
return -ENOTSUP;
}
if (config->ack_ie.header_ie == NULL || config->ack_ie.header_ie->length == 0) {
nrf_802154_ack_data_clear(short_addr_le, false, NRF_802154_ACK_DATA_IE);
nrf_802154_ack_data_clear(ext_addr_le, true, NRF_802154_ACK_DATA_IE);
} else {
element_id = ieee802154_header_ie_get_element_id(config->ack_ie.header_ie);

#if defined(CONFIG_NET_L2_OPENTHREAD)
uint8_t vendor_oui_le[IEEE802154_OPENTHREAD_VENDOR_OUI_LEN] =
IEEE802154_OPENTHREAD_THREAD_IE_VENDOR_OUI;
uint8_t vendor_oui_le[IEEE802154_OPENTHREAD_VENDOR_OUI_LEN] =
IEEE802154_OPENTHREAD_THREAD_IE_VENDOR_OUI;

if (element_id == IEEE802154_HEADER_IE_ELEMENT_ID_VENDOR_SPECIFIC_IE &&
memcmp(config->ack_ie.header_ie->content.vendor_specific.vendor_oui,
vendor_oui_le, sizeof(vendor_oui_le))) {
return -ENOTSUP;
}
if (element_id == IEEE802154_HEADER_IE_ELEMENT_ID_VENDOR_SPECIFIC_IE &&
memcmp(config->ack_ie.header_ie->content.vendor_specific.vendor_oui,
vendor_oui_le, sizeof(vendor_oui_le)) == 0) {
valid_vendor_specific_ie = true;
}
#endif

sys_put_le16(config->ack_ie.short_addr, short_addr_le);
sys_memcpy_swap(ext_addr_le, config->ack_ie.ext_addr, EXTENDED_ADDRESS_SIZE);
if (element_id != IEEE802154_HEADER_IE_ELEMENT_ID_CSL_IE &&
!valid_vendor_specific_ie) {
return -ENOTSUP;
}

if (config->ack_ie.header_ie && config->ack_ie.header_ie->length > 0) {
nrf_802154_ack_data_set(short_addr_le, false, config->ack_ie.header_ie,
config->ack_ie.header_ie->length +
IEEE802154_HEADER_IE_HEADER_LENGTH,
Expand All @@ -949,9 +945,6 @@ static int nrf5_configure(const struct device *dev,
config->ack_ie.header_ie->length +
IEEE802154_HEADER_IE_HEADER_LENGTH,
NRF_802154_ACK_DATA_IE);
} else {
nrf_802154_ack_data_clear(short_addr_le, false, NRF_802154_ACK_DATA_IE);
nrf_802154_ack_data_clear(ext_addr_le, true, NRF_802154_ACK_DATA_IE);
}
} break;

Expand Down
9 changes: 9 additions & 0 deletions include/zephyr/net/ieee802154_radio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,6 +1241,15 @@ struct ieee802154_config {
* in CPU byte order
*/
uint16_t short_addr;

/**
* Flag for purging enh ACK header IEs.
* When flag is set to true, driver should remove all existing
* header IEs, and all other entries in config should be ignored.
* This means that purging current header IEs and
* configuring a new one in the same call is not allowed.
*/
bool purge_ie;
} ack_ie;
};
};
Expand Down
36 changes: 24 additions & 12 deletions modules/openthread/platform/radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,10 +1255,7 @@ void otPlatRadioSetMacFrameCounterIfLarger(otInstance *aInstance, uint32_t aMacF
otError otPlatRadioEnableCsl(otInstance *aInstance, uint32_t aCslPeriod, otShortAddress aShortAddr,
const otExtAddress *aExtAddr)
{
struct ieee802154_config config = {
.ack_ie.short_addr = aShortAddr,
.ack_ie.ext_addr = aExtAddr->m8,
};
struct ieee802154_config config = { 0 };
int result;

ARG_UNUSED(aInstance);
Expand All @@ -1271,6 +1268,8 @@ otError otPlatRadioEnableCsl(otInstance *aInstance, uint32_t aCslPeriod, otShort
if (result) {
return OT_ERROR_FAILED;
}
config.ack_ie.short_addr = aShortAddr;
config.ack_ie.ext_addr = aExtAddr != NULL ? aExtAddr->m8 : NULL;

/* Configure the CSL IE. */
if (aCslPeriod > 0) {
Expand All @@ -1295,6 +1294,22 @@ otError otPlatRadioEnableCsl(otInstance *aInstance, uint32_t aCslPeriod, otShort
return result ? OT_ERROR_FAILED : OT_ERROR_NONE;
}

otError otPlatRadioResetCsl(otInstance *aInstance)
{
struct ieee802154_config config = { 0 };
int result;

result = radio_api->configure(radio_dev, IEEE802154_CONFIG_CSL_PERIOD, &config);
if (result) {
return OT_ERROR_FAILED;
}

config.ack_ie.purge_ie = true;
result = radio_api->configure(radio_dev, IEEE802154_CONFIG_ENH_ACK_HEADER_IE, &config);

return result ? OT_ERROR_FAILED : OT_ERROR_NONE;
}

void otPlatRadioUpdateCslSampleTime(otInstance *aInstance, uint32_t aCslSampleTime)
{
ARG_UNUSED(aInstance);
Expand Down Expand Up @@ -1348,7 +1363,7 @@ uint8_t otPlatRadioGetCslUncertainty(otInstance *aInstance)
* | IE_VENDOR_THREAD_ACK_PROBING_ID | LINK_METRIC_TOKEN | LINK_METRIC_TOKEN|
* |---------------------------------|-------------------|------------------|
*/
static uint8_t set_vendor_ie_header_lm(bool lqi, bool link_margin, bool rssi, uint8_t *ie_header)
static void set_vendor_ie_header_lm(bool lqi, bool link_margin, bool rssi, uint8_t *ie_header)
{
/* Vendor-specific IE identifier */
const uint8_t ie_vendor_id = 0x00;
Expand All @@ -1362,7 +1377,6 @@ static uint8_t set_vendor_ie_header_lm(bool lqi, bool link_margin, bool rssi, ui
const uint8_t ie_vendor_thread_margin_token = 0x02;
/* Thread Vendor-specific ACK Probing IE LQI value placeholder */
const uint8_t ie_vendor_thread_lqi_token = 0x03;
const uint8_t ie_header_size = 2;
const uint8_t oui_size = 3;
const uint8_t sub_type = 1;
const uint8_t id_offset = 7;
Expand All @@ -1380,7 +1394,8 @@ static uint8_t set_vendor_ie_header_lm(bool lqi, bool link_margin, bool rssi, ui
__ASSERT(ie_header, "Invalid argument");

if (link_metrics_data_len == 0) {
return 0;
ie_header[0] = 0;
return;
}

/* Set Element ID */
Expand Down Expand Up @@ -1415,8 +1430,6 @@ static uint8_t set_vendor_ie_header_lm(bool lqi, bool link_margin, bool rssi, ui
if (rssi) {
ie_header[link_metrics_idx++] = ie_vendor_thread_rssi_token;
}

return ie_header_size + content_len;
}

otError otPlatRadioConfigureEnhAckProbing(otInstance *aInstance, otLinkMetrics aLinkMetrics,
Expand All @@ -1428,13 +1441,12 @@ otError otPlatRadioConfigureEnhAckProbing(otInstance *aInstance, otLinkMetrics a
.ack_ie.ext_addr = aExtAddress->m8,
};
uint8_t header_ie_buf[OT_ACK_IE_MAX_SIZE];
uint16_t header_ie_len;
int result;

ARG_UNUSED(aInstance);

header_ie_len = set_vendor_ie_header_lm(aLinkMetrics.mLqi, aLinkMetrics.mLinkMargin,
aLinkMetrics.mRssi, header_ie_buf);
set_vendor_ie_header_lm(aLinkMetrics.mLqi, aLinkMetrics.mLinkMargin,
aLinkMetrics.mRssi, header_ie_buf);
config.ack_ie.header_ie = (struct ieee802154_header_ie *)header_ie_buf;
result = radio_api->configure(radio_dev, IEEE802154_CONFIG_ENH_ACK_HEADER_IE, &config);

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ manifest:
revision: 214f9fc1539f8e5937c0474cb6ee29b6dcb2d4b8
path: modules/lib/open-amp
- name: openthread
revision: 00076aff3ae571db7c90509ec9dc293457098c35
revision: 7761b81d23b10b3d5ee21b8504c67535cde10896
path: modules/lib/openthread
- name: percepio
path: modules/debug/percepio
Expand Down
Loading