From 4643fbe624b1e542656311c5c768d68865b67003 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 9 Jan 2022 12:37:39 +0000 Subject: [PATCH] linux: bluetooth: Read codec capabilities only if supported Include patch from lists to suppress bluetooth dmesg warnings [ 3.980822] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.982812] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.984812] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.986608] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.987621] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.988606] Bluetooth: hci0: Failed to read codec capabilities (-56) [ 3.989650] Bluetooth: hci0: Failed to read codec capabilities (-56) https://lkml.org/lkml/2022/1/3/201 --- ...codec-capabilities-only-if-supported.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 packages/linux/patches/default/linux-001-5-16-bluetooth-read-codec-capabilities-only-if-supported.patch diff --git a/packages/linux/patches/default/linux-001-5-16-bluetooth-read-codec-capabilities-only-if-supported.patch b/packages/linux/patches/default/linux-001-5-16-bluetooth-read-codec-capabilities-only-if-supported.patch new file mode 100644 index 0000000000..69ec345cd7 --- /dev/null +++ b/packages/linux/patches/default/linux-001-5-16-bluetooth-read-codec-capabilities-only-if-supported.patch @@ -0,0 +1,55 @@ +From 107fe0482b549a0e43a971e5fd104719c6e495ef Mon Sep 17 00:00:00 2001 +From: Kiran K +Date: Tue, 5 Oct 2021 20:15:56 +0530 +Subject: Bluetooth: Read codec capabilities only if supported + +Read codec capabilities only if HCI_READ_LOCAL_CODEC_CAPABILITIES +command is supported. If capablities are not supported, then +cache codec data without caps. + +Signed-off-by: Kiran K +Signed-off-by: Marcel Holtmann +--- + net/bluetooth/hci_codec.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c +index f0421d0edaa37..38201532f58e8 100644 +--- a/net/bluetooth/hci_codec.c ++++ b/net/bluetooth/hci_codec.c +@@ -25,9 +25,11 @@ static int hci_codec_list_add(struct list_head *list, + } + entry->transport = sent->transport; + entry->len = len; +- entry->num_caps = rp->num_caps; +- if (rp->num_caps) ++ entry->num_caps = 0; ++ if (rp) { ++ entry->num_caps = rp->num_caps; + memcpy(entry->caps, caps, len); ++ } + list_add(&entry->list, list); + + return 0; +@@ -58,6 +60,18 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport, + __u32 len; + + cmd->transport = i; ++ ++ /* If Read_Codec_Capabilities command is not supported ++ * then just add codec to the list without caps ++ */ ++ if (!(hdev->commands[45] & 0x08)) { ++ hci_dev_lock(hdev); ++ hci_codec_list_add(&hdev->local_codecs, cmd, ++ NULL, NULL, 0); ++ hci_dev_unlock(hdev); ++ continue; ++ } ++ + skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, + sizeof(*cmd), cmd, + HCI_CMD_TIMEOUT); +-- +cgit 1.2.3-1.el7 +