Skip to content

Commit 4f74a45

Browse files
kuba-mookuba-moo
committed
Merge tag 'for-net-next-2025-03-25' 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: - Add support for skb TX SND/COMPLETION timestamping - hci_core: Enable buffer flow control for SCO/eSCO - coredump: Log devcd dumps into the monitor drivers: - btusb: Add 2 HWIDs for MT7922 - btusb: Fix regression in the initialization of fake Bluetooth controllers - btusb: Add 14 USB device IDs for Qualcomm WCN785x - btintel: Add support for Intel Scorpius Peak - btintel: Add support to configure TX power - btintel: Add DSBR support for ScP - btintel_pcie: Add device id of Whale Peak - btintel_pcie: Setup buffers for firmware traces - btintel_pcie: Read hardware exception data - btintel_pcie: Add support for device coredump - btintel_pcie: Trigger device coredump on hardware exception - btnxpuart: Support for controller wakeup gpio config - btnxpuart: Add support to set BD address - btnxpuart: Add correct bootloader error codes - btnxpuart: Handle bootloader error during cmd5 and cmd7 - btnxpuart: Fix kernel panic during FW release - qca: add WCN3950 support - hci_qca: use the power sequencer for wcn6750 - btmtksdio: Prevent enabling interrupts after IRQ handler removal * tag 'for-net-next-2025-03-25' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (53 commits) Bluetooth: MGMT: Add LL Privacy Setting Bluetooth: hci_event: Fix handling of HCI_EV_LE_DIRECT_ADV_REPORT Bluetooth: btnxpuart: Fix kernel panic during FW release Bluetooth: btnxpuart: Handle bootloader error during cmd5 and cmd7 Bluetooth: btnxpuart: Add correct bootloader error codes t blameBluetooth: btintel: Fix leading white space Bluetooth: btintel: Add support to configure TX power Bluetooth: btmtksdio: Prevent enabling interrupts after IRQ handler removal Bluetooth: btmtk: Remove the resetting step before downloading the fw Bluetooth: SCO: add TX timestamping Bluetooth: L2CAP: add TX timestamping Bluetooth: ISO: add TX timestamping Bluetooth: add support for skb TX SND/COMPLETION timestamping net-timestamp: COMPLETION timestamp on packet tx completion HCI: coredump: Log devcd dumps into the monitor Bluetooth: HCI: Add definition of hci_rp_remote_name_req_cancel Bluetooth: hci_vhci: Mark Sync Flow Control as supported Bluetooth: hci_core: Enable buffer flow control for SCO/eSCO Bluetooth: btintel_pci: Fix build warning Bluetooth: btintel_pcie: Trigger device coredump on hardware exception ... ==================== Link: https://patch.msgid.link/20250325192925.2497890-1-luiz.dentz@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents b6f61a3 + eed14eb commit 4f74a45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1900
-273
lines changed

‎Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ description:
1717
maintainers:
1818
- Neeraj Sanjay Kale <neeraj.sanjaykale@nxp.com>
1919

20+
allOf:
21+
- $ref: bluetooth-controller.yaml#
22+
2023
properties:
2124
compatible:
2225
enum:
@@ -40,10 +43,20 @@ properties:
4043
Host-To-Chip power save mechanism is driven by this GPIO
4144
connected to BT_WAKE_IN pin of the NXP chipset.
4245

46+
nxp,wakein-pin:
47+
$ref: /schemas/types.yaml#/definitions/uint8
48+
description:
49+
The GPIO number of the NXP chipset used for BT_WAKE_IN.
50+
51+
nxp,wakeout-pin:
52+
$ref: /schemas/types.yaml#/definitions/uint8
53+
description:
54+
The GPIO number of the NXP chipset used for BT_WAKE_OUT.
55+
4356
required:
4457
- compatible
4558

46-
additionalProperties: false
59+
unevaluatedProperties: false
4760

4861
examples:
4962
- |
@@ -54,5 +67,8 @@ examples:
5467
fw-init-baudrate = <3000000>;
5568
firmware-name = "uartuart8987_bt_v0.bin";
5669
device-wakeup-gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
70+
nxp,wakein-pin = /bits/ 8 <18>;
71+
nxp,wakeout-pin = /bits/ 8 <19>;
72+
local-bd-address = [66 55 44 33 22 11];
5773
};
5874
};

‎Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- qcom,qca2066-bt
2020
- qcom,qca6174-bt
2121
- qcom,qca9377-bt
22+
- qcom,wcn3950-bt
2223
- qcom,wcn3988-bt
2324
- qcom,wcn3990-bt
2425
- qcom,wcn3991-bt
@@ -138,6 +139,7 @@ allOf:
138139
compatible:
139140
contains:
140141
enum:
142+
- qcom,wcn3950-bt
141143
- qcom,wcn3988-bt
142144
- qcom,wcn3990-bt
143145
- qcom,wcn3991-bt

‎Documentation/networking/timestamping.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,14 @@ SOF_TIMESTAMPING_TX_ACK:
140140
cumulative acknowledgment. The mechanism ignores SACK and FACK.
141141
This flag can be enabled via both socket options and control messages.
142142

143+
SOF_TIMESTAMPING_TX_COMPLETION:
144+
Request tx timestamps on packet tx completion. The completion
145+
timestamp is generated by the kernel when it receives packet a
146+
completion report from the hardware. Hardware may report multiple
147+
packets at once, and completion timestamps reflect the timing of the
148+
report and not actual tx time. This flag can be enabled via both
149+
socket options and control messages.
150+
143151

144152
1.3.2 Timestamp Reporting
145153
^^^^^^^^^^^^^^^^^^^^^^^^^

‎drivers/bluetooth/bfusb.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,8 @@ static void bfusb_rx_complete(struct urb *urb)
365365
buf += 3;
366366
}
367367

368-
if (count < len) {
368+
if (count < len)
369369
bt_dev_err(data->hdev, "block extends over URB buffer ranges");
370-
}
371370

372371
if ((hdr & 0xe1) == 0xc1)
373372
bfusb_recv_block(data, hdr, buf, len);

0 commit comments

Comments
 (0)