patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: wifi: esp: do not wait at the end of ESP chip reset

Browse source 
esp_reset() is called from net_if init function, which holds net_if lock
after commit 24b49f4399 ("net: if: Add locking"). At the end of
esp_reset() there is a blocking wait on `sem_if_up` semaphore. This
semaphore can be release only by esp_init_work(). esp_init_work()
however blocks on net_if operations, because net_if init function (which
invokes esp_reset() underneath) is still holding net_if lock. As a
result there is a deadlock, because esp_reset() and esp_init_work() are
both waiting on each other.

Remove waiting for `sem_if_up`, so that net_if init can exit and release
net_if lock.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
This commit is contained in:
Marcin Niestroj 2021-04-14 19:18:32 +02:00 committed by Kumar Gala
parent f8e9b505c9
commit a8e6fc0b83
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/wifi/esp/esp.c
View file

@ -1000,14 +1000,10 @@ static void esp_init_work(struct k_work *work)
LOG_INF("ESP Wi-Fi ready");
net_if_up(dev->net_iface);
k_sem_give(&dev->sem_if_up);
}
static void esp_reset(struct esp_data *dev)
{
int ret;
if (net_if_is_up(dev->net_iface)) {
net_if_down(dev->net_iface);
}
@ -1021,6 +1017,7 @@ static void esp_reset(struct esp_data *dev)
k_sleep(K_MSEC(100));
modem_pin_write(&dev->mctx, ESP_RESET, 0);
#else
int ret;
int retries = 3;
while (retries--) {
@ -1037,13 +1034,6 @@ static void esp_reset(struct esp_data *dev)
return;
}
#endif
LOG_INF("Waiting for interface to come up");
ret = k_sem_take(&dev->sem_if_up, ESP_INIT_TIMEOUT);
if (ret == -EAGAIN) {
LOG_ERR("Timeout waiting for interface");
}
}
static void esp_iface_init(struct net_if *iface)
@ -1074,7 +1064,6 @@ static int esp_init(const struct device *dev)
k_sem_init(&data->sem_tx_ready, 0, 1);
k_sem_init(&data->sem_response, 0, 1);
k_sem_init(&data->sem_if_ready, 0, 1);
k_sem_init(&data->sem_if_up, 0, 1);
k_work_init(&data->init_work, esp_init_work);
k_work_init_delayable(&data->ip_addr_work, esp_ip_addr_work);

1
drivers/wifi/esp/esp.h
View file

@ -230,7 +230,6 @@ struct esp_data {
struct k_sem sem_tx_ready;
struct k_sem sem_response;
struct k_sem sem_if_ready;
struct k_sem sem_if_up;
};
int esp_offload_init(struct net_if *iface);