hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: btrsi: fix bt tx timeout issue 

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: Sanjay Kumar Konduri <sanjay.konduri@redpinesignals.com>
Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Sanjay Kumar Konduri 2018-09-03 11:27:46 +05:30 committed by Marcel Holtmann
parent a5c3021bb6
commit 7cbfd1e2aa
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/bluetooth/btrsi.c
View File

@ -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)
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,