Commit 23a4059c authored by Sanjay Kumar Konduri's avatar Sanjay Kumar Konduri Committed by Greg Kroah-Hartman

Bluetooth: btrsi: fix bt tx timeout issue

[ Upstream commit 7cbfd1e2 ]

observed sometimes data is coming with unaligned address from kernel
BT stack. If unaligned address is passed, some data in payload is
stripped when packet is loading to firmware and this results, BT
connection timeout is happening.

sh# hciconfig hci0 up
Can't init device hci0: hci0 command 0x0c03 tx timeout

Fixed this by moving the data to aligned address.
Signed-off-by: default avatarSanjay Kumar Konduri <sanjay.konduri@redpinesignals.com>
Signed-off-by: default avatarSiva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 245b2765
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
#include <net/rsi_91x.h> #include <net/rsi_91x.h>
#include <net/genetlink.h> #include <net/genetlink.h>
#define RSI_HEADROOM_FOR_BT_HAL 16 #define RSI_DMA_ALIGN 8
#define RSI_FRAME_DESC_SIZE 16 #define RSI_FRAME_DESC_SIZE 16
#define RSI_HEADROOM_FOR_BT_HAL (RSI_FRAME_DESC_SIZE + RSI_DMA_ALIGN)
struct rsi_hci_adapter { struct rsi_hci_adapter {
void *priv; void *priv;
...@@ -70,6 +71,16 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -70,6 +71,16 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb)
bt_cb(new_skb)->pkt_type = hci_skb_pkt_type(skb); bt_cb(new_skb)->pkt_type = hci_skb_pkt_type(skb);
kfree_skb(skb); kfree_skb(skb);
skb = new_skb; skb = new_skb;
if (!IS_ALIGNED((unsigned long)skb->data, RSI_DMA_ALIGN)) {
u8 *skb_data = skb->data;
int skb_len = skb->len;
skb_push(skb, RSI_DMA_ALIGN);
skb_pull(skb, PTR_ALIGN(skb->data,
RSI_DMA_ALIGN) - skb->data);
memmove(skb->data, skb_data, skb_len);
skb_trim(skb, skb_len);
}
} }
return h_adapter->proto_ops->coex_send_pkt(h_adapter->priv, skb, return h_adapter->proto_ops->coex_send_pkt(h_adapter->priv, skb,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment