* Re: [PATCH BlueZ v2] profiles/ranging: Read measured_freq_offset field-16 bit as per Core Spec
From: Bastien Nocera @ 2026-06-04 11:22 UTC (permalink / raw)
To: Prathibha Madugonde, linux-bluetooth
Cc: luiz.dentz, quic_mohamull, quic_hbandi, quic_anubhavg
In-Reply-To: <20260604100233.4193077-1-prathm@qti.qualcomm.com>
On Thu, 2026-06-04 at 15:32 +0530, Prathibha Madugonde wrote:
> From: Prathibha Madugonde <prathibha.madugonde@oss.qualcomm.com>
Could you please add a reference in the commit message to the part of
the Core spec that's relevant?
>
> Fix in V2:
> Fixed compilation issue.
This should appear under the "---", so that it doesn't get into the
commit message itself when the patch gets applied.
> ---
> profiles/ranging/rap_hci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/profiles/ranging/rap_hci.c b/profiles/ranging/rap_hci.c
> index 8e65e5ef8..febe23384 100644
> --- a/profiles/ranging/rap_hci.c
> +++ b/profiles/ranging/rap_hci.c
> @@ -601,7 +601,7 @@ static void parse_mode_zero_data(struct iovec
> *iov,
> struct cs_mode_zero_data
> *mode_data,
> uint8_t cs_role)
> {
> - uint32_t freq_offset;
> + uint16_t freq_offset;
>
> if (iov->iov_len < 3) {
> DBG("Mode 0: too short (<3)");
> @@ -614,7 +614,7 @@ static void parse_mode_zero_data(struct iovec
> *iov,
> DBG("CS Step mode 0");
>
> if (cs_role == CS_INITIATOR && iov->iov_len >= 4) {
> - util_iov_pull_le32(iov, &freq_offset);
> + util_iov_pull_le16(iov, &freq_offset);
> mode_data->init_measured_freq_offset = freq_offset;
> }
> }
^ permalink raw reply
* [PATCH BlueZ v2] profiles/ranging: Read measured_freq_offset field-16 bit as per Core Spec
From: Prathibha Madugonde @ 2026-06-04 10:02 UTC (permalink / raw)
To: linux-bluetooth; +Cc: luiz.dentz, quic_mohamull, quic_hbandi, quic_anubhavg
From: Prathibha Madugonde <prathibha.madugonde@oss.qualcomm.com>
Fix in V2:
Fixed compilation issue.
---
profiles/ranging/rap_hci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/profiles/ranging/rap_hci.c b/profiles/ranging/rap_hci.c
index 8e65e5ef8..febe23384 100644
--- a/profiles/ranging/rap_hci.c
+++ b/profiles/ranging/rap_hci.c
@@ -601,7 +601,7 @@ static void parse_mode_zero_data(struct iovec *iov,
struct cs_mode_zero_data *mode_data,
uint8_t cs_role)
{
- uint32_t freq_offset;
+ uint16_t freq_offset;
if (iov->iov_len < 3) {
DBG("Mode 0: too short (<3)");
@@ -614,7 +614,7 @@ static void parse_mode_zero_data(struct iovec *iov,
DBG("CS Step mode 0");
if (cs_role == CS_INITIATOR && iov->iov_len >= 4) {
- util_iov_pull_le32(iov, &freq_offset);
+ util_iov_pull_le16(iov, &freq_offset);
mode_data->init_measured_freq_offset = freq_offset;
}
}
--
2.34.1
^ permalink raw reply related
* [BlueZ] build: Support libical 4.0
From: Bastien Nocera @ 2026-06-04 8:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Funda Wang
From: Funda Wang <fundawang@yeah.net>
libical 4.0 split off some vcal related functions to a separate shared
library, libicalvcal. As libicalvcal depends on libical itself, first
check for libicalvcal being available, and if it fails, check for
just libical.
Closes: https://github.com/bluez/bluez/issues/2090
Tested-by: Bastien Nocera <hadess@hadess.net>
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 52de7d665184..1cdd551f61cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,9 @@ fi
AC_ARG_ENABLE(obex, AS_HELP_STRING([--disable-obex],
[disable OBEX profile support]), [enable_obex=${enableval}])
if (test "${enable_obex}" != "no"); then
- PKG_CHECK_MODULES(ICAL, libical)
+ PKG_CHECK_MODULES(ICAL, [libicalvcal >= 4.0.0], [],
+ [PKG_CHECK_MODULES(ICAL, [libical])]
+ )
fi
AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")
--
2.54.0
^ permalink raw reply related
* [PATCH v3] profile: Set L2CAP IMTU for OBEX profile listeners
From: Wei Deng @ 2026-06-04 9:30 UTC (permalink / raw)
To: linux-bluetooth; +Cc: luiz.von.dentz, cheng.jiang, jinwang.li, shuai.zhang
In-Reply-To: <20260602031719.679979-1-wei.deng@oss.qualcomm.com>
The default_settings entries for OBEX profiles (OPP, FTP, PBAP, MAS,
MNS) have no imtu field, so ext_start_servers() creates the L2CAP
listening socket without an explicit IMTU. This causes the socket to
advertise the L2CAP minimum of 672 bytes in L2CAP_CONFIGURATION_RSP,
limiting the peer's outgoing PDU size and degrading Rx throughput.
Add an imtu field to default_settings and set it to 32767 for all
OBEX profiles that use L2CAP. Copy the value in ext_set_defaults()
and apply it to the listening socket via bt_io_set() after
bt_io_listen() succeeds.
Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
---
src/profile.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/profile.c b/src/profile.c
index dfc5f7161..65df0f7a0 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -55,6 +55,8 @@
#define MAS_DEFAULT_CHANNEL 16
#define MNS_DEFAULT_CHANNEL 17
+#define BT_RX_MTU 32767
+
#define BTD_PROFILE_PSM_AUTO -1
#define BTD_PROFILE_CHAN_AUTO -1
@@ -678,6 +680,7 @@ struct ext_profile {
uint16_t version;
uint16_t features;
+ uint16_t imtu;
GSList *records;
GSList *servers;
@@ -1423,6 +1426,9 @@ static uint32_t ext_start_servers(struct ext_profile *ext,
if (psm == 0)
bt_io_get(io, NULL, BT_IO_OPT_PSM, &psm,
BT_IO_OPT_INVALID);
+ if (ext->imtu)
+ bt_io_set(io, NULL, BT_IO_OPT_IMTU, ext->imtu,
+ BT_IO_OPT_INVALID);
l2cap->io = io;
l2cap->proto = BTPROTO_L2CAP;
l2cap->psm = psm;
@@ -2075,6 +2081,7 @@ static struct default_settings {
struct ext_io *rfcomm);
uint16_t version;
uint16_t features;
+ uint16_t imtu;
} defaults[] = {
{
.uuid = SPP_UUID,
@@ -2142,6 +2149,7 @@ static struct default_settings {
.authorize = false,
.get_record = get_opp_record,
.version = 0x0102,
+ .imtu = BT_RX_MTU,
}, {
.uuid = OBEX_FTP_UUID,
.name = "File Transfer",
@@ -2151,6 +2159,7 @@ static struct default_settings {
.authorize = true,
.get_record = get_ftp_record,
.version = 0x0103,
+ .imtu = BT_RX_MTU,
}, {
.uuid = OBEX_SYNC_UUID,
.name = "Synchronization",
@@ -2167,6 +2176,7 @@ static struct default_settings {
.authorize = true,
.get_record = get_pse_record,
.version = 0x0101,
+ .imtu = BT_RX_MTU,
}, {
.uuid = OBEX_PCE_UUID,
.name = "Phone Book Access Client",
@@ -2182,7 +2192,8 @@ static struct default_settings {
.mode = BT_IO_MODE_ERTM,
.authorize = true,
.get_record = get_mas_record,
- .version = 0x0100
+ .version = 0x0100,
+ .imtu = BT_RX_MTU,
}, {
.uuid = OBEX_MNS_UUID,
.name = "Message Notification",
@@ -2191,7 +2202,8 @@ static struct default_settings {
.mode = BT_IO_MODE_ERTM,
.authorize = true,
.get_record = get_mns_record,
- .version = 0x0104
+ .version = 0x0104,
+ .imtu = BT_RX_MTU,
},
};
@@ -2249,6 +2261,9 @@ static void ext_set_defaults(struct ext_profile *ext)
if (settings->features)
ext->features = settings->features;
+ if (settings->imtu)
+ ext->imtu = settings->imtu;
+
if (settings->name)
ext->name = g_strdup(settings->name);
}
--
2.34.1
^ permalink raw reply related
* RE: Bluetooth: btusb: fix wakeup irq devres lifetime
From: bluez.test.bot @ 2026-06-04 9:28 UTC (permalink / raw)
To: linux-bluetooth, johan
In-Reply-To: <20260604063740.2595260-2-johan@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 2399 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1105725
---Test result---
Test Summary:
CheckPatch FAIL 3.47 seconds
VerifyFixes PASS 0.12 seconds
VerifySignedoff PASS 0.12 seconds
GitLint FAIL 1.46 seconds
SubjectPrefix PASS 0.74 seconds
BuildKernel PASS 26.60 seconds
CheckAllWarning PASS 28.94 seconds
CheckSparse PASS 27.76 seconds
BuildKernel32 PASS 25.28 seconds
TestRunnerSetup PASS 565.02 seconds
IncrementalBuild PASS 33.33 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v4,4/5] Bluetooth: btusb: fix wakeup irq devres lifetime
ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 699fb50d9903 ("drivers: base: Free devm resources when unregistering a device")'
#81:
[1] 699fb50d9903 ("drivers: base: Free devm resources when unregistering
total: 1 errors, 0 warnings, 51 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/patch/14610717.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v4,1/5] Bluetooth: btusb: fix use-after-free on registration failure
10: B3 Line contains hard tab characters (\t): "Cc: stable@vger.kernel.org # 2.6.27"
[v4,2/5] Bluetooth: btusb: fix use-after-free on marvell probe failure
10: B3 Line contains hard tab characters (\t): "Cc: stable@vger.kernel.org # 4.11"
[v4,3/5] Bluetooth: btusb: fix wakeup source leak on probe failure
6: B3 Line contains hard tab characters (\t): "Cc: stable@vger.kernel.org # 4.11"
https://github.com/bluez/bluetooth-next/pull/286
---
Regards,
Linux Bluetooth
^ permalink raw reply
* RE: shared/bap: add ASE Control Point error responses
From: bluez.test.bot @ 2026-06-04 9:02 UTC (permalink / raw)
To: linux-bluetooth, raghavendra.rao
In-Reply-To: <20260604052052.10667-2-raghavendra.rao@collabora.com>
[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1105699
---Test result---
Test Summary:
CheckPatch PASS 0.57 seconds
GitLint PASS 0.33 seconds
BuildEll PASS 20.05 seconds
BluezMake PASS 612.41 seconds
MakeCheck PASS 19.18 seconds
MakeDistcheck PASS 234.26 seconds
CheckValgrind PASS 274.34 seconds
CheckSmatch WARNING 322.83 seconds
bluezmakeextell PASS 165.13 seconds
IncrementalBuild PASS 609.37 seconds
ScanBuild PASS 919.20 seconds
Details
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
src/shared/bap.c:317:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:317:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:317:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structures
https://github.com/bluez/bluez/pull/2174
---
Regards,
Linux Bluetooth
^ permalink raw reply
* [PATCH BlueZ v1] profiles/ranging: Read measured_freq_offset field-16 bit as per Core Spec
From: Prathibha Madugonde @ 2026-06-04 8:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: luiz.dentz, quic_mohamull, quic_hbandi, quic_anubhavg
From: Prathibha Madugonde <prathibha.madugonde@oss.qualcomm.com>
---
profiles/ranging/rap_hci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/profiles/ranging/rap_hci.c b/profiles/ranging/rap_hci.c
index 8e65e5ef8..23678ed98 100644
--- a/profiles/ranging/rap_hci.c
+++ b/profiles/ranging/rap_hci.c
@@ -601,7 +601,7 @@ static void parse_mode_zero_data(struct iovec *iov,
struct cs_mode_zero_data *mode_data,
uint8_t cs_role)
{
- uint32_t freq_offset;
+ uint16 freq_offset;
if (iov->iov_len < 3) {
DBG("Mode 0: too short (<3)");
@@ -614,7 +614,7 @@ static void parse_mode_zero_data(struct iovec *iov,
DBG("CS Step mode 0");
if (cs_role == CS_INITIATOR && iov->iov_len >= 4) {
- util_iov_pull_le32(iov, &freq_offset);
+ util_iov_pull_le16(iov, &freq_offset);
mode_data->init_measured_freq_offset = freq_offset;
}
}
--
2.34.1
^ permalink raw reply related
* [PATCH BlueZ] shared/rap: Add client ranging registration and notification parsing
From: Prathibha Madugonde @ 2026-06-04 8:52 UTC (permalink / raw)
To: linux-bluetooth; +Cc: luiz.dentz, quic_mohamull, quic_hbandi, quic_anubhavg
From: Prathibha Madugonde <prathibha.madugonde@oss.qualcomm.com>
Read the RAS Features characteristic to determine whether the remote
device supports real-time ranging. If supported, register for real-time
characteristic notifications using the reqtracker for the CS initiator
role.
Parse incoming segmented RAS ranging data notifications by accumulating
segments via iovec and parsing complete subevent headers and CS mode 0-3
step data, including IQ/tone PCT samples, once the last segment arrives.
Changes in v2:
Removed unneccsary DBG logs and unused variables.
Use helper functions for readablitiy and code indentation.
Changes in v5:
Fix use-after-scope in read_ras_features where a stack-local padded
buffer was referenced after leaving its scope via iov. Use get_le32
on a properly scoped buffer instead.
Add null checks for resptracker and reqtracker in HCI subevent
callbacks to prevent crashes when config complete has not yet been
received.
Fix Mode 0 frequency offset parsing: the Measured Frequency Offset
field is 16 bits per the CS spec, not 32 bits. Update
CS_MODE_ZERO_WIRE_INIT_SIZE from 7 to 5 accordingly.
Fix step mode extraction mask from 0x7F to 0x03 since CS mode is
only 2 bits (modes 0-3).
Refactor parse_mode_three to call parse_mode_one and parse_mode_two
directly, eliminating duplicated code. Similarly refactor
get_mode_three_length to use get_mode_one_length + get_mode_two_length.
Fix typo 'reflecter' to 'reflector' in comments.
Fix DBG format specifiers: use %u for uint16_t length parameters.
Remove double blank line in fill_initiator_data_from_cs_subevent_result
and add TODO comments to stub functions.
---
src/shared/rap.c | 787 ++++++++++++++++++++++++++++++++++++++++++++++-
src/shared/rap.h | 2 +-
2 files changed, 779 insertions(+), 10 deletions(-)
diff --git a/src/shared/rap.c b/src/shared/rap.c
index 145da2060..390fd3080 100644
--- a/src/shared/rap.c
+++ b/src/shared/rap.c
@@ -29,6 +29,9 @@
#define DBG(_rap, fmt, ...) \
rap_debug(_rap, "%s:%s() " fmt, __FILE__, __func__, ##__VA_ARGS__)
+#define SIGN_EXTEND_TO_16(val, bits) \
+ ((int16_t)(((val) ^ (1U << ((bits)-1))) - (1U << ((bits)-1))))
+
#define RAS_UUID16 0x185B
/* Total number of attribute handles reserved for the RAS service */
@@ -43,6 +46,11 @@
#define RAS_STEP_ABORTED_BIT 0x80/* set step aborted */
#define RAS_SUBEVENT_HEADER_SIZE 8
+#define CS_MODE_ZERO_WIRE_INIT_SIZE 5
+#define CS_MODE_ZERO_WIRE_REF_SIZE 3
+#define CS_MODE_ONE_WIRE_SIZE_MIN 6
+#define CS_MODE_ONE_WIRE_SIZE_MAX 12
+
enum pct_format {
IQ = 0,
PHASE = 1,
@@ -134,6 +142,28 @@ static inline void ranging_header_set_pct_format(struct ranging_header *hdr,
((format & 0x03) << 6);
}
+static inline uint8_t ranging_header_get_antenna_mask(
+ const struct ranging_header *hdr)
+{
+ if (!hdr)
+ return 0;
+
+ return hdr->antenna_pct & 0x0F;
+}
+
+static inline uint8_t antenna_mask_count_paths(uint8_t antenna_mask)
+{
+ uint8_t count = 0;
+ uint8_t i;
+
+ for (i = 0; i < 4; i++) {
+ if (antenna_mask & (1u << i))
+ count++;
+ }
+
+ return count;
+}
+
struct ras_subevent_header {
uint16_t start_acl_conn_event;
uint16_t frequency_compensation;
@@ -149,9 +179,21 @@ struct ras_subevent_header {
#define RAS_DONE_STATUS_PACK(ranging, subevent) \
((uint8_t)(((ranging) & 0x0F) | (((subevent) & 0x0F) << 4)))
+#define RAS_DONE_STATUS_UNPACK_RANGING(packed) \
+ ((uint8_t)((packed) & 0x0F))
+
+#define RAS_DONE_STATUS_UNPACK_SUBEVENT(packed) \
+ ((uint8_t)(((packed) >> 4) & 0x0F))
+
#define RAS_ABORT_REASON_PACK(ranging, subevent) \
((uint8_t)(((ranging) & 0x0F) | (((subevent) & 0x0F) << 4)))
+#define RAS_ABORT_REASON_UNPACK_RANGING(packed) \
+ ((uint8_t)((packed) & 0x0F))
+
+#define RAS_ABORT_REASON_UNPACK_SUBEVENT(packed) \
+ ((uint8_t)(((packed) >> 4) & 0x0F))
+
struct ras_subevent {
struct ras_subevent_header subevent_header;
uint8_t subevent_data[];
@@ -206,6 +248,11 @@ struct cstracker {
uint16_t last_start_acl_conn_evt_counter;
uint16_t last_freq_comp;
int8_t last_ref_pwr_lvl;
+
+ /* Client - first segment carries this */
+ struct ranging_header ranging_header_;
+ /* Client - subsequent segments appended using iovec */
+ struct iovec segment_data;
};
/* Ranging Service context */
@@ -254,6 +301,7 @@ struct bt_rap {
void *debug_data;
void *user_data;
struct cstracker *resptracker;
+ struct cstracker *reqtracker;
};
static struct queue *rap_db;
@@ -274,6 +322,28 @@ struct bt_rap_ready {
void *data;
};
+typedef void (*rap_notify_t)(struct bt_rap *rap, uint16_t value_handle,
+ const uint8_t *value, uint16_t length,
+ void *user_data);
+
+struct bt_rap_notify {
+ unsigned int id;
+ struct bt_rap *rap;
+ rap_notify_t func;
+ void *user_data;
+};
+
+typedef void (*rap_func_t)(struct bt_rap *rap, bool success,
+ uint8_t att_ecode, const uint8_t *value,
+ uint16_t length, void *user_data);
+
+struct bt_rap_pending {
+ unsigned int id;
+ struct bt_rap *rap;
+ rap_func_t func;
+ void *userdata;
+};
+
uint16_t default_ras_mtu = 247; /*Section 3.1.2 of RAP 1.0*/
uint8_t ras_segment_header_size = 1;
@@ -542,6 +612,11 @@ static void rap_free(void *data)
rap->resptracker = NULL;
}
+ if (rap->reqtracker) {
+ free(rap->reqtracker);
+ rap->reqtracker = NULL;
+ }
+
queue_destroy(rap->notify, free);
queue_destroy(rap->pending, NULL);
queue_destroy(rap->ready_cbs, rap_ready_free);
@@ -641,6 +716,12 @@ static void cs_tracker_init(struct cstracker *t)
t->last_start_acl_conn_evt_counter = 0;
t->last_freq_comp = 0;
t->last_ref_pwr_lvl = 0;
+
+ /* Initialize ranging header using helper functions */
+ memset(&t->ranging_header_, 0, sizeof(t->ranging_header_));
+ /* Initialize segment accumulator */
+ t->segment_data.iov_base = NULL;
+ t->segment_data.iov_len = 0;
}
static void ras_features_read_cb(struct gatt_db_attribute *attrib,
@@ -1646,7 +1727,7 @@ static void form_ras_data_with_cs_subevent_result(struct bt_rap *rap,
if (length < base_len)
return;
- DBG(rap, "Received CS subevent result subevent: len=%d", length);
+ DBG(rap, "Received CS subevent result subevent: len=%u", length);
handle_local_subevent_result(rap,
true, /* has header fields */
@@ -1677,7 +1758,7 @@ static void form_ras_data_with_cs_subevent_result_cont(struct bt_rap *rap,
if (length < base_len)
return;
- DBG(rap, "Received CS subevent result continue subevent: len=%d",
+ DBG(rap, "Received CS subevent result continue subevent: len=%u",
length);
resptracker = rap->resptracker;
@@ -1698,6 +1779,41 @@ static void form_ras_data_with_cs_subevent_result_cont(struct bt_rap *rap,
cont->step_data);
}
+static void fill_initiator_data_from_cs_subevent_result_cont(struct bt_rap *rap,
+ const struct rap_ev_cs_subevent_result_cont *cont,
+ uint16_t length)
+{
+ size_t base_len = offsetof(struct rap_ev_cs_subevent_result_cont,
+ step_data);
+
+ if (!rap || !rap->reqtracker || !cont)
+ return;
+
+ if (length < base_len)
+ return;
+
+ DBG(rap, "Received CS subevent result continue subevent: len=%u",
+ length);
+}
+
+static void fill_initiator_data_from_cs_subevent_result(struct bt_rap *rap,
+ const struct rap_ev_cs_subevent_result *data,
+ uint16_t length)
+{
+ size_t base_len = offsetof(struct rap_ev_cs_subevent_result,
+ step_data);
+
+ if (!rap || !rap->reqtracker || !data)
+ return;
+
+ /* Defensive check: base header must be present */
+ if (length < base_len)
+ return;
+
+ DBG(rap, "Received CS subevent result subevent: len=%u", length);
+ /* TODO: Store initiator subevent result data */
+}
+
void bt_rap_hci_cs_subevent_result_cont_callback(uint16_t length,
const void *param,
void *user_data)
@@ -1705,9 +1821,14 @@ void bt_rap_hci_cs_subevent_result_cont_callback(uint16_t length,
const struct rap_ev_cs_subevent_result_cont *cont = param;
struct bt_rap *rap = user_data;
- DBG(rap, "Received CS subevent CONT: len=%d", length);
+ DBG(rap, "Received CS subevent CONT: len=%u", length);
+
+ if (rap->resptracker && rap->resptracker->role == CS_REFLECTOR)
+ form_ras_data_with_cs_subevent_result_cont(rap, cont, length);
- form_ras_data_with_cs_subevent_result_cont(rap, cont, length);
+ if (rap->reqtracker && rap->reqtracker->role == CS_INITIATOR)
+ fill_initiator_data_from_cs_subevent_result_cont(rap, cont,
+ length);
}
void bt_rap_hci_cs_subevent_result_callback(uint16_t length,
@@ -1717,10 +1838,14 @@ void bt_rap_hci_cs_subevent_result_callback(uint16_t length,
const struct rap_ev_cs_subevent_result *data = param;
struct bt_rap *rap = user_data;
- DBG(rap, "Received CS subevent: len=%d", length);
+ DBG(rap, "Received CS subevent: len=%u", length);
/* Populate CsProcedureData and send RAS payload */
- form_ras_data_with_cs_subevent_result(rap, data, length);
+ if (rap->resptracker && rap->resptracker->role == CS_REFLECTOR)
+ form_ras_data_with_cs_subevent_result(rap, data, length);
+
+ if (rap->reqtracker && rap->reqtracker->role == CS_INITIATOR)
+ fill_initiator_data_from_cs_subevent_result(rap, data, length);
}
void bt_rap_hci_cs_procedure_enable_complete_callback(uint16_t length,
@@ -1731,7 +1856,7 @@ void bt_rap_hci_cs_procedure_enable_complete_callback(uint16_t length,
struct bt_rap *rap = user_data;
struct cstracker *resptracker;
- DBG(rap, "Received CS procedure enable complete subevent: len=%d",
+ DBG(rap, "Received CS procedure enable complete subevent: len=%u",
length);
if (!rap->resptracker) {
@@ -1753,7 +1878,7 @@ void bt_rap_hci_cs_sec_enable_complete_callback(uint16_t length,
{
struct bt_rap *rap = user_data;
- DBG(rap, "Received CS security enable subevent: len=%d", length);
+ DBG(rap, "Received CS security enable subevent: len=%u", length);
}
void bt_rap_hci_cs_config_complete_callback(uint16_t length,
@@ -1763,11 +1888,12 @@ void bt_rap_hci_cs_config_complete_callback(uint16_t length,
const struct rap_ev_cs_config_cmplt *data = param;
struct bt_rap *rap = user_data;
struct cstracker *resptracker;
+ struct cstracker *reqtracker;
if (!rap)
return;
- DBG(rap, "Received CS config complete subevent: len=%d", length);
+ DBG(rap, "Received CS config complete subevent: len=%u", length);
if (!rap->resptracker) {
resptracker = new0(struct cstracker, 1);
@@ -1781,6 +1907,19 @@ void bt_rap_hci_cs_config_complete_callback(uint16_t length,
resptracker->config_id = data->config_id;
resptracker->role = data->role;
resptracker->rtt_type = data->rtt_type;
+
+ if (!rap->reqtracker) {
+ reqtracker = new0(struct cstracker, 1);
+ cs_tracker_init(reqtracker);
+ rap->reqtracker = reqtracker;
+ }
+
+ reqtracker = rap->reqtracker;
+
+ /* Basic fields */
+ reqtracker->config_id = data->config_id;
+ reqtracker->role = data->role;
+ reqtracker->rtt_type = data->rtt_type;
}
struct bt_rap *bt_rap_new(struct gatt_db *ldb, struct gatt_db *rdb)
@@ -1815,6 +1954,632 @@ done:
return rap;
}
+static void ras_pending_destroy(void *data)
+{
+ struct bt_rap_pending *pending = data;
+ struct bt_rap *rap = pending->rap;
+
+ if (queue_remove_if(rap->pending, NULL, pending))
+ free(pending);
+}
+
+static void ras_pending_complete(bool success, uint8_t att_ecode,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ struct bt_rap_pending *pending = user_data;
+
+ if (pending->func)
+ pending->func(pending->rap, success, att_ecode, value, length,
+ pending->userdata);
+}
+
+static void rap_read_value(struct bt_rap *rap, uint16_t value_handle,
+ rap_func_t func, void *user_data)
+{
+ struct bt_rap_pending *pending;
+
+ pending = new0(struct bt_rap_pending, 1);
+ pending->rap = rap;
+ pending->func = func;
+ pending->userdata = user_data;
+
+ pending->id = bt_gatt_client_read_value(rap->client, value_handle,
+ ras_pending_complete, pending,
+ ras_pending_destroy);
+ if (!pending->id) {
+ DBG(rap, "Unable to send Read request");
+ free(pending);
+ return;
+ }
+
+ queue_push_tail(rap->pending, pending);
+}
+
+static void ras_register(uint16_t att_ecode, void *user_data)
+{
+ struct bt_rap_notify *notify = user_data;
+
+ if (att_ecode)
+ DBG(notify->rap, "RAS register failed 0x%04x", att_ecode);
+
+ (void)notify;
+}
+
+static void rap_notify(uint16_t value_handle, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_rap_notify *notify = user_data;
+
+ if (notify->func)
+ notify->func(notify->rap, value_handle, value, length,
+ notify->user_data);
+}
+
+static void rap_notify_destroy(void *data)
+{
+ struct bt_rap_notify *notify = data;
+ struct bt_rap *rap = notify->rap;
+
+ if (queue_remove_if(rap->notify, NULL, notify))
+ free(notify);
+}
+
+static unsigned int bt_rap_register_notify(struct bt_rap *rap,
+ uint16_t value_handle,
+ rap_notify_t func,
+ void *user_data)
+{
+ struct bt_rap_notify *notify;
+
+ notify = new0(struct bt_rap_notify, 1);
+ notify->rap = rap;
+ notify->func = func;
+ notify->user_data = user_data;
+
+ DBG(rap, "register for notifications");
+
+ notify->id = bt_gatt_client_register_notify(rap->client,
+ value_handle, ras_register,
+ rap_notify, notify,
+ rap_notify_destroy);
+ if (!notify->id) {
+ DBG(rap, "Unable to register for notifications");
+ free(notify);
+ return 0;
+ }
+
+ queue_push_tail(rap->notify, notify);
+
+ return notify->id;
+}
+
+static inline bool parse_segmentation_header(struct iovec *iov,
+ struct segmentation_header *s)
+{
+ uint8_t byte;
+
+ if (!util_iov_pull_u8(iov, &byte))
+ return false;
+
+ s->first_segment = (byte & 0x01) ? 1 : 0;
+ s->last_segment = (byte & 0x02) ? 1 : 0;
+ s->rolling_segment_counter = (byte >> 2) & 0x3F;
+
+ return true;
+}
+
+static void parse_i_q_sample(struct iovec *iov, int16_t *i_sample,
+ int16_t *q_sample)
+{
+ uint32_t buffer;
+ uint32_t i12;
+ uint32_t q12;
+
+ if (!util_iov_pull_le24(iov, &buffer)) {
+ *i_sample = 0;
+ *q_sample = 0;
+ return;
+ }
+
+ i12 = buffer & 0x0FFFU; /* bits 0..11 */
+ q12 = (buffer >> 12) & 0x0FFFU; /* bits 12..23 */
+
+ *i_sample = SIGN_EXTEND_TO_16(i12, 12);
+ *q_sample = SIGN_EXTEND_TO_16(q12, 12);
+}
+
+static size_t get_mode_zero_length(enum cs_role remote_role)
+{
+ return (remote_role == CS_ROLE_INITIATOR) ?
+ CS_MODE_ZERO_WIRE_INIT_SIZE :
+ CS_MODE_ZERO_WIRE_REF_SIZE;
+}
+
+static void parse_mode_zero(struct bt_rap *rap, struct iovec *mode_iov,
+ enum cs_role remote_role)
+{
+ uint8_t packet_quality;
+ int8_t packet_rssi_dbm;
+ uint8_t packet_ant;
+ uint16_t init_measured_freq_offset = 0;
+
+ if (!util_iov_pull_u8(mode_iov, &packet_quality) ||
+ !util_iov_pull_u8(mode_iov, (uint8_t *)&packet_rssi_dbm) ||
+ !util_iov_pull_u8(mode_iov, &packet_ant)) {
+ DBG(rap, "Mode 0: failed to parse common fields");
+ return;
+ }
+
+ if (remote_role == CS_ROLE_INITIATOR) {
+ if (!util_iov_pull_le16(mode_iov, &init_measured_freq_offset)) {
+ DBG(rap, "Mode 0: failed to parse freq offset");
+ return;
+ }
+ }
+
+ /* TODO: Store this data as reflector data */
+}
+
+static size_t get_mode_one_length(bool include_pct)
+{
+ if (include_pct)
+ return CS_MODE_ONE_WIRE_SIZE_MAX;
+ return CS_MODE_ONE_WIRE_SIZE_MIN;
+}
+
+static void parse_mode_one(struct bt_rap *rap, struct iovec *mode_iov,
+ enum cs_role remote_role, bool include_pct)
+{
+ uint8_t packet_quality;
+ uint8_t packet_nadm;
+ int8_t packet_rssi_dbm;
+ int16_t time_value;
+ uint8_t packet_ant;
+ int16_t pct1_i = 0, pct1_q = 0;
+ int16_t pct2_i = 0, pct2_q = 0;
+
+ if (!util_iov_pull_u8(mode_iov, &packet_quality) ||
+ !util_iov_pull_u8(mode_iov, &packet_nadm) ||
+ !util_iov_pull_u8(mode_iov, (uint8_t *)&packet_rssi_dbm) ||
+ !util_iov_pull_le16(mode_iov, (uint16_t *)&time_value) ||
+ !util_iov_pull_u8(mode_iov, &packet_ant)) {
+ DBG(rap, "Mode 1: failed to parse fixed fields");
+ return;
+ }
+
+ if (include_pct) {
+ parse_i_q_sample(mode_iov, &pct1_i, &pct1_q);
+ parse_i_q_sample(mode_iov, &pct2_i, &pct2_q);
+ }
+
+ /* TODO: Store this data as reflector data */
+}
+
+static size_t get_mode_two_length(uint8_t num_antenna_paths)
+{
+ uint8_t num_tone_data = num_antenna_paths + 1;
+
+ return 1 + (4 * num_tone_data);
+}
+
+static void parse_mode_two(struct bt_rap *rap, struct iovec *mode_iov,
+ uint8_t num_antenna_paths)
+{
+ uint8_t ant_perm_index;
+ int16_t tone_pct_i[5];
+ int16_t tone_pct_q[5];
+ uint8_t tone_quality[5];
+ uint8_t k;
+ uint8_t num_paths = (num_antenna_paths + 1) < 5 ?
+ (num_antenna_paths + 1) : 5;
+
+ if (!util_iov_pull_u8(mode_iov, &ant_perm_index)) {
+ DBG(rap, "Mode 2: failed to parse ant_perm_index");
+ return;
+ }
+
+ for (k = 0; k < num_paths; k++) {
+ int16_t i_val, q_val;
+
+ if (mode_iov->iov_len < 4) {
+ DBG(rap, "Mode 2: insufficient PCT for "
+ "path %u (rem=%zu)",
+ k, mode_iov->iov_len);
+ break;
+ }
+ parse_i_q_sample(mode_iov, &i_val, &q_val);
+ tone_pct_i[k] = i_val;
+ tone_pct_q[k] = q_val;
+
+ util_iov_pull_u8(mode_iov, &tone_quality[k]);
+ DBG(rap, "tone_quality_indicator : %d",
+ tone_quality[k]);
+ DBG(rap, "[i, q] : %d, %d",
+ tone_pct_i[k],
+ tone_pct_q[k]);
+ }
+
+ DBG(rap, " cs_mode_two_data: ant_perm_idx=%u",
+ ant_perm_index);
+
+ /* TODO: Store this data as reflector data */
+}
+
+static size_t get_mode_three_length(uint8_t num_antenna_paths, bool include_pct)
+{
+ return get_mode_one_length(include_pct) +
+ get_mode_two_length(num_antenna_paths);
+}
+
+static void parse_mode_three(struct bt_rap *rap, struct iovec *mode_iov,
+ enum cs_role remote_role, bool include_pct,
+ uint8_t num_antenna_paths)
+{
+ /* Mode 3 = Mode 1 + Mode 2 */
+ parse_mode_one(rap, mode_iov, remote_role, include_pct);
+
+ if (mode_iov->iov_len > 0)
+ parse_mode_two(rap, mode_iov, num_antenna_paths);
+}
+
+static bool parse_subevent_header(struct iovec *iov,
+ struct ras_subevent_header *hdr)
+{
+ uint16_t start_acl, freq_comp;
+ uint8_t done_byte, abort_byte, ref_pwr, num_steps;
+
+ if (!util_iov_pull_le16(iov, &start_acl) ||
+ !util_iov_pull_le16(iov, &freq_comp) ||
+ !util_iov_pull_u8(iov, &done_byte) ||
+ !util_iov_pull_u8(iov, &abort_byte) ||
+ !util_iov_pull_u8(iov, &ref_pwr) ||
+ !util_iov_pull_u8(iov, &num_steps))
+ return false;
+
+ hdr->start_acl_conn_event = start_acl;
+ hdr->frequency_compensation = freq_comp;
+ hdr->ranging_done_status = RAS_DONE_STATUS_UNPACK_RANGING(done_byte);
+ hdr->subevent_done_status = RAS_DONE_STATUS_UNPACK_SUBEVENT(done_byte);
+ hdr->ranging_abort_reason =
+ RAS_ABORT_REASON_UNPACK_RANGING(abort_byte);
+ hdr->subevent_abort_reason =
+ RAS_ABORT_REASON_UNPACK_SUBEVENT(abort_byte);
+ hdr->reference_power_level = (int8_t)ref_pwr;
+ hdr->num_steps_reported = num_steps;
+
+ return true;
+}
+
+static bool parse_step(struct bt_rap *rap, struct iovec *iov,
+ struct cstracker *reqtracker,
+ uint8_t num_antenna_paths, uint8_t step_idx)
+{
+ uint8_t mode_byte, step_mode;
+ bool include_pct;
+ enum cs_role remote_role;
+ size_t step_payload_len;
+ struct iovec mode_iov;
+ void *payload;
+
+ if (!util_iov_pull_u8(iov, &mode_byte)) {
+ DBG(rap, "Insufficient data for step %u", step_idx);
+ return false;
+ }
+
+ if (mode_byte & RAS_STEP_ABORTED_BIT) {
+ DBG(rap, " Step %u: mode=%u (aborted)",
+ step_idx, mode_byte & 0x03);
+ return true;
+ }
+
+ step_mode = mode_byte & 0x03;
+ include_pct = (reqtracker->rtt_type == 0x01 ||
+ reqtracker->rtt_type == 0x02);
+ remote_role = (reqtracker->role == CS_ROLE_INITIATOR) ?
+ CS_ROLE_REFLECTOR : CS_ROLE_INITIATOR;
+
+ switch (step_mode) {
+ case CS_MODE_ZERO:
+ step_payload_len = get_mode_zero_length(remote_role);
+ break;
+ case CS_MODE_ONE:
+ step_payload_len = get_mode_one_length(include_pct);
+ break;
+ case CS_MODE_TWO:
+ step_payload_len = get_mode_two_length(num_antenna_paths);
+ break;
+ case CS_MODE_THREE:
+ step_payload_len = get_mode_three_length(num_antenna_paths,
+ include_pct);
+ break;
+ default:
+ DBG(rap, " Step %u: unknown mode=%u", step_idx, step_mode);
+ return true;
+ }
+
+ DBG(rap, " Step %u: mode=%u payload_len=%zu",
+ step_idx, step_mode, step_payload_len);
+
+ payload = util_iov_pull(iov, step_payload_len);
+ if (!payload) {
+ DBG(rap, "Insufficient data for step %u payload "
+ "(need %zu, have %zu)",
+ step_idx, step_payload_len, iov->iov_len);
+ return false;
+ }
+
+ mode_iov.iov_base = payload;
+ mode_iov.iov_len = step_payload_len;
+
+ switch (step_mode) {
+ case CS_MODE_ZERO:
+ parse_mode_zero(rap, &mode_iov, remote_role);
+ break;
+ case CS_MODE_ONE:
+ parse_mode_one(rap, &mode_iov, remote_role, include_pct);
+ break;
+ case CS_MODE_TWO:
+ parse_mode_two(rap, &mode_iov, num_antenna_paths);
+ break;
+ case CS_MODE_THREE:
+ parse_mode_three(rap, &mode_iov, remote_role, include_pct,
+ num_antenna_paths);
+ break;
+ default:
+ break;
+ }
+
+ return true;
+}
+
+static void parse_subevent_steps(struct bt_rap *rap, struct iovec *iov,
+ struct cstracker *reqtracker,
+ uint8_t num_antenna_paths, uint8_t num_steps)
+{
+ uint8_t i;
+
+ for (i = 0; i < num_steps; i++) {
+ if (!parse_step(rap, iov, reqtracker, num_antenna_paths, i))
+ break;
+ }
+}
+
+static void parse_ras_data_segments(struct bt_rap *rap,
+ struct cstracker *reqtracker)
+{
+ struct iovec iov;
+ uint8_t antenna_mask;
+ uint8_t num_antenna_paths;
+
+ if (!rap || !reqtracker)
+ return;
+
+ DBG(rap, "Complete RAS data received: %zu bytes",
+ reqtracker->segment_data.iov_len);
+
+ antenna_mask =
+ ranging_header_get_antenna_mask(&reqtracker->ranging_header_);
+ num_antenna_paths = antenna_mask_count_paths(antenna_mask);
+
+ iov = reqtracker->segment_data;
+
+ while (iov.iov_len >= RAS_SUBEVENT_HEADER_SIZE) {
+ struct ras_subevent_header hdr;
+
+ if (!parse_subevent_header(&iov, &hdr))
+ break;
+
+ DBG(rap, "Parsed subevent: start_acl=%u "
+ "freq_comp=%d ref_pwr=%d steps=%u",
+ hdr.start_acl_conn_event,
+ hdr.frequency_compensation,
+ hdr.reference_power_level,
+ hdr.num_steps_reported);
+
+ parse_subevent_steps(rap, &iov, reqtracker,
+ num_antenna_paths,
+ hdr.num_steps_reported);
+
+ if (hdr.subevent_done_status ==
+ SUBEVENT_DONE_ALL_RESULTS_COMPLETE ||
+ hdr.ranging_done_status ==
+ RANGING_DONE_ALL_RESULTS_COMPLETE) {
+ DBG(rap, "Ranging procedure complete");
+ break;
+ }
+ }
+
+ free(reqtracker->segment_data.iov_base);
+ reqtracker->segment_data.iov_base = NULL;
+ reqtracker->segment_data.iov_len = 0;
+}
+
+static bool process_first_segment(struct bt_rap *rap,
+ struct cstracker *reqtracker,
+ struct iovec *iov, bool last_segment)
+{
+ uint16_t counter_config_val;
+ int8_t selected_tx_power;
+ uint8_t antenna_pct;
+
+ if (!util_iov_pull_le16(iov, &counter_config_val) ||
+ !util_iov_pull_u8(iov, (uint8_t *)&selected_tx_power) ||
+ !util_iov_pull_u8(iov, &antenna_pct)) {
+ DBG(rap, "First segment too short for ranging header");
+ return false;
+ }
+
+ ranging_header_set_counter(&reqtracker->ranging_header_,
+ counter_config_val & 0x0FFF);
+ ranging_header_set_config_id(&reqtracker->ranging_header_,
+ (counter_config_val >> 12) & 0x0F);
+ reqtracker->ranging_header_.selected_tx_power = selected_tx_power;
+ reqtracker->ranging_header_.antenna_pct = antenna_pct;
+
+ DBG(rap, "First segment: parsed ranging header "
+ "(counter=%u, config_id=%u, tx_pwr=%d)",
+ counter_config_val & 0x0FFF,
+ (counter_config_val >> 12) & 0x0F,
+ selected_tx_power);
+
+ if (reqtracker->segment_data.iov_base) {
+ free(reqtracker->segment_data.iov_base);
+ reqtracker->segment_data.iov_base = NULL;
+ reqtracker->segment_data.iov_len = 0;
+ }
+
+ if (iov->iov_len > 0) {
+ if (!util_iov_append(&reqtracker->segment_data,
+ iov->iov_base, iov->iov_len)) {
+ DBG(rap, "Failed to initialize segment accumulator");
+ return false;
+ }
+ DBG(rap, "First segment: initialized accumulator "
+ "with %zu bytes", iov->iov_len);
+ }
+
+ if (!last_segment)
+ return false;
+
+ DBG(rap, "Single-segment: first=1, last=1");
+ return true;
+}
+
+static void ras_realtime_notify_cb(struct bt_rap *rap, uint16_t value_handle,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ struct iovec iov = { .iov_base = (void *)value, .iov_len = length };
+ struct segmentation_header seg_hdr;
+ struct cstracker *reqtracker;
+
+ if (!rap || !value || length == 0) {
+ DBG(rap, "Invalid notification data");
+ return;
+ }
+
+ DBG(rap, "Received real-time notification: handle=0x%04x len=%u",
+ value_handle, length);
+
+ if (!parse_segmentation_header(&iov, &seg_hdr)) {
+ DBG(rap, "Failed to parse segmentation header");
+ return;
+ }
+
+ DBG(rap, "Segment: first=%u last=%u counter=%u",
+ seg_hdr.first_segment, seg_hdr.last_segment,
+ seg_hdr.rolling_segment_counter);
+
+ if (!rap->reqtracker) {
+ DBG(rap, "reqtracker is not initialised");
+ return;
+ }
+
+ reqtracker = rap->reqtracker;
+
+ if (seg_hdr.first_segment) {
+ if (!process_first_segment(rap, reqtracker, &iov,
+ seg_hdr.last_segment))
+ return;
+ } else {
+ if (iov.iov_len > 0) {
+ if (!util_iov_append(&reqtracker->segment_data,
+ iov.iov_base, iov.iov_len)) {
+ DBG(rap, "Failed to append segment data");
+ return;
+ }
+ DBG(rap, "Continuation segment: appended "
+ "%zu bytes (total=%zu)",
+ iov.iov_len,
+ reqtracker->segment_data.iov_len);
+ }
+ }
+
+ /* Last segment: parse complete RAS data */
+ if (seg_hdr.last_segment)
+ parse_ras_data_segments(rap, reqtracker);
+}
+
+static void read_ras_features(struct bt_rap *rap, bool success,
+ uint8_t att_ecode,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ struct iovec iov = { .iov_base = (void *)value, .iov_len = length };
+ uint32_t features = 0;
+ struct ras *ras;
+ bool supports_realtime;
+ bool retrieve_lost;
+ bool abort_operation;
+
+ if (!success) {
+ DBG(rap, "Unable to read RAS Features: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ ras = rap_get_ras(rap);
+
+ if (length == 0 || length > 4) {
+ DBG(rap, "Invalid RAS Features length: %u (expected 1-4)",
+ length);
+ return;
+ }
+
+ if (length < 4) {
+ uint8_t padded[4] = { 0 };
+
+ memcpy(padded, value, length);
+ features = get_le32(padded);
+ DBG(rap, "RAS Features: short read (%u bytes), zero-pad to 4",
+ length);
+ } else if (!util_iov_pull_le32(&iov, &features)) {
+ DBG(rap, "Unable to parse RAS Features value");
+ return;
+ }
+
+ DBG(rap, "RAS Features: 0x%08x", features);
+
+ supports_realtime = (features & 0x01) != 0;
+ retrieve_lost = (features & 0x02) != 0;
+ abort_operation = (features & 0x04) != 0;
+
+ DBG(rap, "RAS Features - Real-time: %s, Retrieve Lost: %s, Abort: %s",
+ supports_realtime ? "Yes" : "No",
+ retrieve_lost ? "Yes" : "No",
+ abort_operation ? "Yes" : "No");
+
+ DBG(rap, "RAS features read successfully, capabilities determined");
+
+ /* Register for real-time characteristic notifications if supported */
+ if (supports_realtime && ras && ras->realtime_chrc && rap->client) {
+ uint16_t value_handle;
+ bt_uuid_t uuid;
+
+ if (gatt_db_attribute_get_char_data(ras->realtime_chrc,
+ NULL, &value_handle,
+ NULL, NULL, &uuid)) {
+ unsigned int notify_id;
+
+ notify_id = bt_rap_register_notify(rap,
+ value_handle,
+ ras_realtime_notify_cb,
+ NULL);
+ if (!notify_id)
+ DBG(rap, "Failed to register for "
+ "real-time notifications");
+ else
+ DBG(rap, "Registered for real-time "
+ "features: id=%u", notify_id);
+ }
+ } else {
+ DBG(rap, "On demand ranging "
+ "remote device - skipping notification "
+ "registration");
+ }
+}
+
static void foreach_rap_char(struct gatt_db_attribute *attr, void *user_data)
{
struct bt_rap *rap = user_data;
@@ -1848,6 +2613,10 @@ static void foreach_rap_char(struct gatt_db_attribute *attr, void *user_data)
return;
ras->feat_chrc = attr;
+ if (rap->client) {
+ rap_read_value(rap, value_handle,
+ read_ras_features, rap);
+ }
}
if (!bt_uuid_cmp(&uuid, &uuid_realtime)) {
diff --git a/src/shared/rap.h b/src/shared/rap.h
index c9431aecd..d3ced61b1 100644
--- a/src/shared/rap.h
+++ b/src/shared/rap.h
@@ -92,7 +92,7 @@ struct cs_mode_zero_data {
uint8_t packet_quality;
uint8_t packet_rssi_dbm;
uint8_t packet_ant;
- uint32_t init_measured_freq_offset;
+ uint16_t init_measured_freq_offset;
};
struct cs_mode_one_data {
--
2.34.1
^ permalink raw reply related
* [bluez/bluez]
From: BluezTestBot @ 2026-06-04 8:08 UTC (permalink / raw)
To: linux-bluetooth
Branch: refs/heads/1104482
Home: https://github.com/bluez/bluez
To unsubscribe from these emails, change your notification settings at https://github.com/bluez/bluez/settings/notifications
^ permalink raw reply
* [bluez/bluez] f3482a: shared/bap: add ASE Control Point error responses
From: raghava447 @ 2026-06-04 8:08 UTC (permalink / raw)
To: linux-bluetooth
Branch: refs/heads/1105699
Home: https://github.com/bluez/bluez
Commit: f3482a8657f0c3abd08dbaa5abcce6ae83c2e009
https://github.com/bluez/bluez/commit/f3482a8657f0c3abd08dbaa5abcce6ae83c2e009
Author: raghavendra <raghavendra.rao@collabora.com>
Date: 2026-06-04 (Thu, 04 Jun 2026)
Changed paths:
M src/shared/bap.c
M unit/test-bap.c
Log Message:
-----------
shared/bap: add ASE Control Point error responses
Add SPE unit tests.
These changes are required to Pass BAP/USR/SPE/BI-01[5]-C tests.
To unsubscribe from these emails, change your notification settings at https://github.com/bluez/bluez/settings/notifications
^ permalink raw reply
* Re: [Patch] support libical 4.0
From: Bastien Nocera @ 2026-06-04 8:01 UTC (permalink / raw)
To: Funda Wang, linux-bluetooth
In-Reply-To: <99b4c20de30a2991509b78db7751bd78044ad83d.camel@hadess.net>
On Mon, 2026-05-11 at 09:44 +0200, Bastien Nocera wrote:
> On Mon, 2026-05-11 at 13:58 +0800, Funda Wang wrote:
> > Hello,
> >
> > Since libical 4.0 [1], pkgconfig files of libical have been
> > splitted
> > into several files according to libraries. The libical pkgconfig
> > check need to be tweaked to check libicalvcal. Patch attached.
>
> That breaks libical < 4.0, which is still the current version on most
> stable distributions.
I read the patch incorrectly, and it doe work with older versions of
libical.
>
> And please follow the instructions at:
> https://github.com/bluez/bluez/blob/master/HACKING#L98
> for how to send patches.
I've re-sent the patch in the proper format so it can be included in
the upcoming release.
>
> Regards
>
> >
> > Thanks.
> >
> > [1]: https://github.com/libical/libical/pull/988
^ permalink raw reply
* Re: [PATCH v3 RESEND 3/5] Bluetooth: btusb: fix wakeup source leak on probe failure
From: Johan Hovold @ 2026-06-04 6:41 UTC (permalink / raw)
To: Luiz Augusto von Dentz
Cc: Marcel Holtmann, linux-bluetooth, linux-kernel, stable,
Rajat Jain
In-Reply-To: <CABBYNZLr+kLHkjRGOEgyVK7RSfvu0KGjJNrnp5mh-sM66i=5WQ@mail.gmail.com>
On Wed, Jun 03, 2026 at 02:06:08PM -0400, Luiz Augusto von Dentz wrote:
> On Wed, Jun 3, 2026 at 10:37 AM Johan Hovold <johan@kernel.org> wrote:
> > @@ -4181,7 +4181,7 @@ static int btusb_probe(struct usb_interface *intf,
> > if (id->driver_info & BTUSB_MARVELL && data->oob_wake_irq) {
> > err = marvell_config_oob_wake(hdev);
> > if (err)
> > - goto out_free_dev;
> > + goto err_disable_wakeup;
> > }
> > #endif
> > if (id->driver_info & BTUSB_CW6622)
> > @@ -4427,6 +4427,9 @@ static int btusb_probe(struct usb_interface *intf,
> > }
> > err_kill_tx_urbs:
> > usb_kill_anchored_urbs(&data->tx_anchor);
> > +err_disable_wakeup:
> > + if (data->oob_wake_irq)
> > + device_init_wakeup(&data->udev->dev, false);
> > out_free_dev:
> > if (data->reset_gpio)
> > gpiod_put(data->reset_gpio);
> > --
> > 2.53.0
>
> This seem to trigger a compilation problem according to sashiko:
>
> The goto statement targeting err_disable_wakeup is wrapped in an ifdef
> CONFIG_PM block earlier in the function, but this label is defined
> unconditionally here.
> []https://sashiko.dev/#/patchset/20260603143643.2514595-1-johan%40kernel.org
Indeed. Sorry about that. I just sent a v4 addressing this here:
https://lore.kernel.org/lkml/20260604063740.2595260-1-johan@kernel.org/
Johan
^ permalink raw reply
* [PATCH v4 1/5] Bluetooth: btusb: fix use-after-free on registration failure
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold, stable, Paul Menzel
In-Reply-To: <20260604063740.2595260-1-johan@kernel.org>
Make sure to release the sibling interfaces in case controller
registration fails to avoid use-after-free and double-free when they are
eventually disconnected.
This issue was reported by Sashiko while reviewing a fix for a wakeup
source leak in the btusb probe errors paths.
Link: https://sashiko.dev/#/patchset/20260402092704.2346710-1-johan%40kernel.org
Fixes: 9bfa35fe422c ("[Bluetooth] Add SCO support to btusb driver")
Fixes: 9d08f50401ac ("Bluetooth: btusb: Add support for Broadcom LM_DIAG interface")
Cc: stable@vger.kernel.org # 2.6.27
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/bluetooth/btusb.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 830fefb342c6..c8015cee240f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4407,7 +4407,7 @@ static int btusb_probe(struct usb_interface *intf,
err = hci_register_dev(hdev);
if (err < 0)
- goto out_free_dev;
+ goto err_release_siblings;
usb_set_intfdata(intf, data);
@@ -4416,6 +4416,15 @@ static int btusb_probe(struct usb_interface *intf,
return 0;
+err_release_siblings:
+ if (data->diag) {
+ usb_set_intfdata(data->diag, NULL);
+ usb_driver_release_interface(&btusb_driver, data->diag);
+ }
+ if (data->isoc) {
+ usb_set_intfdata(data->isoc, NULL);
+ usb_driver_release_interface(&btusb_driver, data->isoc);
+ }
out_free_dev:
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
--
2.53.0
^ permalink raw reply related
* [PATCH v4 2/5] Bluetooth: btusb: fix use-after-free on marvell probe failure
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold, stable, Rajat Jain
In-Reply-To: <20260604063740.2595260-1-johan@kernel.org>
Make sure to stop any TX URBs submitted during Marvell OOB wakeup
configuration on later probe failures to avoid use-after-free in the
completion callback.
This issue was reported by Sashiko while reviewing a fix for a wakeup
source leak in the btusb probe errors paths.
Link: https://sashiko.dev/#/patchset/20260402092704.2346710-1-johan%40kernel.org
Fixes: a4ccc9e33d2f ("Bluetooth: btusb: Configure Marvell to use one of the pins for oob wakeup")
Cc: stable@vger.kernel.org # 4.11
Cc: Rajat Jain <rajatja@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/bluetooth/btusb.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index c8015cee240f..d0a83a1ffdf2 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4218,7 +4218,7 @@ static int btusb_probe(struct usb_interface *intf,
if (id->driver_info & BTUSB_INTEL_COMBINED) {
err = btintel_configure_setup(hdev, btusb_driver.name);
if (err)
- goto out_free_dev;
+ goto err_kill_tx_urbs;
/* Transport specific configuration */
hdev->send = btusb_send_frame_intel;
@@ -4381,7 +4381,7 @@ static int btusb_probe(struct usb_interface *intf,
err = usb_set_interface(data->udev, 0, 0);
if (err < 0) {
BT_ERR("failed to set interface 0, alt 0 %d", err);
- goto out_free_dev;
+ goto err_kill_tx_urbs;
}
}
@@ -4389,7 +4389,7 @@ static int btusb_probe(struct usb_interface *intf,
err = usb_driver_claim_interface(&btusb_driver,
data->isoc, data);
if (err < 0)
- goto out_free_dev;
+ goto err_kill_tx_urbs;
}
if (IS_ENABLED(CONFIG_BT_HCIBTUSB_BCM) && data->diag) {
@@ -4425,6 +4425,8 @@ static int btusb_probe(struct usb_interface *intf,
usb_set_intfdata(data->isoc, NULL);
usb_driver_release_interface(&btusb_driver, data->isoc);
}
+err_kill_tx_urbs:
+ usb_kill_anchored_urbs(&data->tx_anchor);
out_free_dev:
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
--
2.53.0
^ permalink raw reply related
* [PATCH v4 3/5] Bluetooth: btusb: fix wakeup source leak on probe failure
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold, stable, Rajat Jain
In-Reply-To: <20260604063740.2595260-1-johan@kernel.org>
Make sure to disable wakeup on probe failure to avoid leaking the wakeup
source.
Fixes: fd913ef7ce61 ("Bluetooth: btusb: Add out-of-band wakeup support")
Cc: stable@vger.kernel.org # 4.11
Cc: Rajat Jain <rajatja@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/bluetooth/btusb.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index d0a83a1ffdf2..3e8c90486e4c 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2994,6 +2994,11 @@ static int marvell_config_oob_wake(struct hci_dev *hdev)
return 0;
}
+#else
+static inline int marvell_config_oob_wake(struct hci_dev *hdev)
+{
+ return 0;
+}
#endif
static int btusb_set_bdaddr_marvell(struct hci_dev *hdev,
@@ -3836,6 +3841,11 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)
bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq);
return 0;
}
+#else
+static inline int btusb_config_oob_wake(struct hci_dev *hdev)
+{
+ return 0;
+}
#endif
static void btusb_check_needs_reset_resume(struct usb_interface *intf)
@@ -4172,7 +4182,6 @@ static int btusb_probe(struct usb_interface *intf,
hdev->wakeup = btusb_wakeup;
hdev->hci_drv = &btusb_hci_drv;
-#ifdef CONFIG_PM
err = btusb_config_oob_wake(hdev);
if (err)
goto out_free_dev;
@@ -4181,9 +4190,9 @@ static int btusb_probe(struct usb_interface *intf,
if (id->driver_info & BTUSB_MARVELL && data->oob_wake_irq) {
err = marvell_config_oob_wake(hdev);
if (err)
- goto out_free_dev;
+ goto err_disable_wakeup;
}
-#endif
+
if (id->driver_info & BTUSB_CW6622)
hci_set_quirk(hdev, HCI_QUIRK_BROKEN_STORED_LINK_KEY);
@@ -4427,6 +4436,9 @@ static int btusb_probe(struct usb_interface *intf,
}
err_kill_tx_urbs:
usb_kill_anchored_urbs(&data->tx_anchor);
+err_disable_wakeup:
+ if (data->oob_wake_irq)
+ device_init_wakeup(&data->udev->dev, false);
out_free_dev:
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
--
2.53.0
^ permalink raw reply related
* [PATCH v4 5/5] Bluetooth: btusb: clean up probe error handling
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold
In-Reply-To: <20260604063740.2595260-1-johan@kernel.org>
Clean up probe error handling by using dedicated error labels with an
"err" prefix.
Note that the endpoint lookup helper returns -ENXIO when endpoints are
missing which is functionally equivalent to returning -ENODEV.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/bluetooth/btusb.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 9d2e5a8dcf85..b91966ec914f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4100,10 +4100,8 @@ static int btusb_probe(struct usb_interface *intf,
err = usb_find_common_endpoints(intf->cur_altsetting, &data->bulk_rx_ep,
&data->bulk_tx_ep, &data->intr_ep, NULL);
- if (err) {
- kfree(data);
- return -ENODEV;
- }
+ if (err)
+ goto err_free_data;
if (id->driver_info & BTUSB_AMP) {
data->cmdreq_type = USB_TYPE_CLASS | 0x01;
@@ -4159,8 +4157,8 @@ static int btusb_probe(struct usb_interface *intf,
hdev = hci_alloc_dev_priv(priv_size);
if (!hdev) {
- kfree(data);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_free_data;
}
hdev->bus = HCI_USB;
@@ -4174,7 +4172,7 @@ static int btusb_probe(struct usb_interface *intf,
GPIOD_OUT_LOW);
if (IS_ERR(reset_gpio)) {
err = PTR_ERR(reset_gpio);
- goto out_free_dev;
+ goto err_free_hdev;
} else if (reset_gpio) {
data->reset_gpio = reset_gpio;
}
@@ -4189,7 +4187,7 @@ static int btusb_probe(struct usb_interface *intf,
err = btusb_config_oob_wake(hdev);
if (err)
- goto out_free_dev;
+ goto err_put_reset;
/* Marvell devices may need a specific chip configuration */
if (id->driver_info & BTUSB_MARVELL && data->oob_wake_irq) {
@@ -4446,11 +4444,14 @@ static int btusb_probe(struct usb_interface *intf,
device_init_wakeup(&data->udev->dev, false);
free_irq(data->oob_wake_irq, data);
}
-out_free_dev:
+err_put_reset:
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
+err_free_hdev:
hci_free_dev(hdev);
+err_free_data:
kfree(data);
+
return err;
}
--
2.53.0
^ permalink raw reply related
* [PATCH v4 4/5] Bluetooth: btusb: fix wakeup irq devres lifetime
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold, Rajat Jain
In-Reply-To: <20260604063740.2595260-1-johan@kernel.org>
The OOB wakeup interrupt is device managed but its lifetime is
incorrectly tied to the child HCI device rather than the USB interface
to which the driver is bound.
This should not cause any trouble currently as the interrupt will be
disabled when the HCI device is deregistered on disconnect (but this was
not always the case, see [1]), and there should be no further references
if probe fails before registering it. But it is still technically wrong
as the reference counted HCI device could in theory remain after a probe
failure.
Explicitly free the interrupt on disconnect so that it is guaranteed to
be disabled before freeing the (non-managed) driver data (including if
disconnected while suspended).
[1] 699fb50d9903 ("drivers: base: Free devm resources when unregistering
a device")
Fixes: fd913ef7ce61 ("Bluetooth: btusb: Add out-of-band wakeup support")
Cc: Rajat Jain <rajatja@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/bluetooth/btusb.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 3e8c90486e4c..9d2e5a8dcf85 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3824,8 +3824,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)
}
irq_set_status_flags(irq, IRQ_NOAUTOEN);
- ret = devm_request_irq(&hdev->dev, irq, btusb_oob_wake_handler,
- 0, "OOB Wake-on-BT", data);
+ ret = request_irq(irq, btusb_oob_wake_handler, 0, "OOB Wake-on-BT", data);
if (ret) {
bt_dev_err(hdev, "%s: IRQ request failed", __func__);
return ret;
@@ -3834,12 +3833,18 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)
ret = device_init_wakeup(dev, true);
if (ret) {
bt_dev_err(hdev, "%s: failed to init_wakeup", __func__);
- return ret;
+ goto err_free_irq;
}
data->oob_wake_irq = irq;
bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq);
+
return 0;
+
+err_free_irq:
+ free_irq(irq, data);
+
+ return ret;
}
#else
static inline int btusb_config_oob_wake(struct hci_dev *hdev)
@@ -4437,8 +4442,10 @@ static int btusb_probe(struct usb_interface *intf,
err_kill_tx_urbs:
usb_kill_anchored_urbs(&data->tx_anchor);
err_disable_wakeup:
- if (data->oob_wake_irq)
+ if (data->oob_wake_irq) {
device_init_wakeup(&data->udev->dev, false);
+ free_irq(data->oob_wake_irq, data);
+ }
out_free_dev:
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
@@ -4471,8 +4478,11 @@ static void btusb_disconnect(struct usb_interface *intf)
hci_unregister_dev(hdev);
- if (data->oob_wake_irq)
+ if (data->oob_wake_irq) {
device_init_wakeup(&data->udev->dev, false);
+ free_irq(data->oob_wake_irq, data);
+ }
+
if (data->reset_gpio)
gpiod_put(data->reset_gpio);
--
2.53.0
^ permalink raw reply related
* [PATCH v4 0/5] Bluetooth: btusb: fix wakeup irq devres lifetime
From: Johan Hovold @ 2026-06-04 6:37 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann
Cc: linux-bluetooth, linux-kernel, Johan Hovold
This series fixes a couple of use-after-free issues and a wakeup source
leak on probe failure and a (currently benign) OOB wakeup interrupt
devres lifetime issue.
Included is also a related cleanup.
Johan
Changes in v4:
- fix unused label warning with !CONFIG_PM
Changes in v3:
- fix use-after-free on registration failure (new patch)
- fix use-after-free on marvell probe failure (new patch)
Changes in v2:
- fix wakeup source leak (new patch)
- fix disconnect-while-suspended issue by making interrupt non-managed
- amend devres lifetime fix commit message with a reference to changed
devres behaviour
- clean up error handling (new patch)
Johan Hovold (5):
Bluetooth: btusb: fix use-after-free on registration failure
Bluetooth: btusb: fix use-after-free on marvell probe failure
Bluetooth: btusb: fix wakeup source leak on probe failure
Bluetooth: btusb: fix wakeup irq devres lifetime
Bluetooth: btusb: clean up probe error handling
drivers/bluetooth/btusb.c | 74 ++++++++++++++++++++++++++++-----------
1 file changed, 54 insertions(+), 20 deletions(-)
--
2.53.0
^ permalink raw reply
* Re: [PATCH] Bluetooth: btmtk: Fix MT7925 WMT command timeout due to sleep protection
From: Chris Lu (陸稚泓) @ 2026-06-04 6:28 UTC (permalink / raw)
To: messinadm@gmail.com
Cc: luiz.dentz@gmail.com, SS Wu (巫憲欣),
marcel@holtmann.org, linux-bluetooth@vger.kernel.org,
Peter Tsao (曹珆彰)
In-Reply-To: <CAJAa45h7RC7c2yeF+Z2-VHNcfLOwjM0a0kOZOfOfdMfH9GTF9A@mail.gmail.com>
Hi Danny,
Thanks for your explanation.
I'll check with Peter internally regarding the purpose of the
change "Bluetooth: btusb: Fix MT7925 fail to send download patch
command" at that time and why it wasn't followed up afterward and also
evaluate whether to resubmit the patch.
On Wed, 2026-06-03 at 08:27 -0400, Danny Messina wrote:
>
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>
>
> Hi Chris,
>
> Thanks for the background, very helpful.
>
> On register identification: I used usbmon to confirm WMT commands
> were
> physically reaching the device with Control OUT completing
> successfully, but the device returned zero bytes on every control IN
> poll for the full 10-second timeout. After reading through btmtk.c
> and
> adding printks to trace the exact failure point, I found a December
> 2023 patch submission by Peter Tsao titled "Bluetooth: btusb: Fix
> MT7925 fail to send download patch command" which referenced writing
> to register 0x18011100 to prevent the device entering sleep state
> during firmware download. Testing confirmed this resolved the WMT
> timeout on my hardware. The second bypass before FUNC_CTRL was
> discovered when firmware download succeeded but FUNC_CTRL
> subsequently
> timed out, indicating the chip re-enables sleep protection during the
> 100ms firmware activation delay.
>
> On the subsystem reset: I was not aware of commit 33634e2ab. In my
> testing the reset was necessary to recover from repeated failed
> initialization attempts, as rmmod/modprobe without a cold power cycle
> left the chip unresponsive to the SLPPROT bypass alone. I defer to
> your judgment on whether it belongs here.
>
> On your v7.1-rc fix: This was reproduced on a fresh install of
> Pop!_OS
> 24.04 running kernel 6.18.7. I don't have a v7 kernel available at
> the
> moment but will see if I can reproduce the issue there and report
> back.
>
> Happy to provide any additional debugging output in the meantime.
>
> Best regards,
> Danny Messina
>
>
> On Wed, Jun 3, 2026 at 4:37 AM Chris Lu (陸稚泓) <Chris.Lu@mediatek.com>
> wrote:
> >
> > Add linux-bluetooth to maillist
> >
> > > From: Chris Lu (陸稚泓) <Chris.Lu@mediatek.com>
> > > Sent: Wednesday, June 3, 2026 3:50 PM
> > > To: messinadm@gmail.com
> > > Cc: luiz.dentz@gmail.com; SS Wu (巫憲欣) <ss.wu@mediatek.com>;
> > > marcel@holtmann.org; Peter Tsao (曹珆彰) <Peter.Tsao@mediatek.com>
> > > Subject: Re: [PATCH] Bluetooth: btmtk: Fix MT7925 WMT command
> > > timeout
> > > due to sleep protection
> > >
> > > Hi Danny,
> > >
> > > Thanks for your submission. I have some question about this
> > > patch.
> > >
> > > > -----Original Message-----
> > > > From: Danny Messina <messinadm@gmail.com>
> > > > Sent: Monday, June 1, 2026 2:07 AM
> > > > To: linux-bluetooth@vger.kernel.org
> > > > Cc: Peter Tsao (曹珆彰) <Peter.Tsao@mediatek.com>;
> > > > marcel@holtmann.org;
> > > > Luiz Augusto von Dentz <luiz.dentz@gmail.com>
> > > > Subject: [PATCH] Bluetooth: btmtk: Fix MT7925 WMT command
> > > > timeout
> > > > due
> > > > to sleep protection
> > > >
> > > >
> > > > External email : Please do not click links or open attachments
> > > > until
> > > > you have verified the sender or the content.
> > > >
> > > > The MediaTek MT7925 USB Bluetooth device (0e8d:0717) fails to
> > > > initialize
> > > > with repeated "Execution of wmt command timed out" errors:
> > > >
> > > > Bluetooth: hci0: Execution of wmt command timed out
> > > > Bluetooth: hci0: Failed to send wmt patch dwnld (-110)
> > > > Bluetooth: hci0: Failed to set up firmware (-110)
> > > >
> > > > USB capture (usbmon) confirms WMT commands reach the device —
> > > > the
> > > > Control OUT transfer completes with status 0 — but the device
> > > > never
> > > > responds on any endpoint. The control IN polling URB returns
> > > > zero
> > > > bytes
> > > > indefinitely until HCI_INIT_TIMEOUT expires.
> > > >
> > > > The root cause is the MT7925 BT core's sleep protection
> > > > register
> > > > (0x18011100, bit 1 = SLPPROT_BYPASS). When SLPPROT is active
> > > > the
> > > > BT
> > > > processor ignores incoming WMT commands.
> > > >
> > > > Two additional issues compound this:
> > > >
> > > > 1. After repeated driver load/unload cycles without a
> > > > hardware
> > > > reset,
> > > > the BT subsystem's WMT state machine becomes stuck. A
> > > > subsystem
> > > > reset via btmtk_usb_subsys_reset() restores it to a
> > > > workable
> > > > state.
> > > >
> > > > 2. After btmtk_setup_firmware_79xx() activates the downloaded
> > > > firmware
> > > > (which ends with a 100ms activation delay), the chip re-
> > > > enables
> > > > SLPPROT. The subsequent FUNC_CTRL WMT command therefore
> > > > also
> > > > times
> > > > out unless SLPPROT is bypassed again.
> > > >
> > > > Fix this for dev_id 0x7925 in btmtk_usb_setup():
> > > > 1. Call btmtk_usb_subsys_reset() to clear any stuck WMT
> > > > state.
> > > > 2. Set 0x18011100 |= BIT(1) before firmware download.
> > > > 3. Set 0x18011100 |= BIT(1) again before FUNC_CTRL.
> > > >
> > >
> > > Could you share how you identified which register/value need to
> > > be
> > > modified on MT7925 with such situation and why performed reset at
> > > this specific point helps avoid the setup issue?
> > >
> > > > Tested on a System76 Thelio desktop with MT7925 PCIe combo
> > > > card,
> > > > USB ID 0e8d:0717, kernel 6.18.7.
> > > >
> > > > Signed-off-by: Danny Messina <messinadm@gmail.com>
> > > > ---
> > > > drivers/bluetooth/btmtk.c | 33
> > > > +++++++++++++++++++++++++++++++++
> > > > 1 file changed, 33 insertions(+)
> > > >
> > > > diff --git a/drivers/bluetooth/btmtk.c
> > > > b/drivers/bluetooth/btmtk.c
> > > > --- a/drivers/bluetooth/btmtk.c
> > > > +++ b/drivers/bluetooth/btmtk.c
> > > > @@ -1326,6 +1326,24 @@
> > > > case 0x7922:
> > > > case 0x7925:
> > > > case 0x7961:
> > > > + if (dev_id == 0x7925) {
> > > > + u32 val = 0;
> > > > +
> > > > + /* Reset BT subsystem to clear any
> > > > stuck
> > > > WMT
> > > > state */
> > > > + err = btmtk_usb_subsys_reset(hdev,
> > > > dev_id);
> > > > + if (err < 0)
> > > > + bt_dev_warn(hdev, "BT subsys
> > > > reset
> > > > failed (%d), continuing", err);
> > > > +
> > > > + /* Bypass sleep protection so WMT
> > > > commands
> > > > reach the BT core */
> > > > + err = btmtk_usb_uhw_reg_read(hdev,
> > > > 0x18011100,
> > > > &val);
> > > > + if (err < 0)
> > > > + return err;
> > > > + val |= BIT(1);
> > > > + err = btmtk_usb_uhw_reg_write(hdev,
> > > > 0x18011100, val);
> > > > + if (err < 0)
> > > > + return err;
> > > > + }
> > > > +
> > > > btmtk_fw_get_filename(fw_bin_name,
> > > > sizeof(fw_bin_name), dev_id,
> > > > fw_version, fw_flavor);
> > > >
> > > > @@ -1342,6 +1360,19 @@
> > > > if (err < 0)
> > > > return err;
> > > >
> > > > + /* Re-bypass sleep protection after firmware
> > > > activation for MT7925 */
> > > > + if (dev_id == 0x7925) {
> > > > + u32 val = 0;
> > > > +
> > > > + err = btmtk_usb_uhw_reg_read(hdev,
> > > > 0x18011100,
> > > > &val);
> > > > + if (err < 0)
> > > > + return err;
> > > > + val |= BIT(1);
> > > > + err = btmtk_usb_uhw_reg_write(hdev,
> > > > 0x18011100, val);
> > > > + if (err < 0)
> > > > + return err;
> > > > + }
> > > > +
> > > > /* Enable Bluetooth protocol */
> > > > param = 1;
> > > > wmt_params.op = BTMTK_WMT_FUNC_CTRL;
> > >
> > > I'd also like to share some relevant background on this change:
> > >
> > > MediaTek Bluetooth team previously implemented a similar reset
> > > before
> > > firmware download to ensure the controller was always in an
> > > initial
> > > state. However, it was later reported by kernel community that
> > > this
> > > caused USB enumeration failures on other devices, so the change
> > > was
> > > reverted (commit 33634e2ab "Bluetooth: btmtk: Remove the
> > > resetting
> > > step before downloading the fw").
> > >
> > > In April this year, I submitted a fix addressing setup failures
> > > on
> > > MediaTek Bluetooth devices, which has been included since kernel
> > > v7.1- rc. Could you try reproducing the issue with a recent
> > > kernel to
> > > see whether the problem still occurs?
> > >
> > > Looking forward to your feedback.
> > >
> > > Best regards,
> > > Chris Lu
> >
> >
> > *********** MEDIATEK Confidentiality Notice ***********
> > The information contained in this e-mail message (including any
> > attachments) may be confidential, proprietary, privileged, or
> > otherwise exempt from disclosure under applicable laws. It is
> > intended to be conveyed only to the designated recipient(s). Any
> > use, dissemination, distribution, printing, retaining or copying
> > of this e-mail (including its attachments) by unintended
> > recipient(s)
> > is strictly prohibited and may be unlawful. If you are not an
> > intended recipient of this e-mail, or believe that you have
> > received
> > this e-mail in error, please notify the sender immediately
> > (by replying to this e-mail), delete any and all copies of this
> > e-mail (including any attachments) from your system, and do not
> > disclose the content of this e-mail to any other person. Thank you!
Chris Lu
^ permalink raw reply
* RE: [v2] Bluetooth: Add SPDX id lines to some source files
From: bluez.test.bot @ 2026-06-04 5:48 UTC (permalink / raw)
To: linux-bluetooth, Tim.Bird
In-Reply-To: <20260604004125.715884-1-tim.bird@sony.com>
[-- Attachment #1: Type: text/plain, Size: 2473 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1105609
---Test result---
Test Summary:
CheckPatch PASS 11.11 seconds
VerifyFixes PASS 0.12 seconds
VerifySignedoff PASS 0.12 seconds
GitLint PASS 0.29 seconds
SubjectPrefix PASS 0.16 seconds
BuildKernel PASS 24.21 seconds
CheckAllWarning PASS 26.43 seconds
CheckSparse PASS 25.14 seconds
BuildKernel32 PASS 23.25 seconds
TestRunnerSetup PASS 521.43 seconds
TestRunner_l2cap-tester FAIL 60.35 seconds
TestRunner_iso-tester PASS 82.36 seconds
TestRunner_bnep-tester PASS 18.66 seconds
TestRunner_mgmt-tester FAIL 212.20 seconds
TestRunner_rfcomm-tester PASS 25.41 seconds
TestRunner_sco-tester PASS 32.36 seconds
TestRunner_ioctl-tester PASS 25.64 seconds
TestRunner_mesh-tester FAIL 24.88 seconds
TestRunner_smp-tester PASS 23.19 seconds
TestRunner_userchan-tester PASS 19.58 seconds
TestRunner_6lowpan-tester PASS 22.48 seconds
IncrementalBuild PASS 22.52 seconds
Details
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:
Total: 96, Passed: 95 (99.0%), Failed: 1, Not Run: 0
Failed Test Cases
L2CAP BR/EDR Server - Set PHY 3M Failed 0.277 seconds
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.243 seconds
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner
Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 1.857 seconds
Mesh - Send cancel - 2 Timed out 1.989 seconds
https://github.com/bluez/bluetooth-next/pull/285
---
Regards,
Linux Bluetooth
^ permalink raw reply
* [BlueZ PATCH v2 1/1] shared/bap: add ASE Control Point error responses
From: raghu447 @ 2026-06-04 5:20 UTC (permalink / raw)
To: linux-bluetooth; +Cc: raghavendra
In-Reply-To: <20260604052052.10667-1-raghavendra.rao@collabora.com>
From: raghavendra <raghavendra.rao@collabora.com>
Add SPE unit tests.
These changes are required to Pass BAP/USR/SPE/BI-01[5]-C tests.
---
src/shared/bap.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++--
unit/test-bap.c | 64 ++++++++++++++++++++++++++++++++++
2 files changed, 152 insertions(+), 2 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 8fc2fb14d..edb84efca 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -57,6 +57,11 @@
(1<<BAP_DURATION_LTV_TYPE)|\
(1<<BAP_FRAME_LEN_LTV_TYPE))
+#define BAP_METADATA_PREF_CONTEXT_LTV_TYPE 0x01
+#define BAP_METADATA_CONTEXT_LTV_TYPE 0x02
+#define BAP_METADATA_PROGRAM_INFO_LTV_TYPE 0x03
+#define BAP_METADATA_LANGUAGE_LTV_TYPE 0x04
+
struct bt_bap_pac_changed {
unsigned int id;
bt_bap_pac_func_t added;
@@ -3304,6 +3309,40 @@ static uint8_t stream_enable(struct bt_bap_stream *stream, struct iovec *meta,
return 0;
}
+static bool ascs_metadata_rsp(struct bt_bap_endpoint *ep, struct iovec *meta,
+ struct iovec *rsp)
+{
+ struct bt_ltv *ltv;
+ uint16_t supported_context = 0;
+ uint16_t context;
+
+ if (ep->stream && ep->stream->lpac)
+ supported_context = ep->stream->lpac->qos.supported_context;
+
+ ltv = meta->iov_base;
+ if (meta->iov_len >= sizeof(*ltv) &&
+ (ltv->type < BAP_METADATA_PREF_CONTEXT_LTV_TYPE ||
+ ltv->type > BAP_METADATA_LANGUAGE_LTV_TYPE)) {
+ ascs_ase_rsp_add(rsp, ep->id,
+ BT_ASCS_RSP_METADATA_UNSUPPORTED, ltv->type);
+ return true;
+ }
+
+ if (meta->iov_len >= sizeof(*ltv) + sizeof(context) &&
+ ltv->type == BAP_METADATA_CONTEXT_LTV_TYPE &&
+ ltv->len == sizeof(context) + 1) {
+ context = get_le16(ltv->value);
+ if (!context || (context & ~supported_context)) {
+ ascs_ase_rsp_add(rsp, ep->id,
+ BT_ASCS_RSP_METADATA_INVALID,
+ ltv->type);
+ return true;
+ }
+ }
+
+ return false;
+}
+
static uint8_t ep_enable(struct bt_bap_endpoint *ep, struct bt_bap *bap,
struct bt_ascs_enable *req, struct iovec *iov,
struct iovec *rsp)
@@ -3335,6 +3374,9 @@ static uint8_t ep_enable(struct bt_bap_endpoint *ep, struct bt_bap *bap,
return 0;
}
+ if (ascs_metadata_rsp(ep, &meta, rsp))
+ return 0;
+
if (!ep->stream) {
DBG(bap, "No stream found");
ascs_ase_rsp_add(rsp, ep->id,
@@ -3568,6 +3610,9 @@ static uint8_t ep_metadata(struct bt_bap_endpoint *ep,
meta.iov_base = util_iov_pull_mem(iov, req->len);
meta.iov_len = req->len;
+ if (ascs_metadata_rsp(ep, &meta, rsp))
+ return 0;
+
return stream_metadata(ep->stream, &meta, rsp);
}
@@ -3673,6 +3718,23 @@ static struct iovec *ascs_ase_cp_rsp_new(uint8_t op)
return iov;
}
+static void ascs_ase_cp_rsp_add_truncated(struct iovec *rsp)
+{
+ ascs_ase_rsp_add_errno(rsp, 0x00, -ENOMSG);
+}
+
+static bool ascs_ase_cp_rsp_invalid_len(uint8_t op, size_t len, uint8_t num)
+{
+ switch (op) {
+ case BT_ASCS_METADATA:
+ return len == num;
+ case BT_ASCS_RELEASE:
+ return true;
+ default:
+ return false;
+ }
+}
+
static void ascs_ase_cp_write(struct gatt_db_attribute *attrib,
unsigned int id, uint16_t offset,
const uint8_t *value, size_t len,
@@ -3697,7 +3759,7 @@ static void ascs_ase_cp_write(struct gatt_db_attribute *attrib,
return;
}
- if (len < sizeof(*hdr)) {
+ if (!len) {
DBG(bap, "invalid len %u < %u sizeof(*hdr)", len,
sizeof(*hdr));
gatt_db_attribute_write_result(attrib, id,
@@ -3705,9 +3767,26 @@ static void ascs_ase_cp_write(struct gatt_db_attribute *attrib,
return;
}
+ if (len < sizeof(*hdr)) {
+ DBG(bap, "invalid len %u < %u sizeof(*hdr)", len,
+ sizeof(*hdr));
+
+ rsp = ascs_ase_cp_rsp_new(value[0]);
+ ascs_ase_cp_rsp_add_truncated(rsp);
+ ret = 0;
+ goto respond;
+ }
+
hdr = util_iov_pull_mem(&iov, sizeof(*hdr));
rsp = ascs_ase_cp_rsp_new(hdr->op);
+ if (!hdr->num) {
+ DBG(bap, "invalid Number_of_ASEs 0");
+ ascs_ase_cp_rsp_add_truncated(rsp);
+ ret = 0;
+ goto respond;
+ }
+
for (handler = handlers; handler && handler->str; handler++) {
if (handler->op != hdr->op)
continue;
@@ -3716,7 +3795,14 @@ static void ascs_ase_cp_write(struct gatt_db_attribute *attrib,
DBG(bap, "invalid len %u < %u "
"hdr->num * handler->size", len,
hdr->num * handler->size);
- ret = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+
+ if (ascs_ase_cp_rsp_invalid_len(hdr->op, iov.iov_len,
+ hdr->num)) {
+ ascs_ase_cp_rsp_add_truncated(rsp);
+ ret = 0;
+ } else
+ ret = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+
goto respond;
}
diff --git a/unit/test-bap.c b/unit/test-bap.c
index 3a67e7016..e43d1d2ef 100644
--- a/unit/test-bap.c
+++ b/unit/test-bap.c
@@ -4349,6 +4349,69 @@ static void test_scc_metadata(void)
test_usr_scc_metadata();
}
+#define ASE_CP_RSP(_op, _ase, _code, _reason) \
+ IOV_DATA(0x1b, CP_HND, _op, 0x01, _ase, _code, _reason)
+
+#define ASE_CP_RSP_TRUNCATED(_op) \
+ IOV_DATA(0x1b, CP_HND, _op, 0xff, 0x00, 0x02, 0x00)
+
+#define SPE_CP_TRUNCATED(_op) \
+ IOV_DATA(0x52, CP_HND, _op), \
+ ASE_CP_RSP_TRUNCATED(_op)
+
+#define SPE_CP_ZERO_ASES(_op) \
+ IOV_DATA(0x52, CP_HND, _op, 0x00), \
+ ASE_CP_RSP_TRUNCATED(_op)
+
+#define SPE_METADATA_TRUNCATED(_ase) \
+ IOV_DATA(0x52, CP_HND, 0x07, 0x01, _ase), \
+ ASE_CP_RSP_TRUNCATED(0x07)
+
+#define SPE_METADATA_UNSUPPORTED(_ase) \
+ SCC_SRC_ENABLE, \
+ IOV_DATA(0x52, CP_HND, 0x07, 0x01, _ase, 0x02, 0x01, 0xfc), \
+ ASE_CP_RSP(0x07, _ase, 0x0a, 0xfc)
+
+#define SPE_METADATA_INVALID_CONTEXT(_ase) \
+ SCC_SRC_ENABLE, \
+ IOV_DATA(0x52, CP_HND, 0x07, 0x01, _ase, 0x04, 0x03, 0x02, \
+ 0x00, 0x10), \
+ ASE_CP_RSP(0x07, _ase, 0x0c, 0x02)
+
+/* Unicast Server Rejects Invalid ASE Control Point Procedures
+ *
+ * Test Purpose:
+ * Verify the behavior of a Unicast Server IUT when a Unicast Client writes
+ * invalid ASE Control Point parameters.
+ *
+ * Pass verdict:
+ * The IUT sends a notification of the ASE Control Point characteristic with
+ * the expected Response_Code and Reason values.
+ */
+static void test_usr_spe(void)
+{
+ define_test("BAP/USR/SPE/BI-01-C [USR ASE Control Point truncated]",
+ test_setup_server, test_server, NULL,
+ SPE_CP_TRUNCATED(0x03));
+ define_test("BAP/USR/SPE/BI-02-C [USR ASE Control Point zero ASEs]",
+ test_setup_server, test_server, NULL,
+ SPE_CP_ZERO_ASES(0x03));
+ define_test("BAP/USR/SPE/BI-03-C [USR Update Metadata truncated]",
+ test_setup_server, test_server, NULL,
+ SPE_METADATA_TRUNCATED(SRC_ID(0)));
+ define_test("BAP/USR/SPE/BI-04-C [USR Update Metadata unsupported]",
+ test_setup_server, test_server, &cfg_src_enable,
+ SPE_METADATA_UNSUPPORTED(SRC_ID(0)));
+ define_test("BAP/USR/SPE/BI-05-C [USR Update Metadata invalid context]",
+ test_setup_server, test_server, &cfg_src_enable,
+ SPE_METADATA_INVALID_CONTEXT(SRC_ID(0)));
+}
+
+static void test_spe(void)
+{
+ test_usr_spe();
+}
+
#define SNK_ENABLE \
IOV_DATA(0x52, 0x22, 0x00, 0x03, 0x01, 0x01, 0x04, 0x03, 0x02, 0x01, \
00), \
@@ -10259,6 +10322,7 @@ int main(int argc, char *argv[])
tester_init(&argc, &argv);
test_disc();
+ test_spe();
test_scc();
test_bsrc_scc();
test_bsnk_scc();
^ permalink raw reply related
* [BlueZ PATCH v2 0/1] shared/bap: add ASE Control Point error responses
From: raghu447 @ 2026-06-04 5:20 UTC (permalink / raw)
To: linux-bluetooth; +Cc: raghu447
In-Reply-To: <CABBYNZ+UzUk+MHSo87vttd7YF-s3Zuzsywf+wnoOboaD2bLhFg@mail.gmail.com>
This patch adds the responses that are expected by PTS.
This patch adds the SPE unit tests.
These changes are required to Pass PTS tests BAP/USR/SPE/BI-01[5]-C.
raghavendra (1):
shared/bap: add ASE Control Point error responses
src/shared/bap.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++--
unit/test-bap.c | 64 ++++++++++++++++++++++++++++++++++
2 files changed, 152 insertions(+), 2 deletions(-)
^ permalink raw reply
* Re: [GIT PULL] bluetooth 2026-06-03
From: patchwork-bot+netdevbpf @ 2026-06-04 2:20 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: davem, kuba, linux-bluetooth, netdev
In-Reply-To: <20260603162714.342496-1-luiz.dentz@gmail.com>
Hello:
This pull request was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 3 Jun 2026 12:27:14 -0400 you wrote:
> The following changes since commit cdf88b35e06f1b385f7f6228060ae541d44fbb72:
>
> Bluetooth: hci_sync: Reset device counters in hci_dev_close_sync() (2026-05-28 08:52:21 -0400)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2026-06-03
>
> [...]
Here is the summary with links:
- [GIT,PULL] bluetooth 2026-06-03
https://git.kernel.org/netdev/net/c/d20da9130830
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply
* [PATCH v2] Bluetooth: Add SPDX id lines to some source files
From: Tim Bird @ 2026-06-04 0:41 UTC (permalink / raw)
To: marcel, luiz.dentz, jannh, kuba, kiran.k, chharry, gustavo,
prameela.j04cs, salvatore.benedetto, maxk
Cc: tim.bird, linux-bluetooth, linux-spdx, linux-kernel
Many bluetooth source files are missing SPDX-License-Identifier
lines. Add appropriate IDs to these files, and remove other
license lines from the headers.
Leave the warranty disclaimer in files where the license ID is
GPL-2.0 but the wording of the disclaimer is slightly different
from that of the GPL v2 disclaimer.
It is not different enough to cause licensing conflicts, but is
kept to honor the original contributors' legal intent.
---
V1 -> V2:
- Leave different warranty disclaimers (which is most them)
- Remove files recently removed from drivers/bluetooth from the patch
Signed-off-by: Tim Bird <tim.bird@sony.com>
---
drivers/bluetooth/btrsi.c | 12 +-----------
include/net/bluetooth/bluetooth.h | 5 +----
include/net/bluetooth/hci.h | 5 +----
include/net/bluetooth/hci_core.h | 5 +----
include/net/bluetooth/hci_mon.h | 5 +----
include/net/bluetooth/hci_sock.h | 5 +----
include/net/bluetooth/l2cap.h | 5 +----
include/net/bluetooth/mgmt.h | 5 +----
include/net/bluetooth/rfcomm.h | 5 +----
include/net/bluetooth/sco.h | 5 +----
net/bluetooth/af_bluetooth.c | 5 +----
net/bluetooth/bnep/core.c | 5 +----
net/bluetooth/bnep/netdev.c | 5 +----
net/bluetooth/bnep/sock.c | 5 +----
net/bluetooth/ecdh_helper.c | 5 +----
net/bluetooth/ecdh_helper.h | 5 +----
net/bluetooth/hci_conn.c | 5 +----
net/bluetooth/hci_core.c | 5 +----
net/bluetooth/hci_debugfs.c | 5 +----
net/bluetooth/hci_debugfs.h | 5 +----
net/bluetooth/hci_event.c | 5 +----
net/bluetooth/hci_sock.c | 5 +----
net/bluetooth/hidp/core.c | 5 +----
net/bluetooth/hidp/hidp.h | 5 +----
net/bluetooth/hidp/sock.c | 5 +----
net/bluetooth/l2cap_core.c | 5 +----
net/bluetooth/l2cap_sock.c | 5 +----
net/bluetooth/lib.c | 5 +----
net/bluetooth/mgmt.c | 5 +----
net/bluetooth/mgmt_util.c | 5 +----
net/bluetooth/mgmt_util.h | 5 +----
net/bluetooth/rfcomm/core.c | 5 +----
net/bluetooth/rfcomm/sock.c | 5 +----
net/bluetooth/rfcomm/tty.c | 5 +----
net/bluetooth/sco.c | 5 +----
net/bluetooth/selftest.c | 5 +----
net/bluetooth/selftest.h | 5 +----
net/bluetooth/smp.c | 5 +----
net/bluetooth/smp.h | 5 +----
39 files changed, 39 insertions(+), 163 deletions(-)
diff --git a/drivers/bluetooth/btrsi.c b/drivers/bluetooth/btrsi.c
index c68dd2fba01c..59ad0b9b14c3 100644
--- a/drivers/bluetooth/btrsi.c
+++ b/drivers/bluetooth/btrsi.c
@@ -1,17 +1,7 @@
+// SPDX-License-Identifier: ISC
/*
* Copyright (c) 2017 Redpine Signals Inc.
*
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 3faea66b1979..b624da5026f5 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 572b1c620c5d..a8b2e8781054 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index aa600fbf9a53..7e15da47fe3a 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/hci_mon.h b/include/net/bluetooth/hci_mon.h
index bbd752494ef9..4b2a0af4ed58 100644
--- a/include/net/bluetooth/hci_mon.h
+++ b/include/net/bluetooth/hci_mon.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2011-2012 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/hci_sock.h b/include/net/bluetooth/hci_sock.h
index 13e8cd4414a1..16f150b861be 100644
--- a/include/net/bluetooth/hci_sock.h
+++ b/include/net/bluetooth/hci_sock.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 5172afee5494..b1039ebdf06f 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -6,10 +7,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 8234915854b6..08daed7a96d5 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2010 Nokia Corporation
Copyright (C) 2011-2012 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index c05882476900..feb6b3ae5e69 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
RFCOMM implementation for Linux Bluetooth stack (BlueZ)
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
index f40ddb4264fc..214409527b35 100644
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 1a6aa3f8d4d6..bcbc11c9cb15 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 0de5df690bd0..b18e1cf28bb4 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BNEP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2001-2002 Inventel Systemes
@@ -7,10 +8,6 @@
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index cc1cff63194f..ee1e39a3daff 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BNEP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2001-2002 Inventel Systemes
@@ -7,10 +8,6 @@
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 00d47bcf4d7d..f3fe818d0e4c 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BNEP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2001-2002 Inventel Systemes
@@ -6,10 +7,6 @@
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/ecdh_helper.c b/net/bluetooth/ecdh_helper.c
index 0efc93fdae8a..1938e5559d88 100644
--- a/net/bluetooth/ecdh_helper.c
+++ b/net/bluetooth/ecdh_helper.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* ECDH helper functions - KPP wrappings
*
* Copyright (C) 2017 Intel Corporation
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/ecdh_helper.h b/net/bluetooth/ecdh_helper.h
index 830723971cf8..9d787d3c8797 100644
--- a/net/bluetooth/ecdh_helper.h
+++ b/net/bluetooth/ecdh_helper.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* ECDH helper functions - KPP wrappings
*
* Copyright (C) 2017 Intel Corporation
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 54eabaa46960..c335372e4062 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 28d7929dc593..243d01069a91 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c
index 99e2e9fc70e8..0635e4641db4 100644
--- a/net/bluetooth/hci_debugfs.c
+++ b/net/bluetooth/hci_debugfs.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2014 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_debugfs.h b/net/bluetooth/hci_debugfs.h
index 9a8a7c93bb12..92365cbc922a 100644
--- a/net/bluetooth/hci_debugfs.h
+++ b/net/bluetooth/hci_debugfs.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2014 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index eea2f810aafa..e588c744ce36 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.
@@ -5,10 +6,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 0290dea081f6..c81852411250 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 70344bd3248a..0e24c5e2955e 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
HIDP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
Copyright (C) 2013 David Herrmann <dh.herrmann@gmail.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index 6ef88d0a1919..959b745bb770 100644
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
HIDP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index c93aaeb3a3fa..b75bea3cf422 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
/*
HIDP implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 45b175399e8d..ad2f26d935ca 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -8,10 +9,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index c138aa4ae266..e3eda309f1b3 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
@@ -7,10 +8,6 @@
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index 305044a84478..cea21a4c49a0 100644
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index de5bd6b637b2..a732b586979d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2010 Nokia Corporation
Copyright (C) 2011-2012 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/mgmt_util.c b/net/bluetooth/mgmt_util.c
index 4f19654d41a9..6ea107c0e054 100644
--- a/net/bluetooth/mgmt_util.c
+++ b/net/bluetooth/mgmt_util.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2015 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/mgmt_util.h b/net/bluetooth/mgmt_util.h
index bcba8c9d8952..20810cf06e81 100644
--- a/net/bluetooth/mgmt_util.h
+++ b/net/bluetooth/mgmt_util.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2015 Intel Coropration
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index d11bd5337d57..593583c694a7 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
RFCOMM implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index bd7d959c6e9e..bb7cf98f85cf 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
RFCOMM implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 91bf5274262e..4b9a699ec59b 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
RFCOMM implementation for Linux Bluetooth stack (BlueZ).
Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index f1799c6a6f87..be5614a6c5ee 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2000-2001 Qualcomm Incorporated
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/selftest.c b/net/bluetooth/selftest.c
index f49604d44b87..ae5b44bb9d3d 100644
--- a/net/bluetooth/selftest.c
+++ b/net/bluetooth/selftest.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2014 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/selftest.h b/net/bluetooth/selftest.h
index 2aa0a346a913..34d684ee84fd 100644
--- a/net/bluetooth/selftest.h
+++ b/net/bluetooth/selftest.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2014 Intel Corporation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 98f1da4f5f55..ef464568b9c7 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index c5da53dfab04..eac27bd541bb 100644
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation;
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
--
2.43.0
^ permalink raw reply related
* RE: [5.10] Bluetooth: hci_core: Fix use-after-free in vhci_flush()
From: bluez.test.bot @ 2026-06-04 0:19 UTC (permalink / raw)
To: linux-bluetooth, vlad102nikolaev
In-Reply-To: <20260603234343.445-1-vlad102nikolaev@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
This is an automated email and please do not reply to this email.
Dear Submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.
----- Output -----
error: patch failed: include/net/bluetooth/hci_core.h:28
error: include/net/bluetooth/hci_core.h: patch does not apply
error: patch failed: net/bluetooth/hci_core.c:1040
error: net/bluetooth/hci_core.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Please resolve the issue and submit the patches again.
---
Regards,
Linux Bluetooth
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox