Skip to content

Commit 4a18b6c

Browse files
committed
Merge tag 'for-net-next-2025-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Luiz Augusto von Dentz says: ==================== bluetooth-next pull request for net-next: core: - HCI: Add initial support for PAST - hci_core: Introduce HCI_CONN_FLAG_PAST - ISO: Add support to bind to trigger PAST - HCI: Always use the identity address when initializing a connection - ISO: Attempt to resolve broadcast address - MGMT: Allow use of Set Device Flags without Add Device - ISO: Fix not updating BIS sender source address - HCI: Add support for LL Extended Feature Set driver: - btusb: Add new VID/PID 2b89/6275 for RTL8761BUV - btusb: MT7920: Add VID/PID 0489/e135 - btusb: MT7922: Add VID/PID 0489/e170 - btusb: Add new VID/PID 13d3/3533 for RTL8821CE - btusb: Add new VID/PID 0x0489/0xE12F for RTL8852BE-VT - btusb: Add new VID/PID 0x13d3/0x3618 for RTL8852BE-VT - btusb: Add new VID/PID 0x13d3/0x3619 for RTL8852BE-VT - btusb: Reclassify Qualcomm WCN6855 debug packets - btintel_pcie: Introduce HCI Driver protocol - btintel_pcie: Support for S4 (Hibernate) - btintel_pcie: Suspend/Resume: Controller doorbell interrupt handling - dt-bindings: net: Convert Marvell 8897/8997 bindings to DT schema - btbcm: Use kmalloc_array() to prevent overflow - btrtl: Add the support for RTL8761CUV - hci_h5: avoid sending two SYNC messages - hci_h5: implement CRC data integrity MAINTAINERS: - Add Bartosz Golaszewski as Qualcomm hci_qca maintainer * tag 'for-net-next-2025-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (29 commits) Bluetooth: btusb: Add new VID/PID 13d3/3533 for RTL8821CE Bluetooth: HCI: Add support for LL Extended Feature Set drivers/bluetooth: btbcm: Use kmalloc_array() to prevent overflow Bluetooth: btintel_pcie: Introduce HCI Driver protocol Bluetooth: btusb: add new custom firmwares Bluetooth: btusb: Add new VID/PID 0x13d3/0x3619 for RTL8852BE-VT Bluetooth: btusb: Add new VID/PID 0x13d3/0x3618 for RTL8852BE-VT Bluetooth: btusb: Add new VID/PID 0x0489/0xE12F for RTL8852BE-VT Bluetooth: iso: fix socket matching ambiguity between BIS and CIS Bluetooth: MAINTAINERS: Add Bartosz Golaszewski as Qualcomm hci_qca maintainer Bluetooth: btrtl: Add the support for RTL8761CUV Bluetooth: Remove redundant pm_runtime_mark_last_busy() calls dt-bindings: net: Convert Marvell 8897/8997 bindings to DT schema Bluetooth: btusb: Reclassify Qualcomm WCN6855 debug packets Bluetooth: btusb: Add new VID/PID 2b89/6275 for RTL8761BUV Bluetooth: btintel_pcie: Suspend/Resume: Controller doorbell interrupt handling Bluetooth: btintel_pcie: Support for S4 (Hibernate) Bluetooth: btusb: MT7922: Add VID/PID 0489/e170 Bluetooth: btusb: MT7920: Add VID/PID 0489/e135 Bluetooth: ISO: Fix not updating BIS sender source address ... ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents d8e0814 + 525459d commit 4a18b6c

File tree

23 files changed

+1172
-306
lines changed

23 files changed

+1172
-306
lines changed
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/bluetooth/marvell,sd8897-bt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell 8897/8997 (sd8897/sd8997) bluetooth devices (SDIO)
8+
9+
maintainers:
10+
- Ariel D'Alessandro <[email protected]>
11+
12+
allOf:
13+
- $ref: /schemas/net/bluetooth/bluetooth-controller.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- marvell,sd8897-bt
19+
- marvell,sd8997-bt
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
marvell,cal-data:
28+
$ref: /schemas/types.yaml#/definitions/uint8-array
29+
description:
30+
Calibration data downloaded to the device during initialization.
31+
maxItems: 28
32+
33+
marvell,wakeup-pin:
34+
$ref: /schemas/types.yaml#/definitions/uint16
35+
description:
36+
Wakeup pin number of the bluetooth chip. Used by firmware to wakeup host
37+
system.
38+
39+
marvell,wakeup-gap-ms:
40+
$ref: /schemas/types.yaml#/definitions/uint16
41+
description:
42+
Wakeup latency of the host platform. Required by the chip sleep feature.
43+
44+
required:
45+
- compatible
46+
- reg
47+
- interrupts
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
#include <dt-bindings/interrupt-controller/irq.h>
54+
55+
mmc {
56+
vmmc-supply = <&wlan_en_reg>;
57+
bus-width = <4>;
58+
cap-power-off-card;
59+
keep-power-in-suspend;
60+
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
64+
bluetooth@2 {
65+
compatible = "marvell,sd8897-bt";
66+
reg = <2>;
67+
interrupt-parent = <&pio>;
68+
interrupts = <119 IRQ_TYPE_LEVEL_LOW>;
69+
70+
marvell,cal-data = /bits/ 8 <
71+
0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
72+
0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
73+
0x00 0x00 0xf0 0x00>;
74+
marvell,wakeup-pin = /bits/ 16 <0x0d>;
75+
marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
76+
};
77+
};
78+
79+
...

Documentation/devicetree/bindings/net/btusb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Required properties:
1414

1515

1616
Also, vendors that use btusb may have device additional properties, e.g:
17-
Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
17+
Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml
1818

1919
Optional properties:
2020

Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt

Lines changed: 0 additions & 83 deletions
This file was deleted.

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21071,6 +21071,7 @@ F: Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml
2107121071
F: drivers/net/wwan/qcom_bam_dmux.c
2107221072

2107321073
QUALCOMM BLUETOOTH DRIVER
21074+
M: Bartosz Golaszewski <[email protected]>
2107421075
2107521076
S: Maintained
2107621077
F: drivers/bluetooth/btqca.[ch]

drivers/bluetooth/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ config BT_HCIUART_3WIRE
188188
bool "Three-wire UART (H5) protocol support"
189189
depends on BT_HCIUART
190190
depends on BT_HCIUART_SERDEV
191+
select CRC_CCITT
191192
help
192193
The HCI Three-wire UART Transport Layer makes it possible to
193194
user the Bluetooth HCI over a serial port interface. The HCI

drivers/bluetooth/btbcm.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,9 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_autobaud
642642
snprintf(postfix, sizeof(postfix), "-%4.4x-%4.4x", vid, pid);
643643
}
644644

645-
fw_name = kmalloc(BCM_FW_NAME_COUNT_MAX * BCM_FW_NAME_LEN, GFP_KERNEL);
645+
fw_name = kmalloc_array(BCM_FW_NAME_COUNT_MAX,
646+
sizeof(*fw_name),
647+
GFP_KERNEL);
646648
if (!fw_name)
647649
return -ENOMEM;
648650

0 commit comments

Comments
 (0)