Bluetooth: Workaround directed advertising bug in Broadcom controllers

BugLink: https://bugs.launchpad.net/bugs/1859712
[ Upstream commit 4c371bb95cf06ded80df0e6139fdd77cee1d9a94 ]

It appears that some Broadcom controllers (eg BCM20702A0) reject LE Set
Advertising Parameters command if advertising intervals provided are not
within range for undirected and low duty directed advertising.

Workaround this bug by populating min and max intervals with 'valid'
values.

< HCI Command: LE Set Advertising Parameters (0x08|0x0006) plen 15
        Min advertising interval: 0.000 msec (0x0000)
        Max advertising interval: 0.000 msec (0x0000)
        Type: Connectable directed - ADV_DIRECT_IND (high duty cycle) (0x01)
        Own address type: Public (0x00)
        Direct address type: Random (0x01)
        Direct address: E2:F0:7B:9F:DC:F4 (Static)
        Channel map: 37, 38, 39 (0x07)
        Filter policy: Allow Scan Request from Any, Allow Connect Request from Any (0x00)
> HCI Event: Command Complete (0x0e) plen 4
      LE Set Advertising Parameters (0x08|0x0006) ncmd 1
        Status: Invalid HCI Command Parameters (0x12)

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Tested-by: Sören Beye <linux@hypfer.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index d9f10411f95f7b07e22b5b03ce98c2fcb9f13e66..54bf4531622c0d0342f8ad0b3b3908dcd3bf95bc 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -822,6 +822,14 @@ static void hci_req_directed_advertising(struct hci_request *req,
                return;
 
        memset(&cp, 0, sizeof(cp));
+
+       /* Some controllers might reject command if intervals are not
+        * within range for undirected advertising.
+        * BCM20702A0 is known to be affected by this.
+        */
+       cp.min_interval = cpu_to_le16(0x0020);
+       cp.max_interval = cpu_to_le16(0x0020);
+
        cp.type = LE_ADV_DIRECT_IND;
        cp.own_address_type = own_addr_type;
        cp.direct_addr_type = conn->dst_type;