| Message ID | 20221210013456.1085082-1-luiz.dentz@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | pull request: bluetooth-next 2022-12-09 | expand |
On Fri, 9 Dec 2022 17:34:56 -0800 Luiz Augusto von Dentz wrote: > bluetooth-next pull request for net-next: > > - Add a new VID/PID 0489/e0f2 for MT7922 > - Add Realtek RTL8852BE support ID 0x0cb8:0xc559 > - Add a new PID/VID 13d3/3549 for RTL8822CU > - Add support for broadcom BCM43430A0 & BCM43430A1 > - Add CONFIG_BT_HCIBTUSB_POLL_SYNC > - Add CONFIG_BT_LE_L2CAP_ECRED > - Add support for CYW4373A0 > - Add support for RTL8723DS > - Add more device IDs for WCN6855 > - Add Broadcom BCM4377 family PCIe Bluetooth Hm, it's pulling in the commits we merged into net and which are already present in net-next but with a different hash/id. With a small overlap which git can't figure out: diff --cc drivers/bluetooth/btusb.c index f05018988a17,2ad4efdd9e40..24a8ed3f0458 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@@ -2052,17 -2206,17 +2206,22 @@@ static int btusb_setup_csr(struct hci_d bt_dev_err(hdev, "CSR: Local version length mismatch"); kfree_skb(skb); return -EIO; } - rp = (struct hci_rp_read_local_version *)skb->data; + bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x", + rp->hci_ver, le16_to_cpu(rp->hci_rev)); + + bt_dev_info(hdev, "LMP ver=%u subver=%04x; manufacturer=%u", + rp->lmp_ver, le16_to_cpu(rp->lmp_subver), + le16_to_cpu(rp->manufacturer)); + bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x; LMP ver=%u subver=%04x; manufacturer=%u", + le16_to_cpu(rp->hci_ver), le16_to_cpu(rp->hci_rev), + le16_to_cpu(rp->lmp_ver), le16_to_cpu(rp->lmp_subver), + le16_to_cpu(rp->manufacturer)); + Could you rebase on top of net-next and resend so that the commits which are already applied disappear?
Hi Jakub, On Mon, Dec 12, 2022 at 12:36 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Fri, 9 Dec 2022 17:34:56 -0800 Luiz Augusto von Dentz wrote: > > bluetooth-next pull request for net-next: > > > > - Add a new VID/PID 0489/e0f2 for MT7922 > > - Add Realtek RTL8852BE support ID 0x0cb8:0xc559 > > - Add a new PID/VID 13d3/3549 for RTL8822CU > > - Add support for broadcom BCM43430A0 & BCM43430A1 > > - Add CONFIG_BT_HCIBTUSB_POLL_SYNC > > - Add CONFIG_BT_LE_L2CAP_ECRED > > - Add support for CYW4373A0 > > - Add support for RTL8723DS > > - Add more device IDs for WCN6855 > > - Add Broadcom BCM4377 family PCIe Bluetooth > > Hm, it's pulling in the commits we merged into net and which > are already present in net-next but with a different hash/id. > > With a small overlap which git can't figure out: > > diff --cc drivers/bluetooth/btusb.c > index f05018988a17,2ad4efdd9e40..24a8ed3f0458 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@@ -2052,17 -2206,17 +2206,22 @@@ static int btusb_setup_csr(struct hci_d > bt_dev_err(hdev, "CSR: Local version length mismatch"); > kfree_skb(skb); > return -EIO; > } > > - rp = (struct hci_rp_read_local_version *)skb->data; > + bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x", > + rp->hci_ver, le16_to_cpu(rp->hci_rev)); > + > + bt_dev_info(hdev, "LMP ver=%u subver=%04x; manufacturer=%u", > + rp->lmp_ver, le16_to_cpu(rp->lmp_subver), > + le16_to_cpu(rp->manufacturer)); > > + bt_dev_info(hdev, "CSR: Setting up dongle with HCI ver=%u rev=%04x; LMP ver=%u subver=%04x; manufacturer=%u", > + le16_to_cpu(rp->hci_ver), le16_to_cpu(rp->hci_rev), > + le16_to_cpu(rp->lmp_ver), le16_to_cpu(rp->lmp_subver), > + le16_to_cpu(rp->manufacturer)); > + > > Could you rebase on top of net-next and resend so that the commits > which are already applied disappear? Sure, I will resend it shortly.
The following changes since commit 681bf011b9b5989c6e9db6beb64494918aab9a43: eth: pse: add missing static inlines (2022-10-03 21:52:33 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2022-12-09 for you to fetch changes up to 7a637ef7e0c3308754d7ccf0edb0eec69f77bb81: Bluetooth: Wait for HCI_OP_WRITE_AUTH_PAYLOAD_TO to complete (2022-12-07 13:11:50 -0800) ---------------------------------------------------------------- bluetooth-next pull request for net-next: - Add a new VID/PID 0489/e0f2 for MT7922 - Add Realtek RTL8852BE support ID 0x0cb8:0xc559 - Add a new PID/VID 13d3/3549 for RTL8822CU - Add support for broadcom BCM43430A0 & BCM43430A1 - Add CONFIG_BT_HCIBTUSB_POLL_SYNC - Add CONFIG_BT_LE_L2CAP_ECRED - Add support for CYW4373A0 - Add support for RTL8723DS - Add more device IDs for WCN6855 - Add Broadcom BCM4377 family PCIe Bluetooth ---------------------------------------------------------------- Andy Chi (1): Bluetooth: btusb: Add a new VID/PID 0489/e0f2 for MT7922 Archie Pusaka (2): Bluetooth: btusb: Introduce generic USB reset Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Artem Lukyanov (1): Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 Chen Zhongjin (1): Bluetooth: Fix not cleanup led when bt_init fails Chethan T N (2): Bluetooth: Remove codec id field in vendor codec definition Bluetooth: Fix support for Read Local Supported Codecs V2 Chethan Tumkur Narayan (1): btusb: Avoid reset of ISOC endpoint alt settings to zero Christophe JAILLET (1): Bluetooth: Fix EALREADY and ELOOP cases in bt_status() Gongwei Li (1): Bluetooth: btusb: Add a new PID/VID 13d3/3549 for RTL8822CU Hawkins Jiawei (1): Bluetooth: L2CAP: Fix memory leak in vhci_write Hilda Wu (2): Bluetooth: btrtl: Add btrealtek data struct Bluetooth: btusb: Ignore zero length of USB packets on ALT 6 for specific chip Igor Skalkin (1): virtio_bt: Fix alignment in configuration struct Inga Stotland (1): Bluetooth: MGMT: Fix error report for ADD_EXT_ADV_PARAMS Ismael Ferreras Morezuelas (2): Bluetooth: btusb: Fix CSR clones again by re-adding ERR_DATA_REPORTING quirk Bluetooth: btusb: Add debug message for CSR controllers Jiapeng Chong (1): Bluetooth: Use kzalloc instead of kmalloc/memset Kang Minchul (1): Bluetooth: Use kzalloc instead of kmalloc/memset Luca Weiss (1): dt-bindings: bluetooth: broadcom: add BCM43430A0 & BCM43430A1 Luiz Augusto von Dentz (16): Bluetooth: hci_sync: Fix not setting static address Bluetooth: hci_sync: Fix not able to set force_static_address Bluetooth: hci_conn: Fix not restoring ISO buffer count on disconnect Bluetooth: btusb: Add CONFIG_BT_HCIBTUSB_POLL_SYNC Bluetooth: btusb: Default CONFIG_BT_HCIBTUSB_POLL_SYNC=y Bluetooth: Add CONFIG_BT_LE_L2CAP_ECRED Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm Bluetooth: L2CAP: Fix attempting to access uninitialized memory Bluetooth: Fix crash when replugging CSR fake controllers Bluetooth: btusb: Fix new sparce warnings Bluetooth: btusb: Fix existing sparce warning Bluetooth: btintel: Fix existing sparce warnings Bluetooth: hci_conn: Fix crash on hci_create_cis_sync Bluetooth: ISO: Avoid circular locking dependency Bluetooth: Wait for HCI_OP_WRITE_AUTH_PAYLOAD_TO to complete Marek Vasut (2): dt-bindings: net: broadcom-bluetooth: Add CYW4373A0 DT binding Bluetooth: hci_bcm: Add CYW4373A0 support Mateusz Jończyk (1): Bluetooth: silence a dmesg error message in hci_request.c Maxim Mikityanskiy (1): Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu Michael S. Tsirkin (1): Bluetooth: virtio_bt: fix device removal Nicolas Cavallari (1): Bluetooth: Work around SCO over USB HCI design defect Pauli Virtanen (2): Bluetooth: hci_conn: Fix CIS connection dst_type handling Bluetooth: hci_conn: use HCI dst_type values also for BIS Raman Varabets (1): Bluetooth: btusb: Add Realtek 8761BUV support ID 0x2B89:0x8761 Samuel Holland (1): dt-bindings: net: realtek-bluetooth: Add RTL8723DS Shengyu Qu (1): Bluetooth: btusb: Add more device IDs for WCN6855 Soenke Huster (1): Bluetooth: virtio_bt: Use skb_put to set length Sungwoo Kim (1): Bluetooth: L2CAP: Fix u8 overflow Sven Peter (7): dt-bindings: net: Add generic Bluetooth controller dt-bindings: net: Add Broadcom BCM4377 family PCIe Bluetooth arm64: dts: apple: t8103: Add Bluetooth controller Bluetooth: hci_event: Ignore reserved bits in LE Extended Adv Report Bluetooth: Add quirk to disable extended scanning Bluetooth: Add quirk to disable MWS Transport Configuration Bluetooth: hci_bcm4377: Add new driver for BCM4377 PCIe boards Wang ShaoBo (3): Bluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn() Bluetooth: hci_conn: add missing hci_dev_put() in iso_listen_bis() Bluetooth: btintel: Fix missing free skb in btintel_setup_combined() Yang Yingliang (9): Bluetooth: hci_core: fix error handling in hci_register_dev() Bluetooth: hci_bcm4377: Fix missing pci_disable_device() on error in bcm4377_probe() Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_ll: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: RFCOMM: don't call kfree_skb() under spin_lock_irqsave() Zhengchao Shao (1): Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del() Zhengping Jiang (1): Bluetooth: hci_qca: only assign wakeup with serial port support .../devicetree/bindings/net/bluetooth.txt | 5 - .../net/bluetooth/bluetooth-controller.yaml | 29 + .../net/bluetooth/brcm,bcm4377-bluetooth.yaml | 81 + .../net/{ => bluetooth}/qualcomm-bluetooth.yaml | 6 +- .../bindings/net/broadcom-bluetooth.yaml | 3 + .../devicetree/bindings/net/realtek-bluetooth.yaml | 1 + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 8 +- MAINTAINERS | 2 + arch/arm64/boot/dts/apple/t8103-j274.dts | 4 + arch/arm64/boot/dts/apple/t8103-j293.dts | 4 + arch/arm64/boot/dts/apple/t8103-j313.dts | 4 + arch/arm64/boot/dts/apple/t8103-j456.dts | 4 + arch/arm64/boot/dts/apple/t8103-j457.dts | 4 + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 8 + drivers/bluetooth/Kconfig | 23 + drivers/bluetooth/Makefile | 1 + drivers/bluetooth/btintel.c | 21 +- drivers/bluetooth/btrtl.c | 7 + drivers/bluetooth/btrtl.h | 21 + drivers/bluetooth/btusb.c | 234 +- drivers/bluetooth/hci_bcm.c | 13 +- drivers/bluetooth/hci_bcm4377.c | 2514 ++++++++++++++++++++ drivers/bluetooth/hci_bcsp.c | 2 +- drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_ll.c | 2 +- drivers/bluetooth/hci_qca.c | 5 +- drivers/bluetooth/virtio_bt.c | 37 +- include/net/bluetooth/hci.h | 33 +- include/net/bluetooth/hci_core.h | 8 +- include/uapi/linux/virtio_bt.h | 8 + net/bluetooth/6lowpan.c | 1 + net/bluetooth/Kconfig | 11 + net/bluetooth/af_bluetooth.c | 4 +- net/bluetooth/hci_codec.c | 19 +- net/bluetooth/hci_conn.c | 35 +- net/bluetooth/hci_core.c | 12 +- net/bluetooth/hci_debugfs.c | 2 +- net/bluetooth/hci_event.c | 24 +- net/bluetooth/hci_request.c | 2 +- net/bluetooth/hci_sync.c | 40 +- net/bluetooth/iso.c | 82 +- net/bluetooth/l2cap_core.c | 91 +- net/bluetooth/lib.c | 4 +- net/bluetooth/mgmt.c | 2 +- net/bluetooth/rfcomm/core.c | 2 +- 45 files changed, 3265 insertions(+), 160 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml create mode 100644 Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%) create mode 100644 drivers/bluetooth/hci_bcm4377.c