2018-12-19 12:45:30

by Paweł Chmiel

Subject: [PATCH v3] Bluetooth: hci_bcm: Handle specific unknown packets after firmware loading

From: Jonathan Bakker <[email protected]>

The Broadcom controller on aries S5PV210 boards sends out a couple of
unknown packets after the firmware is loaded. This will cause
logging of errors such as:
Bluetooth: hci0: Frame reassembly failed (-84)

This is probably also the case with other boards, as there are related
Android userspace patches for custom ROMs such as
https://review.lineageos.org/#/c/LineageOS/android_system_bt/+/142721/
Since this appears to be intended behaviour, treated them as diagnostic
packets.

Note that this is another variant of commit 01d5e44ace8a
("Bluetooth: hci_bcm: Handle empty packet after firmware loading")

Signed-off-by: Jonathan Bakker <[email protected]>
Signed-off-by: Paweł Chmiel <[email protected]>

---
Changes from v2:
- Rebased against latest bluetooth-next tree

Changes from v1:
- Rename UNKNOWN to TYPE49
- Rename UNKNOWN2 to TYPE52
---
drivers/bluetooth/hci_bcm.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index a5cb580a07de..ddbe518c3e5b 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -52,6 +52,12 @@
#define BCM_LM_DIAG_PKT 0x07
#define BCM_LM_DIAG_SIZE 63

+#define BCM_TYPE49_PKT 0x31
+#define BCM_TYPE49_SIZE 0
+
+#define BCM_TYPE52_PKT 0x34
+#define BCM_TYPE52_SIZE 0
+
#define BCM_AUTOSUSPEND_DELAY 5000 /* default autosleep delay */

#define BCM_NUM_SUPPLIES 2
@@ -595,12 +601,28 @@ static int bcm_setup(struct hci_uart *hu)
.lsize = 0, \
.maxlen = BCM_NULL_SIZE

+#define BCM_RECV_TYPE49 \
+ .type = BCM_TYPE49_PKT, \
+ .hlen = BCM_TYPE49_SIZE, \
+ .loff = 0, \
+ .lsize = 0, \
+ .maxlen = BCM_TYPE49_SIZE
+
+#define BCM_RECV_TYPE52 \
+ .type = BCM_TYPE52_PKT, \
+ .hlen = BCM_TYPE52_SIZE, \
+ .loff = 0, \
+ .lsize = 0, \
+ .maxlen = BCM_TYPE52_SIZE
+
static const struct h4_recv_pkt bcm_recv_pkts[] = {
{ H4_RECV_ACL, .recv = hci_recv_frame },
{ H4_RECV_SCO, .recv = hci_recv_frame },
{ H4_RECV_EVENT, .recv = hci_recv_frame },
{ BCM_RECV_LM_DIAG, .recv = hci_recv_diag },
{ BCM_RECV_NULL, .recv = hci_recv_diag },
+ { BCM_RECV_TYPE49, .recv = hci_recv_diag },
+ { BCM_RECV_TYPE52, .recv = hci_recv_diag },
};

static int bcm_recv(struct hci_uart *hu, const void *data, int count)
--
2.17.1

2018-12-19 13:19:24

by Marcel Holtmann

Subject: Re: [PATCH v3] Bluetooth: hci_bcm: Handle specific unknown packets after firmware loading

Hi Pawel,

> The Broadcom controller on aries S5PV210 boards sends out a couple of
> unknown packets after the firmware is loaded. This will cause
> logging of errors such as:
> Bluetooth: hci0: Frame reassembly failed (-84)
>
> This is probably also the case with other boards, as there are related
> Android userspace patches for custom ROMs such as
> https://review.lineageos.org/#/c/LineageOS/android_system_bt/+/142721/
> Since this appears to be intended behaviour, treated them as diagnostic
> packets.
>
> Note that this is another variant of commit 01d5e44ace8a
> ("Bluetooth: hci_bcm: Handle empty packet after firmware loading")
>
> Signed-off-by: Jonathan Bakker <[email protected]>
> Signed-off-by: Paweł Chmiel <[email protected]>
>
> ---
> Changes from v2:
> - Rebased against latest bluetooth-next tree
>
> Changes from v1:
> - Rename UNKNOWN to TYPE49
> - Rename UNKNOWN2 to TYPE52
> ---
> drivers/bluetooth/hci_bcm.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel