Skip to content

Commit 872274b

Browse files
kirankrishnappa-intelVudentz
authored andcommitted
Bluetooth: btintel_pcie: Fix a potential race condition
On HCI_OP_RESET command, firmware raises alive interrupt. Driver needs to wait for this before sending other command. This patch fixes the potential miss of alive interrupt due to which HCI_OP_RESET can timeout. Expected flow: If tx command is HCI_OP_RESET, 1. set data->gp0_received = false 2. send HCI_OP_RESET 3. wait for alive interrupt Actual flow having potential race: If tx command is HCI_OP_RESET, 1. send HCI_OP_RESET 1a. Firmware raises alive interrupt here and in ISR data->gp0_received is set to true 2. set data->gp0_received = false 3. wait for alive interrupt Signed-off-by: Kiran K <[email protected]> Fixes: 05c200c ("Bluetooth: btintel_pcie: Add handshake between driver and firmware") Reported-by: Bjorn Helgaas <[email protected]> Closes: https://patchwork.kernel.org/project/bluetooth/patch/[email protected]/ Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent b4f82f9 commit 872274b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/bluetooth/btintel_pcie.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,10 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev,
13201320
if (opcode == 0xfc01)
13211321
btintel_pcie_inject_cmd_complete(hdev, opcode);
13221322
}
1323+
/* Firmware raises alive interrupt on HCI_OP_RESET */
1324+
if (opcode == HCI_OP_RESET)
1325+
data->gp0_received = false;
1326+
13231327
hdev->stat.cmd_tx++;
13241328
break;
13251329
case HCI_ACLDATA_PKT:
@@ -1357,7 +1361,6 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev,
13571361
opcode, btintel_pcie_alivectxt_state2str(old_ctxt),
13581362
btintel_pcie_alivectxt_state2str(data->alive_intr_ctxt));
13591363
if (opcode == HCI_OP_RESET) {
1360-
data->gp0_received = false;
13611364
ret = wait_event_timeout(data->gp0_wait_q,
13621365
data->gp0_received,
13631366
msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));

0 commit comments

Comments
 (0)