michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: hci: spi: extract message handling to func

Browse source 
Extract the HCI message handling out to a dedicated function to simplify
the main thread function. This also solves a bug as a side effect.

Previously `discardable` and `timeout` were never being reset after
an advertising report was received, resulting in ALL events after the
first advertising report being treated as discardable.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2023-10-18 14:34:45 +10:00 • committed by Carles Cufí
commit 00e67753ac
1 changed files with 63 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

116
drivers/bluetooth/hci/spi.c
View file

@ -285,17 +285,72 @@ static int bt_spi_send_aci_config_data_controller_mode(void)
} }
#endif /* CONFIG_BT_BLUENRG_ACI */ #endif /* CONFIG_BT_BLUENRG_ACI */
static void bt_spi_rx_thread(void) static struct net_buf *bt_spi_rx_buf_construct(uint8_t *msg)
{ {
bool discardable = false; bool discardable = false;
k_timeout_t timeout = K_FOREVER; k_timeout_t timeout = K_FOREVER;
struct bt_hci_acl_hdr acl_hdr;
struct net_buf *buf; struct net_buf *buf;
int len;
switch (msg[PACKET_TYPE]) {
case HCI_EVT:
switch (msg[EVT_HEADER_EVENT]) {
case BT_HCI_EVT_VENDOR:
/* Run event through interface handler */
if (bt_spi_handle_vendor_evt(msg)) {
return NULL;
}
/* Event has not yet been handled */
__fallthrough;
default:
if (msg[1] == BT_HCI_EVT_LE_META_EVENT &&
(msg[3] == BT_HCI_EVT_LE_ADVERTISING_REPORT)) {
discardable = true;
timeout = K_NO_WAIT;
}
buf = bt_buf_get_evt(msg[EVT_HEADER_EVENT],
discardable, timeout);
if (!buf) {
LOG_DBG("Discard adv report due to insufficient buf");
return NULL;
}
}
len = sizeof(struct bt_hci_evt_hdr) + msg[EVT_HEADER_SIZE];
if (len > net_buf_tailroom(buf)) {
LOG_ERR("Event too long: %d", len);
net_buf_unref(buf);
return NULL;
}
net_buf_add_mem(buf, &msg[1], len);
break;
case HCI_ACL:
buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_FOREVER);
memcpy(&acl_hdr, &msg[1], sizeof(acl_hdr));
len = sizeof(acl_hdr) + sys_le16_to_cpu(acl_hdr.len);
if (len > net_buf_tailroom(buf)) {
LOG_ERR("ACL too long: %d", len);
net_buf_unref(buf);
return NULL;
}
net_buf_add_mem(buf, &msg[1], len);
break;
default:
LOG_ERR("Unknown BT buf type %d", msg[0]);
return NULL;
}
return buf;
}
static void bt_spi_rx_thread(void)
{
uint8_t header_master[5] = { SPI_READ, 0x00, 0x00, 0x00, 0x00 }; uint8_t header_master[5] = { SPI_READ, 0x00, 0x00, 0x00, 0x00 };
uint8_t header_slave[5]; uint8_t header_slave[5];
struct bt_hci_acl_hdr acl_hdr; struct net_buf *buf;
uint8_t size = 0U; uint8_t size = 0U;
int ret; int ret;
int len;
(void)memset(&txmsg, 0xFF, SPI_MAX_MSG_LEN); (void)memset(&txmsg, 0xFF, SPI_MAX_MSG_LEN);
while (true) { while (true) {
@ -347,58 +402,13 @@ static void bt_spi_rx_thread(void)
spi_dump_message("RX:ed", rxmsg, size); spi_dump_message("RX:ed", rxmsg, size);
switch (rxmsg[PACKET_TYPE]) { /* Construct net_buf from SPI data */
case HCI_EVT: buf = bt_spi_rx_buf_construct(rxmsg);
switch (rxmsg[EVT_HEADER_EVENT]) { if (buf) {
case BT_HCI_EVT_VENDOR: /* Handle the received HCI data */
/* Run event through interface handler */ bt_recv(buf);
if (bt_spi_handle_vendor_evt(rxmsg)) {
continue;
};
/* Event has not yet been handled */
__fallthrough;
default:
if (rxmsg[1] == BT_HCI_EVT_LE_META_EVENT &&
(rxmsg[3] == BT_HCI_EVT_LE_ADVERTISING_REPORT)) {
discardable = true;
timeout = K_NO_WAIT;
}
buf = bt_buf_get_evt(rxmsg[EVT_HEADER_EVENT],
discardable, timeout);
if (!buf) {
LOG_DBG("Discard adv report due to insufficient "
"buf");
continue;
}
}
len = sizeof(struct bt_hci_evt_hdr) + rxmsg[EVT_HEADER_SIZE];
if (len > net_buf_tailroom(buf)) {
LOG_ERR("Event too long: %d", len);
net_buf_unref(buf);
continue;
}
net_buf_add_mem(buf, &rxmsg[1], len);
break;
case HCI_ACL:
buf = bt_buf_get_rx(BT_BUF_ACL_IN, K_FOREVER);
memcpy(&acl_hdr, &rxmsg[1], sizeof(acl_hdr));
len = sizeof(acl_hdr) + sys_le16_to_cpu(acl_hdr.len);
if (len > net_buf_tailroom(buf)) {
LOG_ERR("ACL too long: %d", len);
net_buf_unref(buf);
continue;
}
net_buf_add_mem(buf, &rxmsg[1], len);
break;
default:
LOG_ERR("Unknown BT buf type %d", rxmsg[0]);
continue;
} }
bt_recv(buf);
/* On BlueNRG-MS, host is expected to read */ /* On BlueNRG-MS, host is expected to read */
/* as long as IRQ pin is high */ /* as long as IRQ pin is high */
} while (irq_pin_high()); } while (irq_pin_high());