mirror of https://gitee.com/openkylin/linux.git
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2016-09-25 Here are a few more Bluetooth & 802.15.4 patches for the 4.9 kernel that have popped up during the past week: - New USB ID for QCA_ROME Bluetooth device - NULL pointer dereference fix for Bluetooth mgmt sockets - Fixes for BCSP driver - Fix for updating LE scan response Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
71527eb2be
|
|
@ -253,6 +253,7 @@ static const struct usb_device_id blacklist_table[] = {
|
|||
{ USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME },
|
||||
|
||||
/* Broadcom BCM2035 */
|
||||
{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
{
|
||||
struct ti_st *hst;
|
||||
long len;
|
||||
int pkt_type;
|
||||
|
||||
hst = hci_get_drvdata(hdev);
|
||||
|
||||
|
|
@ -258,6 +259,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
* Freeing skb memory is taken care in shared transport layer,
|
||||
* so don't free skb memory here.
|
||||
*/
|
||||
pkt_type = hci_skb_pkt_type(skb);
|
||||
len = hst->st_write(skb);
|
||||
if (len < 0) {
|
||||
kfree_skb(skb);
|
||||
|
|
@ -268,7 +270,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
|
||||
/* ST accepted our skb. So, Go ahead and do rest */
|
||||
hdev->stat.byte_tx += len;
|
||||
ti_st_tx_complete(hst, hci_skb_pkt_type(skb));
|
||||
ti_st_tx_complete(hst, pkt_type);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,8 @@ struct bcsp_struct {
|
|||
/* ---- BCSP CRC calculation ---- */
|
||||
|
||||
/* Table for calculating CRC for polynomial 0x1021, LSB processed first,
|
||||
initial value 0xffff, bits shifted in reverse order. */
|
||||
* initial value 0xffff, bits shifted in reverse order.
|
||||
*/
|
||||
|
||||
static const u16 crc_table[] = {
|
||||
0x0000, 0x1081, 0x2102, 0x3183,
|
||||
|
|
@ -174,7 +175,7 @@ static int bcsp_enqueue(struct hci_uart *hu, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
|
||||
int len, int pkt_type)
|
||||
int len, int pkt_type)
|
||||
{
|
||||
struct sk_buff *nskb;
|
||||
u8 hdr[4], chan;
|
||||
|
|
@ -213,6 +214,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
|
|||
/* Vendor specific commands */
|
||||
if (hci_opcode_ogf(__le16_to_cpu(opcode)) == 0x3f) {
|
||||
u8 desc = *(data + HCI_COMMAND_HDR_SIZE);
|
||||
|
||||
if ((desc & 0xf0) == 0xc0) {
|
||||
data += HCI_COMMAND_HDR_SIZE + 1;
|
||||
len -= HCI_COMMAND_HDR_SIZE + 1;
|
||||
|
|
@ -271,8 +273,8 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
|
|||
/* Put CRC */
|
||||
if (bcsp->use_crc) {
|
||||
bcsp_txmsg_crc = bitrev16(bcsp_txmsg_crc);
|
||||
bcsp_slip_one_byte(nskb, (u8) ((bcsp_txmsg_crc >> 8) & 0x00ff));
|
||||
bcsp_slip_one_byte(nskb, (u8) (bcsp_txmsg_crc & 0x00ff));
|
||||
bcsp_slip_one_byte(nskb, (u8)((bcsp_txmsg_crc >> 8) & 0x00ff));
|
||||
bcsp_slip_one_byte(nskb, (u8)(bcsp_txmsg_crc & 0x00ff));
|
||||
}
|
||||
|
||||
bcsp_slip_msgdelim(nskb);
|
||||
|
|
@ -287,7 +289,8 @@ static struct sk_buff *bcsp_dequeue(struct hci_uart *hu)
|
|||
struct sk_buff *skb;
|
||||
|
||||
/* First of all, check for unreliable messages in the queue,
|
||||
since they have priority */
|
||||
* since they have priority
|
||||
*/
|
||||
|
||||
skb = skb_dequeue(&bcsp->unrel);
|
||||
if (skb != NULL) {
|
||||
|
|
@ -414,7 +417,7 @@ static void bcsp_handle_le_pkt(struct hci_uart *hu)
|
|||
|
||||
/* spot "conf" pkts and reply with a "conf rsp" pkt */
|
||||
if (bcsp->rx_skb->data[1] >> 4 == 4 && bcsp->rx_skb->data[2] == 0 &&
|
||||
!memcmp(&bcsp->rx_skb->data[4], conf_pkt, 4)) {
|
||||
!memcmp(&bcsp->rx_skb->data[4], conf_pkt, 4)) {
|
||||
struct sk_buff *nskb = alloc_skb(4, GFP_ATOMIC);
|
||||
|
||||
BT_DBG("Found a LE conf pkt");
|
||||
|
|
@ -428,7 +431,7 @@ static void bcsp_handle_le_pkt(struct hci_uart *hu)
|
|||
}
|
||||
/* Spot "sync" pkts. If we find one...disaster! */
|
||||
else if (bcsp->rx_skb->data[1] >> 4 == 4 && bcsp->rx_skb->data[2] == 0 &&
|
||||
!memcmp(&bcsp->rx_skb->data[4], sync_pkt, 4)) {
|
||||
!memcmp(&bcsp->rx_skb->data[4], sync_pkt, 4)) {
|
||||
BT_ERR("Found a LE sync pkt, card has reset");
|
||||
}
|
||||
}
|
||||
|
|
@ -446,7 +449,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
default:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &byte, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, byte);
|
||||
bcsp->rx_count--;
|
||||
}
|
||||
|
|
@ -457,7 +460,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
case 0xdc:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &c0, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, 0xc0);
|
||||
bcsp->rx_esc_state = BCSP_ESCSTATE_NOESC;
|
||||
bcsp->rx_count--;
|
||||
|
|
@ -466,7 +469,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
case 0xdd:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &db, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, 0xdb);
|
||||
bcsp->rx_esc_state = BCSP_ESCSTATE_NOESC;
|
||||
bcsp->rx_count--;
|
||||
|
|
@ -485,13 +488,28 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
static void bcsp_complete_rx_pkt(struct hci_uart *hu)
|
||||
{
|
||||
struct bcsp_struct *bcsp = hu->priv;
|
||||
int pass_up;
|
||||
int pass_up = 0;
|
||||
|
||||
if (bcsp->rx_skb->data[0] & 0x80) { /* reliable pkt */
|
||||
BT_DBG("Received seqno %u from card", bcsp->rxseq_txack);
|
||||
bcsp->rxseq_txack++;
|
||||
bcsp->rxseq_txack %= 0x8;
|
||||
bcsp->txack_req = 1;
|
||||
|
||||
/* check the rx sequence number is as expected */
|
||||
if ((bcsp->rx_skb->data[0] & 0x07) == bcsp->rxseq_txack) {
|
||||
bcsp->rxseq_txack++;
|
||||
bcsp->rxseq_txack %= 0x8;
|
||||
} else {
|
||||
/* handle re-transmitted packet or
|
||||
* when packet was missed
|
||||
*/
|
||||
BT_ERR("Out-of-order packet arrived, got %u expected %u",
|
||||
bcsp->rx_skb->data[0] & 0x07, bcsp->rxseq_txack);
|
||||
|
||||
/* do not process out-of-order packet payload */
|
||||
pass_up = 2;
|
||||
}
|
||||
|
||||
/* send current txack value to all received reliable packets */
|
||||
bcsp->txack_req = 1;
|
||||
|
||||
/* If needed, transmit an ack pkt */
|
||||
hci_uart_tx_wakeup(hu);
|
||||
|
|
@ -500,26 +518,33 @@ static void bcsp_complete_rx_pkt(struct hci_uart *hu)
|
|||
bcsp->rxack = (bcsp->rx_skb->data[0] >> 3) & 0x07;
|
||||
BT_DBG("Request for pkt %u from card", bcsp->rxack);
|
||||
|
||||
/* handle received ACK indications,
|
||||
* including those from out-of-order packets
|
||||
*/
|
||||
bcsp_pkt_cull(bcsp);
|
||||
if ((bcsp->rx_skb->data[1] & 0x0f) == 6 &&
|
||||
bcsp->rx_skb->data[0] & 0x80) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_ACLDATA_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 5 &&
|
||||
bcsp->rx_skb->data[0] & 0x80) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_EVENT_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 7) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_SCODATA_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 1 &&
|
||||
!(bcsp->rx_skb->data[0] & 0x80)) {
|
||||
bcsp_handle_le_pkt(hu);
|
||||
pass_up = 0;
|
||||
} else
|
||||
pass_up = 0;
|
||||
|
||||
if (!pass_up) {
|
||||
if (pass_up != 2) {
|
||||
if ((bcsp->rx_skb->data[1] & 0x0f) == 6 &&
|
||||
(bcsp->rx_skb->data[0] & 0x80)) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_ACLDATA_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 5 &&
|
||||
(bcsp->rx_skb->data[0] & 0x80)) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_EVENT_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 7) {
|
||||
hci_skb_pkt_type(bcsp->rx_skb) = HCI_SCODATA_PKT;
|
||||
pass_up = 1;
|
||||
} else if ((bcsp->rx_skb->data[1] & 0x0f) == 1 &&
|
||||
!(bcsp->rx_skb->data[0] & 0x80)) {
|
||||
bcsp_handle_le_pkt(hu);
|
||||
pass_up = 0;
|
||||
} else {
|
||||
pass_up = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (pass_up == 0) {
|
||||
struct hci_event_hdr hdr;
|
||||
u8 desc = (bcsp->rx_skb->data[1] & 0x0f);
|
||||
|
||||
|
|
@ -537,18 +562,23 @@ static void bcsp_complete_rx_pkt(struct hci_uart *hu)
|
|||
hci_recv_frame(hu->hdev, bcsp->rx_skb);
|
||||
} else {
|
||||
BT_ERR("Packet for unknown channel (%u %s)",
|
||||
bcsp->rx_skb->data[1] & 0x0f,
|
||||
bcsp->rx_skb->data[0] & 0x80 ?
|
||||
"reliable" : "unreliable");
|
||||
bcsp->rx_skb->data[1] & 0x0f,
|
||||
bcsp->rx_skb->data[0] & 0x80 ?
|
||||
"reliable" : "unreliable");
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
}
|
||||
} else
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
} else {
|
||||
} else if (pass_up == 1) {
|
||||
/* Pull out BCSP hdr */
|
||||
skb_pull(bcsp->rx_skb, 4);
|
||||
|
||||
hci_recv_frame(hu->hdev, bcsp->rx_skb);
|
||||
} else {
|
||||
/* ignore packet payload of already ACKed re-transmitted
|
||||
* packets or when a packet was missed in the BCSP window
|
||||
*/
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
}
|
||||
|
||||
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
|
||||
|
|
@ -567,7 +597,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
|
|||
const unsigned char *ptr;
|
||||
|
||||
BT_DBG("hu %p count %d rx_state %d rx_count %ld",
|
||||
hu, count, bcsp->rx_state, bcsp->rx_count);
|
||||
hu, count, bcsp->rx_state, bcsp->rx_count);
|
||||
|
||||
ptr = data;
|
||||
while (count) {
|
||||
|
|
@ -586,24 +616,14 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
|
|||
|
||||
switch (bcsp->rx_state) {
|
||||
case BCSP_W4_BCSP_HDR:
|
||||
if ((0xff & (u8) ~ (bcsp->rx_skb->data[0] + bcsp->rx_skb->data[1] +
|
||||
bcsp->rx_skb->data[2])) != bcsp->rx_skb->data[3]) {
|
||||
if ((0xff & (u8)~(bcsp->rx_skb->data[0] + bcsp->rx_skb->data[1] +
|
||||
bcsp->rx_skb->data[2])) != bcsp->rx_skb->data[3]) {
|
||||
BT_ERR("Error in BCSP hdr checksum");
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
|
||||
bcsp->rx_count = 0;
|
||||
continue;
|
||||
}
|
||||
if (bcsp->rx_skb->data[0] & 0x80 /* reliable pkt */
|
||||
&& (bcsp->rx_skb->data[0] & 0x07) != bcsp->rxseq_txack) {
|
||||
BT_ERR("Out-of-order packet arrived, got %u expected %u",
|
||||
bcsp->rx_skb->data[0] & 0x07, bcsp->rxseq_txack);
|
||||
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
|
||||
bcsp->rx_count = 0;
|
||||
continue;
|
||||
}
|
||||
bcsp->rx_state = BCSP_W4_DATA;
|
||||
bcsp->rx_count = (bcsp->rx_skb->data[1] >> 4) +
|
||||
(bcsp->rx_skb->data[2] << 4); /* May be 0 */
|
||||
|
|
@ -620,8 +640,8 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
|
|||
case BCSP_W4_CRC:
|
||||
if (bitrev16(bcsp->message_crc) != bscp_get_crc(bcsp)) {
|
||||
BT_ERR("Checksum failed: computed %04x received %04x",
|
||||
bitrev16(bcsp->message_crc),
|
||||
bscp_get_crc(bcsp));
|
||||
bitrev16(bcsp->message_crc),
|
||||
bscp_get_crc(bcsp));
|
||||
|
||||
kfree_skb(bcsp->rx_skb);
|
||||
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
|
||||
|
|
@ -679,7 +699,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
|
|||
/* Arrange to retransmit all messages in the relq. */
|
||||
static void bcsp_timed_event(unsigned long arg)
|
||||
{
|
||||
struct hci_uart *hu = (struct hci_uart *) arg;
|
||||
struct hci_uart *hu = (struct hci_uart *)arg;
|
||||
struct bcsp_struct *bcsp = hu->priv;
|
||||
struct sk_buff *skb;
|
||||
unsigned long flags;
|
||||
|
|
@ -715,7 +735,7 @@ static int bcsp_open(struct hci_uart *hu)
|
|||
|
||||
init_timer(&bcsp->tbcsp);
|
||||
bcsp->tbcsp.function = bcsp_timed_event;
|
||||
bcsp->tbcsp.data = (u_long) hu;
|
||||
bcsp->tbcsp.data = (u_long)hu;
|
||||
|
||||
bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
|
||||
|
||||
|
|
|
|||
|
|
@ -697,34 +697,36 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file *file,
|
|||
case HCIUARTSETPROTO:
|
||||
if (!test_and_set_bit(HCI_UART_PROTO_SET, &hu->flags)) {
|
||||
err = hci_uart_set_proto(hu, arg);
|
||||
if (err) {
|
||||
if (err)
|
||||
clear_bit(HCI_UART_PROTO_SET, &hu->flags);
|
||||
return err;
|
||||
}
|
||||
} else
|
||||
return -EBUSY;
|
||||
err = -EBUSY;
|
||||
break;
|
||||
|
||||
case HCIUARTGETPROTO:
|
||||
if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
|
||||
return hu->proto->id;
|
||||
return -EUNATCH;
|
||||
err = hu->proto->id;
|
||||
else
|
||||
err = -EUNATCH;
|
||||
break;
|
||||
|
||||
case HCIUARTGETDEVICE:
|
||||
if (test_bit(HCI_UART_REGISTERED, &hu->flags))
|
||||
return hu->hdev->id;
|
||||
return -EUNATCH;
|
||||
err = hu->hdev->id;
|
||||
else
|
||||
err = -EUNATCH;
|
||||
break;
|
||||
|
||||
case HCIUARTSETFLAGS:
|
||||
if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
|
||||
return -EBUSY;
|
||||
err = hci_uart_set_flags(hu, arg);
|
||||
if (err)
|
||||
return err;
|
||||
err = -EBUSY;
|
||||
else
|
||||
err = hci_uart_set_flags(hu, arg);
|
||||
break;
|
||||
|
||||
case HCIUARTGETFLAGS:
|
||||
return hu->hdev_flags;
|
||||
err = hu->hdev_flags;
|
||||
break;
|
||||
|
||||
default:
|
||||
err = n_tty_ioctl_helper(tty, file, cmd, arg);
|
||||
|
|
|
|||
|
|
@ -2541,6 +2541,8 @@ static int send_pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,
|
|||
if (!cmd)
|
||||
return -ENOMEM;
|
||||
|
||||
cmd->cmd_complete = addr_cmd_complete;
|
||||
|
||||
err = hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY,
|
||||
sizeof(cp->addr.bdaddr), &cp->addr.bdaddr);
|
||||
if (err < 0)
|
||||
|
|
@ -3157,7 +3159,7 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
|
|||
/* The name is stored in the scan response data and so
|
||||
* no need to udpate the advertising data here.
|
||||
*/
|
||||
if (lmp_le_capable(hdev))
|
||||
if (lmp_le_capable(hdev) && hci_dev_test_flag(hdev, HCI_ADVERTISING))
|
||||
__hci_req_update_scan_rsp_data(&req, hdev->cur_adv_instance);
|
||||
|
||||
err = hci_req_run(&req, set_name_complete);
|
||||
|
|
|
|||
Loading…
Reference in New Issue