adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

icbmsg: Allow deregistration of the endpoints

Browse source 
This is implementation of ICBMsg endpoint deregistration.
The underlying ICMsg instance and blocks are not affected by
deregistration, so it is possible to reuse the same address
during the re-registration of the same endpoint.

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
This commit is contained in:
Dominik Kilian 2024-06-20 10:54:57 +02:00 committed by Maureen Helm
parent bb76d22540
commit 131229b2c4
1 changed files with 62 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
subsys/ipc/ipc_service/backends/ipc_icbmsg.c
View file

@ -146,6 +146,14 @@ enum ept_bounding_state {
EPT_READY, /* Bounding is done. Bound callback was called. */
};
enum ept_rebound_state {
EPT_NORMAL = 0, /* No endpoint rebounding is needed. */
EPT_DEREGISTERED, /* Endpoint was deregistered. */
EPT_REBOUNDING, /* Rebounding was requested, waiting for work queue to
* start rebounding process.
*/
};
struct channel_config {
uint8_t *blocks_ptr; /* Address where the blocks start. */
size_t block_size; /* Size of one block. */
@ -166,6 +174,7 @@ struct icbmsg_config {
struct ept_data {
const struct ipc_ept_cfg *cfg; /* Endpoint configuration. */
atomic_t state; /* Bounding state. */
atomic_t rebound_state; /* Rebounding state. */
uint8_t addr; /* Endpoint address. */
};
@ -775,6 +784,18 @@ static void ept_bound_process(struct backend_data *dev_data)
k_mutex_unlock(&dev_data->mutex);
#endif
}
/* Check if any endpoint is ready to rebound and call the callback if it is. */
for (i = 0; i < NUM_EPT; i++) {
ept = &dev_data->ept[i];
matching_state = atomic_cas(&ept->rebound_state, EPT_REBOUNDING,
EPT_NORMAL);
if (matching_state) {
if (ept->cfg->cb.bound != NULL) {
ept->cfg->cb.bound(ept->cfg->priv);
}
}
}
}
/**
@ -798,7 +819,10 @@ static struct ept_data *get_ept_and_rx_validate(struct backend_data *dev_data,
state = atomic_get(&ept->state);
if (state == EPT_READY) {
/* Valid state - nothing to do. */
/* Ready state, ensure that it is not deregistered nor rebounding. */
if (atomic_get(&ept->rebound_state) != EPT_NORMAL) {
return NULL;
}
} else if (state == EPT_BOUNDING) {
/* Endpoint bound callback was not called yet - call it. */
atomic_set(&ept->state, EPT_READY);
@ -1060,9 +1084,28 @@ static int register_ept(const struct device *instance, void **token,
{
struct backend_data *dev_data = instance->data;
struct ept_data *ept = NULL;
bool matching_state;
int ept_index;
int r = 0;
/* Try to find endpoint to rebound */
for (ept_index = 0; ept_index < NUM_EPT; ept_index++) {
ept = &dev_data->ept[ept_index];
if (ept->cfg == cfg) {
matching_state = atomic_cas(&ept->rebound_state, EPT_DEREGISTERED,
EPT_REBOUNDING);
if (!matching_state) {
return -EINVAL;
}
#ifdef CONFIG_MULTITHREADING
schedule_ept_bound_process(dev_data);
#else
ept_bound_process(dev_data);
#endif
return 0;
}
}
/* Reserve new endpoint index. */
ept_index = atomic_inc(&dev_data->flags) & FLAG_EPT_COUNT_MASK;
if (ept_index >= NUM_EPT) {
@ -1093,6 +1136,23 @@ static int register_ept(const struct device *instance, void **token,
return r;
}
/**
* Backend endpoint deregistration callback.
*/
static int deregister_ept(const struct device *instance, void *token)
{
struct ept_data *ept = token;
bool matching_state;
matching_state = atomic_cas(&ept->rebound_state, EPT_NORMAL, EPT_DEREGISTERED);
if (!matching_state) {
return -EINVAL;
}
return 0;
}
/**
* Returns maximum TX buffer size.
*/
@ -1226,7 +1286,7 @@ const static struct ipc_service_backend backend_ops = {
.close_instance = NULL, /* not implemented */
.send = send,
.register_endpoint = register_ept,
.deregister_endpoint = NULL, /* not implemented */
.deregister_endpoint = deregister_ept,
.get_tx_buffer_size = get_tx_buffer_size,
.get_tx_buffer = get_tx_buffer,
.drop_tx_buffer = drop_tx_buffer,