Bluetooth: btqcomsmd: Add support for BD address setup
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. Signed-off-by: Loic Poulain <loic.poulain@linaro.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org
This commit is contained in:
parent
4bc4e64c2c
commit
6e51811106
|
@ -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_dev *hdev)
|
|||
return 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 platform_device *pdev)
|
|||
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);
|
||||
|
|
Loading…
Reference in New Issue