Skip to content

Commit

Permalink
Bluetooth: btintel: Do no pass vendor events to stack
Browse files Browse the repository at this point in the history
During firmware download, vendor specific events like boot up and
secure send result are generated. These events can be safely processed at
the driver level. Passing on these events to stack prints unnecessary
log as below.

    Bluetooth: hci0: Malformed MSFT vendor event: 0x02

Fixes: 3368aa3 ("Bluetooth: msft: Handle MSFT Monitor Device Event")
Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
  • Loading branch information
kirankrishnappa-intel authored and Vudentz committed Nov 14, 2024
1 parent 9b49561 commit 510e838
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
6 changes: 4 additions & 2 deletions drivers/bluetooth/btintel.c
Original file line number Diff line number Diff line change
Expand Up @@ -3395,15 +3395,17 @@ int btintel_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
* indicating that the bootup completed.
*/
btintel_bootup(hdev, ptr, len);
break;
kfree_skb(skb);
return 0;
case 0x06:
/* When the firmware loading completes the
* device sends out a vendor specific event
* indicating the result of the firmware
* loading.
*/
btintel_secure_send_result(hdev, ptr, len);
break;
kfree_skb(skb);
return 0;
}
}

Expand Down
9 changes: 6 additions & 3 deletions drivers/bluetooth/btintel_pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,8 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
if (btintel_pcie_in_op(data)) {
btintel_pcie_wr_sleep_cntrl(data, BTINTEL_PCIE_STATE_D0);
data->alive_intr_ctxt = BTINTEL_PCIE_INTEL_HCI_RESET2;
break;
kfree_skb(skb);
return 0;
}

if (btintel_pcie_in_iml(data)) {
Expand All @@ -567,15 +568,17 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
btintel_wake_up_flag(data->hdev,
INTEL_WAIT_FOR_D0);
}
break;
kfree_skb(skb);
return 0;
case 0x06:
/* When the firmware loading completes the
* device sends out a vendor specific event
* indicating the result of the firmware
* loading.
*/
btintel_secure_send_result(hdev, ptr, len);
break;
kfree_skb(skb);
return 0;
}
}

Expand Down

0 comments on commit 510e838

Please sign in to comment.