Patch "Bluetooth: btqcomsmd: Add support for BD address setup" has been added to the 4.14-stable tree
This is a note to let you know that I've just added the patch titled
Bluetooth: btqcomsmd: Add support for BD address setup
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-btqcomsmd-add-support-for-bd-address-setup.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6e518111060c2290427d79c43d4add9600ad852bMon Sep 17 00:00:00 2001
From: Loic Poulain <[email protected]>
Date: Tue, 5 Sep 2017 12:26:03 +0200
Subject: Bluetooth: btqcomsmd: Add support for BD address setup
From: Loic Poulain <[email protected]>
commit 6e518111060c2290427d79c43d4add9600ad852b upstream.
This patch implements the hdev setup function since wcnss-bt does not have persistent memory to store an allocated BD address. The device is therefore marked as unconfigured if no BD address has been previously retrieved.
--- drivers/bluetooth/btqcomsmd.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/bluetooth/btqcomsmd.c +34 -0
@@ -26,6 +26,7 @@struct btqcomsmd {struct hci_dev *hdev; +bdaddr_t bdaddr;struct rpmsg_endpoint *acl_channel;struct rpmsg_endpoint *cmd_channel; };
@@ -100,6 +101,38 @@ static int btqcomsmd_close(struct hci_dereturn 0 ; } +static int btqcomsmd_setup (struct hci_dev *hdev) +{ +struct btqcomsmd *btq =hci_get_drvdata (hdev); +struct sk_buff *skb; +int err; + + skb =__hci_cmd_sync (hdev,HCI_OP_RESET ,0 ,NULL ,HCI_INIT_TIMEOUT ); +if (IS_ERR (skb)) +return PTR_ERR (skb); +kfree_skb (skb); + +/* Devices do not have persistent storage for BD address. If no +* BD address has been retrieved during probe, mark the device +* as having an invalid BD address. +*/ +if (!bacmp (&btq->bdaddr,BDADDR_ANY )) { +set_bit (HCI_QUIRK_INVALID_BDADDR , &hdev->quirks); +return 0 ; + } + +/* When setting a configured BD address fails, mark the device +* as having an invalid BD address. +*/ + err =qca_set_bdaddr_rome (hdev, &btq->bdaddr); +if (err) { +set_bit (HCI_QUIRK_INVALID_BDADDR , &hdev->quirks); +return 0 ; + } + +return 0 ; +} +static int btqcomsmd_probe (struct platform_device *pdev) {struct btqcomsmd *btq;
@@ -135,6 +168,7 @@ static int btqcomsmd_probe(struct platfo hdev->open = btqcomsmd_open; hdev->close = btqcomsmd_close; hdev->send = btqcomsmd_send; + hdev->setup = btqcomsmd_setup; hdev->set_bdaddr = qca_set_bdaddr_rome; ret =hci_register_dev (hdev);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/bluetooth-btqcomsmd-add-support-for-bd-address-setup.patch