* [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable @ 2025-07-02 1:15 Yang Li via B4 Relay 2025-07-02 3:54 ` [BlueZ,bluez,v3] " bluez.test.bot 2025-07-02 13:01 ` [PATCH BlueZ bluez v3] " Luiz Augusto von Dentz 0 siblings, 2 replies; 6+ messages in thread From: Yang Li via B4 Relay @ 2025-07-02 1:15 UTC (permalink / raw) To: Linux Bluetooth; +Cc: Yang Li From: Yang Li <yang.li@amlogic.com> Add a state check so that stream_disable() is a no-op when the stream is not in ENABLING or STREAMING state. This prevents unexpected state transitions or redundant operations during cleanup. Signed-off-by: Yang Li <yang.li@amlogic.com> --- Changes in v3: - Optimizing the code - Link to v2: https://patch.msgid.link/20250630-bap_for_big_sync_lost-v2-0-1491b608cda5@amlogic.com bap for big sync lost To: Linux Bluetooth <linux-bluetooth@vger.kernel.org> Signed-off-by: Yang Li <yang.li@amlogic.com> Changes in v2: - Add state check in stream_disable. - Add type check in stream_io_disconnected. - Link to v1: https://patch.msgid.link/20250624-bap_for_big_sync_lost-v1-1-0df90a0f55d0@amlogic.com --- src/shared/bap.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 40e1c974b..1790b277b 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -2131,14 +2131,20 @@ static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) ascs_ase_rsp_success(rsp, stream->ep->id); - /* Sink can autonomously transit to QOS while source needs to go to - * Disabling until BT_ASCS_STOP is received. - */ - if (stream->ep->dir == BT_BAP_SINK) - stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); - - if (stream->ep->dir == BT_BAP_SOURCE) - stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); + switch (stream->ep->state) { + case BT_ASCS_ASE_STATE_ENABLING: + case BT_ASCS_ASE_STATE_STREAMING: + if (stream->ep->dir == BT_BAP_SINK) + stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); + else if (stream->ep->dir == BT_BAP_SOURCE) + /* Sink can autonomously transit to QOS while source needs to go to + * Disabling until BT_ASCS_STOP is received. + */ + stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); + break; + default: + break; + } return 0; } --- base-commit: 55a6763cde8a2309fd23a96479ee4cf2fc23a442 change-id: 20250624-bap_for_big_sync_lost-63476c679dbb Best regards, -- Yang Li <yang.li@amlogic.com> ^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [BlueZ,bluez,v3] shared/bap: Add stream state check in stream_disable 2025-07-02 1:15 [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable Yang Li via B4 Relay @ 2025-07-02 3:54 ` bluez.test.bot 2025-07-02 13:01 ` [PATCH BlueZ bluez v3] " Luiz Augusto von Dentz 1 sibling, 0 replies; 6+ messages in thread From: bluez.test.bot @ 2025-07-02 3:54 UTC (permalink / raw) To: linux-bluetooth, yang.li [-- Attachment #1: Type: text/plain, Size: 36148 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=977969 ---Test result--- Test Summary: CheckPatch PENDING 0.26 seconds GitLint PENDING 0.28 seconds BuildEll PASS 20.27 seconds BluezMake FAIL 83.56 seconds MakeCheck FAIL 2898.21 seconds MakeDistcheck FAIL 53.73 seconds CheckValgrind FAIL 60.73 seconds CheckSmatch FAIL 187.12 seconds bluezmakeextell FAIL 100.07 seconds IncrementalBuild PENDING 0.32 seconds ScanBuild FAIL 220.45 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: BluezMake - FAIL Desc: Build BlueZ Output: tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12907:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12907 | int main(int argc, char *argv[]) | ^~~~ src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4690: all] Error 2 ############################## Test: MakeCheck - FAIL Desc: Run Bluez Make Check Output: unit/test-avdtp.c: In function ‘main’: unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 766 | int main(int argc, char *argv[]) | ^~~~ unit/test-avrcp.c: In function ‘main’: unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 989 | int main(int argc, char *argv[]) | ^~~~ src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make: *** [Makefile:12345: check] Error 2 ############################## Test: MakeDistcheck - FAIL Desc: Run Bluez Make Distcheck Output: Package cups was not found in the pkg-config search path. Perhaps you should add the directory containing `cups.pc' to the PKG_CONFIG_PATH environment variable No package 'cups' found ../../src/device.c: In function ‘connect_profiles’: ../../src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile:4690: all] Error 2 make: *** [Makefile:12266: distcheck] Error 1 ############################## Test: CheckValgrind - FAIL Desc: Run Bluez Make Check with Valgrind Output: tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12907:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12907 | int main(int argc, char *argv[]) | ^~~~ src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:12345: check] Error 2 ############################## Test: CheckSmatch - FAIL Desc: Run smatch tool with source Output: src/shared/crypto.c:271:21: warning: Variable length array is used. src/shared/crypto.c:272:23: warning: Variable length array is used. src/shared/gatt-helpers.c:768:31: warning: Variable length array is used. src/shared/gatt-helpers.c:830:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used. src/shared/gatt-server.c:278:25: warning: Variable length array is used. src/shared/gatt-server.c:618:25: warning: Variable length array is used. src/shared/gatt-server.c:716:25: warning: Variable length array is used. src/shared/bap.c:317:25: warning: array of flexible structures src/shared/bap.c: note: in included file: ./src/shared/ascs.h:88:25: warning: array of flexible structures src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' src/shared/crypto.c:271:21: warning: Variable length array is used. src/shared/crypto.c:272:23: warning: Variable length array is used. src/shared/gatt-helpers.c:768:31: warning: Variable length array is used. src/shared/gatt-helpers.c:830:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used. src/shared/gatt-server.c:278:25: warning: Variable length array is used. src/shared/gatt-server.c:618:25: warning: Variable length array is used. src/shared/gatt-server.c:716:25: warning: Variable length array is used. src/shared/bap.c:317:25: warning: array of flexible structures src/shared/bap.c: note: in included file: ./src/shared/ascs.h:88:25: warning: array of flexible structures src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' tools/mesh-cfgtest.c:1453:17: warning: unknown escape sequence: '\%' tools/sco-tester.c: note: in included file: ./lib/bluetooth.h:232:15: warning: array of flexible structures ./lib/bluetooth.h:237:31: warning: array of flexible structures tools/bneptest.c:634:39: warning: unknown escape sequence: '\%' tools/seq2bseq.c:57:26: warning: Variable length array is used. tools/obex-client-tool.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' android/avctp.c:505:34: warning: Variable length array is used. android/avctp.c:556:34: warning: Variable length array is used. unit/test-avrcp.c:373:26: warning: Variable length array is used. unit/test-avrcp.c:398:26: warning: Variable length array is used. unit/test-avrcp.c:414:24: warning: Variable length array is used. android/avrcp-lib.c:1085:34: warning: Variable length array is used. android/avrcp-lib.c:1583:34: warning: Variable length array is used. android/avrcp-lib.c:1612:34: warning: Variable length array is used. android/avrcp-lib.c:1638:34: warning: Variable length array is used. src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4690: all] Error 2 ############################## Test: bluezmakeextell - FAIL Desc: Build Bluez with External ELL Output: src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4690: all] Error 2 ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: ############################## Test: ScanBuild - FAIL Desc: Run Scan Build Output: src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed gatt_db_unregister(op->client->db, op->db_id); ^~~~~~~~~~ src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed discovery_op_complete(op, false, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1296:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed discover_all(op); ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2147:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2155:8: warning: Use of memory after it is freed discovery_op_ref(op), ^~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3180:2: warning: Use of memory after it is freed complete_write_long_op(req, success, 0, false); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3202:2: warning: Use of memory after it is freed request_unref(req); ^~~~~~~~~~~~~~~~~~ 12 warnings generated. src/shared/bap.c:1528:8: warning: Use of memory after it is freed bap = bt_bap_ref_safe(bap); ^~~~~~~~~~~~~~~~~~~~ src/shared/bap.c:2315:20: warning: Use of memory after it is freed return queue_find(stream->bap->streams, NULL, stream); ^~~~~~~~~~~~~~~~~~~~ 2 warnings generated. src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed gatt_db_unregister(op->client->db, op->db_id); ^~~~~~~~~~ src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed discovery_op_complete(op, false, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1296:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed discover_all(op); ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2147:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2155:8: warning: Use of memory after it is freed discovery_op_ref(op), ^~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3180:2: warning: Use of memory after it is freed complete_write_long_op(req, success, 0, false); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3202:2: warning: Use of memory after it is freed request_unref(req); ^~~~~~~~~~~~~~~~~~ 12 warnings generated. tools/hciattach.c:817:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 10)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:865:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:887:8: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 10)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:909:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:930:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:974:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 6)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ 6 warnings generated. src/shared/bap.c:1528:8: warning: Use of memory after it is freed bap = bt_bap_ref_safe(bap); ^~~~~~~~~~~~~~~~~~~~ src/shared/bap.c:2315:20: warning: Use of memory after it is freed return queue_find(stream->bap->streams, NULL, stream); ^~~~~~~~~~~~~~~~~~~~ 2 warnings generated. src/oui.c:50:2: warning: Value stored to 'hwdb' is never read hwdb = udev_hwdb_unref(hwdb); ^ ~~~~~~~~~~~~~~~~~~~~~ src/oui.c:53:2: warning: Value stored to 'udev' is never read udev = udev_unref(udev); ^ ~~~~~~~~~~~~~~~~ 2 warnings generated. tools/rfcomm.c:234:3: warning: Value stored to 'i' is never read i = execvp(cmdargv[0], cmdargv); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:234:7: warning: Null pointer passed to 1st parameter expecting 'nonnull' i = execvp(cmdargv[0], cmdargv); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:354:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd' if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:497:14: warning: Assigned value is garbage or undefined req.channel = raddr.rc_channel; ^ ~~~~~~~~~~~~~~~~ tools/rfcomm.c:515:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd' if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 5 warnings generated. tools/hcidump.c:180:9: warning: Potential leak of memory pointed to by 'dp' if (fds[i].fd == sock) ^~~ tools/hcidump.c:248:17: warning: Assigned value is garbage or undefined dh->ts_sec = htobl(frm.ts.tv_sec); ^ ~~~~~~~~~~~~~~~~~~~~ tools/hcidump.c:326:9: warning: 1st function call argument is an uninitialized value if (be32toh(dp.flags) & 0x02) { ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:341:20: warning: 1st function call argument is an uninitialized value frm.data_len = be32toh(dp.len); ^~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:346:14: warning: 1st function call argument is an uninitialized value opcode = be32toh(dp.flags) & 0xffff; ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:384:17: warning: Assigned value is garbage or undefined frm.data_len = btohs(dh.len); ^ ~~~~~~~~~~~~~ tools/hcidump.c:394:11: warning: Assigned value is garbage or undefined frm.len = frm.data_len; ^ ~~~~~~~~~~~~ tools/hcidump.c:398:9: warning: 1st function call argument is an uninitialized value ts = be64toh(ph.ts); ^~~~~~~~~~~~~~ /usr/include/endian.h:51:22: note: expanded from macro 'be64toh' # define be64toh(x) __bswap_64 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:403:13: warning: 1st function call argument is an uninitialized value frm.in = be32toh(dp.flags) & 0x01; ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:408:11: warning: Assigned value is garbage or undefined frm.in = dh.in; ^ ~~~~~ tools/hcidump.c:437:7: warning: Null pointer passed to 1st parameter expecting 'nonnull' fd = open(file, open_flags, 0644); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ 11 warnings generated. tools/ciptool.c:350:7: warning: 5th function call argument is an uninitialized value sk = do_connect(ctl, dev_id, &src, &dst, psm, (1 << CMTP_LOOPBACK)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ 3 warnings generated. tools/sdptool.c:941:26: warning: Result of 'malloc' is converted to a pointer of type 'uint32_t', which is incompatible with sizeof operand type 'int' uint32_t *value_int = malloc(sizeof(int)); ~~~~~~~~~~ ^~~~~~ ~~~~~~~~~~~ tools/sdptool.c:980:4: warning: 1st function call argument is an uninitialized value free(allocArray[i]); ^~~~~~~~~~~~~~~~~~~ tools/sdptool.c:3777:2: warning: Potential leak of memory pointed to by 'si.name' return add_service(0, &si); ^~~~~~~~~~~~~~~~~~~~~~~~~~ tools/sdptool.c:4112:4: warning: Potential leak of memory pointed to by 'context.svc' return -1; ^~~~~~~~~ 4 warnings generated. tools/avtest.c:243:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:253:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:262:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:276:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:283:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:290:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:297:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:309:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:313:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:322:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:326:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:335:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:342:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:364:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:368:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:377:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:381:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:394:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:398:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:405:4: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:415:4: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:580:3: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:588:3: warning: Value stored to 'len' is never read len = write(sk, buf, invalid ? 2 : 3); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/avtest.c:602:3: warning: Value stored to 'len' is never read len = write(sk, buf, 4 + media_transport_size); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/avtest.c:615:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:625:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:637:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:652:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:664:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:673:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:680:3: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:716:2: warning: Value stored to 'len' is never read len = write(sk, buf, AVCTP_HEADER_LENGTH + sizeof(play_pressed)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 warnings generated. tools/btproxy.c:836:15: warning: Null pointer passed to 1st parameter expecting 'nonnull' tcp_port = atoi(optarg); ^~~~~~~~~~~~ tools/btproxy.c:839:8: warning: Null pointer passed to 1st parameter expecting 'nonnull' if (strlen(optarg) > 3 && !strncmp(optarg, "hci", 3)) ^~~~~~~~~~~~~~ 2 warnings generated. tools/iso-tester.c:1902:7: warning: Potential leak of memory pointed to by 'addr' err = bind(sk, (struct sockaddr *) addr, sizeof(*addr) + ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/iso-tester.c:1910:7: warning: Potential leak of memory pointed to by 'addr' err = bind(sk, (struct sockaddr *) addr, sizeof(*addr)); ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. tools/create-image.c:76:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:84:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:92:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:105:2: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ 4 warnings generated. tools/check-selftest.c:42:3: warning: Value stored to 'ptr' is never read ptr = fgets(result, sizeof(result), fp); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. tools/gatt-service.c:294:2: warning: 2nd function call argument is an uninitialized value chr_write(chr, value, len); ^~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. tools/btgatt-server.c:1212:2: warning: Value stored to 'argv' is never read argv -= optind; ^ ~~~~~~ 1 warning generated. tools/btgatt-client.c:1824:2: warning: Value stored to 'argv' is never read argv += optind; ^ ~~~~~~ 1 warning generated. tools/obex-server-tool.c:133:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' data->fd = open(name, O_WRONLY | O_CREAT | O_NOCTTY, 0600); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/obex-server-tool.c:192:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' data->fd = open(name, O_RDONLY | O_NOCTTY, 0); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. tools/btpclientctl.c:402:3: warning: Value stored to 'bit' is never read bit = 0; ^ ~ tools/btpclientctl.c:1655:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull' memcpy(cp->data, ad_data, ad_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t' pElem = malloc(sizeof(uint16_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' pElem = malloc(sizeof(uint32_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ 2 warnings generated. android/avrcp-lib.c:1968:3: warning: 1st function call argument is an uninitialized value g_free(text[i]); ^~~~~~~~~~~~~~~ 1 warning generated. profiles/audio/avdtp.c:893:25: warning: Use of memory after it is freed session->prio_queue = g_slist_remove(session->prio_queue, req); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ profiles/audio/avdtp.c:900:24: warning: Use of memory after it is freed session->req_queue = g_slist_remove(session->req_queue, req); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. profiles/audio/a2dp.c:375:8: warning: Use of memory after it is freed if (!cb->resume_cb) ^~~~~~~~~~~~~ profiles/audio/a2dp.c:3269:20: warning: Access to field 'starting' results in a dereference of a null pointer (loaded from variable 'stream') stream->starting = TRUE; ~~~~~~ ^ profiles/audio/a2dp.c:3272:8: warning: Access to field 'suspending' results in a dereference of a null pointer (loaded from variable 'stream') if (!stream->suspending && stream->suspend_timer) { ^~~~~~~~~~~~~~~~~~ profiles/audio/a2dp.c:3332:22: warning: Access to field 'suspending' results in a dereference of a null pointer (loaded from variable 'stream') stream->suspending = TRUE; ~~~~~~ ^ 4 warnings generated. profiles/audio/avrcp.c:1961:2: warning: Value stored to 'operands' is never read operands += sizeof(*pdu); ^ ~~~~~~~~~~~~ 1 warning generated. profiles/health/hdp.c:644:3: warning: Use of memory after it is freed hdp_tmp_dc_data_unref(dc_data); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ profiles/health/hdp.c:800:19: warning: Use of memory after it is freed path = g_strdup(chan->path); ^~~~~~~~~~ profiles/health/hdp.c:1779:6: warning: Use of memory after it is freed hdp_tmp_dc_data_ref(hdp_conn), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ profiles/health/hdp.c:1836:30: warning: Use of memory after it is freed reply = g_dbus_create_error(data->msg, ERROR_INTERFACE ".HealthError", ^~~~~~~~~ 4 warnings generated. profiles/health/hdp_util.c:1052:2: warning: Use of memory after it is freed conn_data->func(conn_data->data, gerr); ^~~~~~~~~~~~~~~ 1 warning generated. attrib/gatt.c:970:2: warning: Potential leak of memory pointed to by 'long_write' return prepare_write(long_write); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. profiles/audio/bap.c:1024:18: warning: Access to field 'data' results in a dereference of a null pointer (loaded from field 'ep') bap_update_cigs(setup->ep->data); ^~~~~~~~~~~~~~~ 1 warning generated. src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t' pElem = malloc(sizeof(uint16_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' pElem = malloc(sizeof(uint32_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ 2 warnings generated. src/sdp-client.c:353:14: warning: Access to field 'cb' results in a dereference of a null pointer (*ctxt)->cb = cb; ~~~~~~~~~~~~^~~~ 1 warning generated. src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ 3 warnings generated. src/gatt-database.c:1173:10: warning: Value stored to 'bits' during its initialization is never read uint8_t bits[] = { BT_GATT_CHRC_CLI_FEAT_ROBUST_CACHING, ^~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. src/device.c: In function ‘connect_profiles’: src/device.c:2689:6: error: ‘ERR_BREDR_CONN_PROFILE_UNAVAILABLE’ undeclared (first use in this function) 2689 | ERR_BREDR_CONN_PROFILE_UNAVAILABLE); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/device.c:2689:6: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:11162: src/bluetoothd-device.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4690: all] Error 2 --- Regards, Linux Bluetooth ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable 2025-07-02 1:15 [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable Yang Li via B4 Relay 2025-07-02 3:54 ` [BlueZ,bluez,v3] " bluez.test.bot @ 2025-07-02 13:01 ` Luiz Augusto von Dentz 2025-07-03 8:40 ` Yang Li 1 sibling, 1 reply; 6+ messages in thread From: Luiz Augusto von Dentz @ 2025-07-02 13:01 UTC (permalink / raw) To: yang.li; +Cc: Linux Bluetooth Hi, On Tue, Jul 1, 2025 at 9:19 PM Yang Li via B4 Relay <devnull+yang.li.amlogic.com@kernel.org> wrote: > > From: Yang Li <yang.li@amlogic.com> > > Add a state check so that stream_disable() is a no-op when the stream > is not in ENABLING or STREAMING state. This prevents unexpected state > transitions or redundant operations during cleanup. What is the issue here, do you have traces, debug logs, etc? > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > Changes in v3: > - Optimizing the code > - Link to v2: https://patch.msgid.link/20250630-bap_for_big_sync_lost-v2-0-1491b608cda5@amlogic.com > > bap for big sync lost > > To: Linux Bluetooth <linux-bluetooth@vger.kernel.org> > Signed-off-by: Yang Li <yang.li@amlogic.com> > > Changes in v2: > - Add state check in stream_disable. > - Add type check in stream_io_disconnected. > - Link to v1: https://patch.msgid.link/20250624-bap_for_big_sync_lost-v1-1-0df90a0f55d0@amlogic.com > --- > src/shared/bap.c | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/src/shared/bap.c b/src/shared/bap.c > index 40e1c974b..1790b277b 100644 > --- a/src/shared/bap.c > +++ b/src/shared/bap.c > @@ -2131,14 +2131,20 @@ static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) > > ascs_ase_rsp_success(rsp, stream->ep->id); > > - /* Sink can autonomously transit to QOS while source needs to go to > - * Disabling until BT_ASCS_STOP is received. > - */ > - if (stream->ep->dir == BT_BAP_SINK) > - stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); > - > - if (stream->ep->dir == BT_BAP_SOURCE) > - stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); > + switch (stream->ep->state) { > + case BT_ASCS_ASE_STATE_ENABLING: > + case BT_ASCS_ASE_STATE_STREAMING: > + if (stream->ep->dir == BT_BAP_SINK) > + stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); > + else if (stream->ep->dir == BT_BAP_SOURCE) > + /* Sink can autonomously transit to QOS while source needs to go to > + * Disabling until BT_ASCS_STOP is received. > + */ > + stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); > + break; > + default: > + break; > + } > > return 0; > } > > --- > base-commit: 55a6763cde8a2309fd23a96479ee4cf2fc23a442 > change-id: 20250624-bap_for_big_sync_lost-63476c679dbb > > Best regards, > -- > Yang Li <yang.li@amlogic.com> > > > -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable 2025-07-02 13:01 ` [PATCH BlueZ bluez v3] " Luiz Augusto von Dentz @ 2025-07-03 8:40 ` Yang Li 2025-07-03 13:17 ` Luiz Augusto von Dentz 0 siblings, 1 reply; 6+ messages in thread From: Yang Li @ 2025-07-03 8:40 UTC (permalink / raw) To: Luiz Augusto von Dentz; +Cc: Linux Bluetooth Hi Luzi, > [ EXTERNAL EMAIL ] > > Hi, > > On Tue, Jul 1, 2025 at 9:19 PM Yang Li via B4 Relay > <devnull+yang.li.amlogic.com@kernel.org> wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> Add a state check so that stream_disable() is a no-op when the stream >> is not in ENABLING or STREAMING state. This prevents unexpected state >> transitions or redundant operations during cleanup. > What is the issue here, do you have traces, debug logs, etc? Regarding the Unicast caching configuration you mentioned, there is currently an issue in the code flow. The relevant log is shown below: When music is paused on the pixel 9 phone, the CIS link gets disconnected. As the transport state changes from ACTIVE to IDLE, the stream state transitions from config to qos. > HCI Event: Disconnect Complete (0x05) plen 4 #1425 [hci0] 49.572089 Status: Success (0x00) Handle: 512 Address: 6A:AB:51:47:3B:80 (Resolvable) Identity type: Random (0x01) Identity: E8:D5:2B:59:57:A6 (Static) Reason: Remote User Terminated Connection (0x13) bluetoothd[2313]: src/shared/bap.c:stream_io_disconnected() stream 0x1f9fc20 io disconnected bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream 0x1f9fc20 dir 0x01: releasing -> config bluetoothd[2313]: src/shared/bap.c:stream_notify() stream 0x1f9fc20 state 1 bluetoothd[2313]: profiles/audio/transport.c:bap_state_changed() stream 0x1f9fc20: releasing(6) -> config(1) bluetoothd[2313]: profiles/audio/transport.c:transport_update_playing() /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 State=TRANSPORT_STATE_ACTIVE Playing=0 bluetoothd[2313]: profiles/audio/transport.c:media_transport_remove_owner() Transport /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner :1.1 bluetoothd[2313]: profiles/audio/transport.c:media_owner_free() Owner :1.1 bluetoothd[2313]: profiles/audio/transport.c:media_transport_suspend() Transport /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner bluetoothd[2313]: profiles/audio/transport.c:transport_set_state() State changed /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1: TRANSPORT_STATE_ACTIVE -> TRANSPORT_STATE_IDLE bluetoothd[2313]: src/shared/bap.c:stream_disable() stream 0x1f9fc20 bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream 0x1f9fc20 dir 0x01: config -> qos ATTbluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1426 [hci0] 49.585656 ATT: Handle Value Notification (0x1b) len 46 Handle: 0x007b Type: Sink ASE (0x2bc4) Data[44]: 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 ASE ID: 1 State: Codec Configured (0x01) Framing: Unframed PDUs supported (0x00) PHY: 0x02 LE 2M PHY preffered (0x02) RTN: 5 Max Transport Latency: 10 Presentation Delay Min: 20000 us ... bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 24 #1427 [hci0] 49.585725 ATT: Handle Value Notification (0x1b) len 19 Handle: 0x007b Type: Sink ASE (0x2bc4) Data[17]: 0102010010270000025000050a00204e00 ASE ID: 1 State: QoS Configured (0x02) CIG ID: 0x01 CIS ID: 0x00 ... when playback resumes on the phone, it attempts to set the ASE state to Codec. However, since the stream has already transitioned from config to qos, the phone ends up disconnecting the connection. bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 12 #1433 [hci0] 60.216004 ATT: Handle Value Notification (0x1b) len 7 Handle: 0x0087 Type: ASE Control Point (0x2bc6) Data[5]: 0101010000 Opcode: Codec Configuration (0x01) Number of ASE(s): 1 ASE: #0 ASE ID: 0x01 ASE Response Code: Success (0x00) ASE Response Reason: None (0x00) bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1434 [hci0] 60.226086 ATT: Handle Value Notification (0x1b) len 46 Handle: 0x007b Type: Sink ASE (0x2bc4) Data[44]: 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 ASE ID: 1 State: Codec Configured (0x01) Framing: Unframed PDUs supported (0x00) PHY: 0x02 LE 2M PHY preffered (0x02) RTN: 5 Max Transport Latency: 10 Presentation Delay Min: 20000 us Presentation Delay Max: 40000 us Preferred Presentation Delay Min: 20000 us Preferred Presentation Delay Max: 40000 us Codec: LC3 (0x06) Codec Specific Configuration: #0: len 0x02 type 0x01 Sampling Frequency: 16 Khz (0x03) Codec Specific Configuration: #1: len 0x02 type 0x02 Frame Duration: 10 ms (0x01) Codec Specific Configuration: #2: len 0x05 type 0x03 Location: 0x00000003 Front Left (0x00000001) Front Right (0x00000002) Codec Specific Configuration: #3: len 0x03 type 0x04 Frame Length: 40 (0x0028) Codec Specific Configuration: #4: len 0x02 type 0x05 Frame Blocks per SDU: 1 (0x01) ... > HCI Event: Disconnect Complete (0x05) plen 4 #1445 [hci0] 63.651497 Status: Success (0x00) Handle: 16 Address: 6A:AB:51:47:3B:80 (Resolvable) Identity type: Random (0x01) Identity: E8:D5:2B:59:57:A6 (Static) Reason: Remote User Terminated Connection (0x13) Here is Pauli Virtanen’s analysis and solution: https://lore.kernel.org/all/3ac16d0a7c5569bce0b28f18bc2245bef8ab64c2.camel@iki.fi/ AFAICS the bug appears to be: - bap.c:stream_disable() should do nothing if stream is not ENABLING or STREAMING since it's called from bt_bap_stream_disable() which is called on transport suspend which should be noop for BAP server if stream is already gone. Next, I will attach the relevant btmon trace to the commit message. > >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> Changes in v3: >> - Optimizing the code >> - Link to v2: https://patch.msgid.link/20250630-bap_for_big_sync_lost-v2-0-1491b608cda5@amlogic.com >> >> bap for big sync lost >> >> To: Linux Bluetooth <linux-bluetooth@vger.kernel.org> >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> >> Changes in v2: >> - Add state check in stream_disable. >> - Add type check in stream_io_disconnected. >> - Link to v1: https://patch.msgid.link/20250624-bap_for_big_sync_lost-v1-1-0df90a0f55d0@amlogic.com >> --- >> src/shared/bap.c | 22 ++++++++++++++-------- >> 1 file changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/src/shared/bap.c b/src/shared/bap.c >> index 40e1c974b..1790b277b 100644 >> --- a/src/shared/bap.c >> +++ b/src/shared/bap.c >> @@ -2131,14 +2131,20 @@ static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) >> >> ascs_ase_rsp_success(rsp, stream->ep->id); >> >> - /* Sink can autonomously transit to QOS while source needs to go to >> - * Disabling until BT_ASCS_STOP is received. >> - */ >> - if (stream->ep->dir == BT_BAP_SINK) >> - stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); >> - >> - if (stream->ep->dir == BT_BAP_SOURCE) >> - stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); >> + switch (stream->ep->state) { >> + case BT_ASCS_ASE_STATE_ENABLING: >> + case BT_ASCS_ASE_STATE_STREAMING: >> + if (stream->ep->dir == BT_BAP_SINK) >> + stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); >> + else if (stream->ep->dir == BT_BAP_SOURCE) >> + /* Sink can autonomously transit to QOS while source needs to go to >> + * Disabling until BT_ASCS_STOP is received. >> + */ >> + stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); >> + break; >> + default: >> + break; >> + } >> >> return 0; >> } >> >> --- >> base-commit: 55a6763cde8a2309fd23a96479ee4cf2fc23a442 >> change-id: 20250624-bap_for_big_sync_lost-63476c679dbb >> >> Best regards, >> -- >> Yang Li <yang.li@amlogic.com> >> >> >> > > -- > Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable 2025-07-03 8:40 ` Yang Li @ 2025-07-03 13:17 ` Luiz Augusto von Dentz 2025-07-04 1:16 ` Yang Li 0 siblings, 1 reply; 6+ messages in thread From: Luiz Augusto von Dentz @ 2025-07-03 13:17 UTC (permalink / raw) To: Yang Li; +Cc: Linux Bluetooth Hi, On Thu, Jul 3, 2025 at 4:40 AM Yang Li <yang.li@amlogic.com> wrote: > > Hi Luzi, > > [ EXTERNAL EMAIL ] > > > > Hi, > > > > On Tue, Jul 1, 2025 at 9:19 PM Yang Li via B4 Relay > > <devnull+yang.li.amlogic.com@kernel.org> wrote: > >> From: Yang Li <yang.li@amlogic.com> > >> > >> Add a state check so that stream_disable() is a no-op when the stream > >> is not in ENABLING or STREAMING state. This prevents unexpected state > >> transitions or redundant operations during cleanup. > > What is the issue here, do you have traces, debug logs, etc? > > Regarding the Unicast caching configuration you mentioned, there is > currently an issue in the code flow. The relevant log is shown below: > > When music is paused on the pixel 9 phone, the CIS link gets > disconnected. As the transport state changes from ACTIVE to IDLE, the > stream state transitions from config to qos. > > > HCI Event: Disconnect Complete (0x05) plen 4 #1425 [hci0] > 49.572089 > Status: Success (0x00) > Handle: 512 Address: 6A:AB:51:47:3B:80 (Resolvable) > Identity type: Random (0x01) > Identity: E8:D5:2B:59:57:A6 (Static) > Reason: Remote User Terminated Connection (0x13) > bluetoothd[2313]: src/shared/bap.c:stream_io_disconnected() stream > 0x1f9fc20 io disconnected > bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream > 0x1f9fc20 dir 0x01: releasing -> config > bluetoothd[2313]: src/shared/bap.c:stream_notify() stream 0x1f9fc20 > state 1 > bluetoothd[2313]: profiles/audio/transport.c:bap_state_changed() > stream 0x1f9fc20: releasing(6) -> config(1) > bluetoothd[2313]: > profiles/audio/transport.c:transport_update_playing() > /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 State=TRANSPORT_STATE_ACTIVE > Playing=0 > bluetoothd[2313]: > profiles/audio/transport.c:media_transport_remove_owner() Transport > /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner :1.1 > bluetoothd[2313]: profiles/audio/transport.c:media_owner_free() Owner > :1.1 > bluetoothd[2313]: > profiles/audio/transport.c:media_transport_suspend() Transport > /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner > bluetoothd[2313]: profiles/audio/transport.c:transport_set_state() > State changed /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1: > TRANSPORT_STATE_ACTIVE -> TRANSPORT_STATE_IDLE > bluetoothd[2313]: src/shared/bap.c:stream_disable() stream 0x1f9fc20 > bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream > 0x1f9fc20 dir 0x01: config -> qos Ok, this indeed is not expected, that said we do have the following checks already in place so we might as well update them: if (!stream || stream->ep->state == BT_BAP_STREAM_STATE_QOS || stream->ep->state == BT_BAP_STREAM_STATE_IDLE) return 0; > ATTbluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1426 > [hci0] 49.585656 > ATT: Handle Value Notification (0x1b) len 46 > Handle: 0x007b Type: Sink ASE (0x2bc4) > Data[44]: > 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 > ASE ID: 1 > State: Codec Configured (0x01) > Framing: Unframed PDUs supported (0x00) > PHY: 0x02 > LE 2M PHY preffered (0x02) > RTN: 5 > Max Transport Latency: 10 > Presentation Delay Min: 20000 us > ... > bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 24 #1427 [hci0] > 49.585725 > ATT: Handle Value Notification (0x1b) len 19 > Handle: 0x007b Type: Sink ASE (0x2bc4) > Data[17]: 0102010010270000025000050a00204e00 > ASE ID: 1 > State: QoS Configured (0x02) > CIG ID: 0x01 > CIS ID: 0x00 > ... > > when playback resumes on the phone, it attempts to set the ASE state to > Codec. However, since the stream has already transitioned from config to > qos, the phone ends up disconnecting the connection. > > bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 12 #1433 [hci0] > 60.216004 > ATT: Handle Value Notification (0x1b) len 7 > Handle: 0x0087 Type: ASE Control Point (0x2bc6) > Data[5]: 0101010000 > Opcode: Codec Configuration (0x01) > Number of ASE(s): 1 > ASE: #0 > ASE ID: 0x01 > ASE Response Code: Success (0x00) > ASE Response Reason: None (0x00) > bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1434 [hci0] > 60.226086 > ATT: Handle Value Notification (0x1b) len 46 > Handle: 0x007b Type: Sink ASE (0x2bc4) > Data[44]: > 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 > ASE ID: 1 > State: Codec Configured (0x01) > Framing: Unframed PDUs supported (0x00) > PHY: 0x02 > LE 2M PHY preffered (0x02) > RTN: 5 > Max Transport Latency: 10 > Presentation Delay Min: 20000 us > Presentation Delay Max: 40000 us > Preferred Presentation Delay Min: 20000 us > Preferred Presentation Delay Max: 40000 us > Codec: LC3 (0x06) > Codec Specific Configuration: #0: len 0x02 type 0x01 > Sampling Frequency: 16 Khz (0x03) > Codec Specific Configuration: #1: len 0x02 type 0x02 > Frame Duration: 10 ms (0x01) > Codec Specific Configuration: #2: len 0x05 type 0x03 > Location: 0x00000003 > Front Left (0x00000001) > Front Right (0x00000002) > Codec Specific Configuration: #3: len 0x03 type 0x04 > Frame Length: 40 (0x0028) > Codec Specific Configuration: #4: len 0x02 type 0x05 > Frame Blocks per SDU: 1 (0x01) > > ... > > > HCI Event: Disconnect Complete (0x05) plen 4 #1445 [hci0] > 63.651497 > Status: Success (0x00) > Handle: 16 Address: 6A:AB:51:47:3B:80 (Resolvable) > Identity type: Random (0x01) > Identity: E8:D5:2B:59:57:A6 (Static) > Reason: Remote User Terminated Connection (0x13) > > Here is Pauli Virtanen’s analysis and solution: > https://lore.kernel.org/all/3ac16d0a7c5569bce0b28f18bc2245bef8ab64c2.camel@iki.fi/ > > AFAICS the bug appears to be: > > - bap.c:stream_disable() should do nothing if stream is > not ENABLING or STREAMING > > since it's called from bt_bap_stream_disable() which is called on > transport suspend which should be noop for BAP server if stream is > already gone. > > Next, I will attach the relevant btmon trace to the commit message. > > > >> Signed-off-by: Yang Li <yang.li@amlogic.com> > >> --- > >> Changes in v3: > >> - Optimizing the code > >> - Link to v2: https://patch.msgid.link/20250630-bap_for_big_sync_lost-v2-0-1491b608cda5@amlogic.com > >> > >> bap for big sync lost > >> > >> To: Linux Bluetooth <linux-bluetooth@vger.kernel.org> > >> Signed-off-by: Yang Li <yang.li@amlogic.com> > >> > >> Changes in v2: > >> - Add state check in stream_disable. > >> - Add type check in stream_io_disconnected. > >> - Link to v1: https://patch.msgid.link/20250624-bap_for_big_sync_lost-v1-1-0df90a0f55d0@amlogic.com > >> --- > >> src/shared/bap.c | 22 ++++++++++++++-------- > >> 1 file changed, 14 insertions(+), 8 deletions(-) > >> > >> diff --git a/src/shared/bap.c b/src/shared/bap.c > >> index 40e1c974b..1790b277b 100644 > >> --- a/src/shared/bap.c > >> +++ b/src/shared/bap.c > >> @@ -2131,14 +2131,20 @@ static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) > >> > >> ascs_ase_rsp_success(rsp, stream->ep->id); > >> > >> - /* Sink can autonomously transit to QOS while source needs to go to > >> - * Disabling until BT_ASCS_STOP is received. > >> - */ > >> - if (stream->ep->dir == BT_BAP_SINK) > >> - stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); > >> - > >> - if (stream->ep->dir == BT_BAP_SOURCE) > >> - stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); > >> + switch (stream->ep->state) { > >> + case BT_ASCS_ASE_STATE_ENABLING: > >> + case BT_ASCS_ASE_STATE_STREAMING: > >> + if (stream->ep->dir == BT_BAP_SINK) > >> + stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); > >> + else if (stream->ep->dir == BT_BAP_SOURCE) > >> + /* Sink can autonomously transit to QOS while source needs to go to > >> + * Disabling until BT_ASCS_STOP is received. > >> + */ > >> + stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); > >> + break; > >> + default: > >> + break; > >> + } > >> > >> return 0; > >> } > >> > >> --- > >> base-commit: 55a6763cde8a2309fd23a96479ee4cf2fc23a442 > >> change-id: 20250624-bap_for_big_sync_lost-63476c679dbb > >> > >> Best regards, > >> -- > >> Yang Li <yang.li@amlogic.com> > >> > >> > >> > > > > -- > > Luiz Augusto von Dentz -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable 2025-07-03 13:17 ` Luiz Augusto von Dentz @ 2025-07-04 1:16 ` Yang Li 0 siblings, 0 replies; 6+ messages in thread From: Yang Li @ 2025-07-04 1:16 UTC (permalink / raw) To: Luiz Augusto von Dentz; +Cc: Linux Bluetooth Hi, > [ EXTERNAL EMAIL ] > > Hi, > > On Thu, Jul 3, 2025 at 4:40 AM Yang Li <yang.li@amlogic.com> wrote: >> Hi Luzi, >>> [ EXTERNAL EMAIL ] >>> >>> Hi, >>> >>> On Tue, Jul 1, 2025 at 9:19 PM Yang Li via B4 Relay >>> <devnull+yang.li.amlogic.com@kernel.org> wrote: >>>> From: Yang Li <yang.li@amlogic.com> >>>> >>>> Add a state check so that stream_disable() is a no-op when the stream >>>> is not in ENABLING or STREAMING state. This prevents unexpected state >>>> transitions or redundant operations during cleanup. >>> What is the issue here, do you have traces, debug logs, etc? >> Regarding the Unicast caching configuration you mentioned, there is >> currently an issue in the code flow. The relevant log is shown below: >> >> When music is paused on the pixel 9 phone, the CIS link gets >> disconnected. As the transport state changes from ACTIVE to IDLE, the >> stream state transitions from config to qos. >> >> > HCI Event: Disconnect Complete (0x05) plen 4 #1425 [hci0] >> 49.572089 >> Status: Success (0x00) >> Handle: 512 Address: 6A:AB:51:47:3B:80 (Resolvable) >> Identity type: Random (0x01) >> Identity: E8:D5:2B:59:57:A6 (Static) >> Reason: Remote User Terminated Connection (0x13) >> bluetoothd[2313]: src/shared/bap.c:stream_io_disconnected() stream >> 0x1f9fc20 io disconnected >> bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream >> 0x1f9fc20 dir 0x01: releasing -> config >> bluetoothd[2313]: src/shared/bap.c:stream_notify() stream 0x1f9fc20 >> state 1 >> bluetoothd[2313]: profiles/audio/transport.c:bap_state_changed() >> stream 0x1f9fc20: releasing(6) -> config(1) >> bluetoothd[2313]: >> profiles/audio/transport.c:transport_update_playing() >> /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 State=TRANSPORT_STATE_ACTIVE >> Playing=0 >> bluetoothd[2313]: >> profiles/audio/transport.c:media_transport_remove_owner() Transport >> /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner :1.1 >> bluetoothd[2313]: profiles/audio/transport.c:media_owner_free() Owner >> :1.1 >> bluetoothd[2313]: >> profiles/audio/transport.c:media_transport_suspend() Transport >> /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1 Owner >> bluetoothd[2313]: profiles/audio/transport.c:transport_set_state() >> State changed /org/bluez/hci0/dev_6A_AB_51_47_3B_80/fd1: >> TRANSPORT_STATE_ACTIVE -> TRANSPORT_STATE_IDLE >> bluetoothd[2313]: src/shared/bap.c:stream_disable() stream 0x1f9fc20 >> bluetoothd[2313]: src/shared/bap.c:bap_ucast_set_state() stream >> 0x1f9fc20 dir 0x01: config -> qos > Ok, this indeed is not expected, that said we do have the following > checks already in place so we might as well update them: > > if (!stream || stream->ep->state == BT_BAP_STREAM_STATE_QOS || > stream->ep->state == BT_BAP_STREAM_STATE_IDLE) > return 0; Just to confirm — do you mean I should add a filter for BT_BAP_STREAM_STATE_CONFIG directly? If so, I’ll update it as follows: static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) { if (!stream || stream->ep->state == BT_BAP_STREAM_STATE_QOS || + stream->ep->state == BT_BAP_STREAM_STATE_CONFIG || stream->ep->state == BT_BAP_STREAM_STATE_IDLE) return 0; >> ATTbluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1426 >> [hci0] 49.585656 >> ATT: Handle Value Notification (0x1b) len 46 >> Handle: 0x007b Type: Sink ASE (0x2bc4) >> Data[44]: >> 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 >> ASE ID: 1 >> State: Codec Configured (0x01) >> Framing: Unframed PDUs supported (0x00) >> PHY: 0x02 >> LE 2M PHY preffered (0x02) >> RTN: 5 >> Max Transport Latency: 10 >> Presentation Delay Min: 20000 us >> ... >> bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 24 #1427 [hci0] >> 49.585725 >> ATT: Handle Value Notification (0x1b) len 19 >> Handle: 0x007b Type: Sink ASE (0x2bc4) >> Data[17]: 0102010010270000025000050a00204e00 >> ASE ID: 1 >> State: QoS Configured (0x02) >> CIG ID: 0x01 >> CIS ID: 0x00 >> ... >> >> when playback resumes on the phone, it attempts to set the ASE state to >> Codec. However, since the stream has already transitioned from config to >> qos, the phone ends up disconnecting the connection. >> >> bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 12 #1433 [hci0] >> 60.216004 >> ATT: Handle Value Notification (0x1b) len 7 >> Handle: 0x0087 Type: ASE Control Point (0x2bc6) >> Data[5]: 0101010000 >> Opcode: Codec Configuration (0x01) >> Number of ASE(s): 1 >> ASE: #0 >> ASE ID: 0x01 >> ASE Response Code: Success (0x00) >> ASE Response Reason: None (0x00) >> bluetoothd[2313]: < ACL Data TX: H.. flags 0x00 dlen 51 #1434 [hci0] >> 60.226086 >> ATT: Handle Value Notification (0x1b) len 46 >> Handle: 0x007b Type: Sink ASE (0x2bc4) >> Data[44]: >> 01010002050a00204e00409c00204e00409c0006000000001302010302020105030300000003042800020501 >> ASE ID: 1 >> State: Codec Configured (0x01) >> Framing: Unframed PDUs supported (0x00) >> PHY: 0x02 >> LE 2M PHY preffered (0x02) >> RTN: 5 >> Max Transport Latency: 10 >> Presentation Delay Min: 20000 us >> Presentation Delay Max: 40000 us >> Preferred Presentation Delay Min: 20000 us >> Preferred Presentation Delay Max: 40000 us >> Codec: LC3 (0x06) >> Codec Specific Configuration: #0: len 0x02 type 0x01 >> Sampling Frequency: 16 Khz (0x03) >> Codec Specific Configuration: #1: len 0x02 type 0x02 >> Frame Duration: 10 ms (0x01) >> Codec Specific Configuration: #2: len 0x05 type 0x03 >> Location: 0x00000003 >> Front Left (0x00000001) >> Front Right (0x00000002) >> Codec Specific Configuration: #3: len 0x03 type 0x04 >> Frame Length: 40 (0x0028) >> Codec Specific Configuration: #4: len 0x02 type 0x05 >> Frame Blocks per SDU: 1 (0x01) >> >> ... >> >> > HCI Event: Disconnect Complete (0x05) plen 4 #1445 [hci0] >> 63.651497 >> Status: Success (0x00) >> Handle: 16 Address: 6A:AB:51:47:3B:80 (Resolvable) >> Identity type: Random (0x01) >> Identity: E8:D5:2B:59:57:A6 (Static) >> Reason: Remote User Terminated Connection (0x13) >> >> Here is Pauli Virtanen’s analysis and solution: >> https://lore.kernel.org/all/3ac16d0a7c5569bce0b28f18bc2245bef8ab64c2.camel@iki.fi/ >> >> AFAICS the bug appears to be: >> >> - bap.c:stream_disable() should do nothing if stream is >> not ENABLING or STREAMING >> >> since it's called from bt_bap_stream_disable() which is called on >> transport suspend which should be noop for BAP server if stream is >> already gone. >> >> Next, I will attach the relevant btmon trace to the commit message. >>>> Signed-off-by: Yang Li <yang.li@amlogic.com> >>>> --- >>>> Changes in v3: >>>> - Optimizing the code >>>> - Link to v2: https://patch.msgid.link/20250630-bap_for_big_sync_lost-v2-0-1491b608cda5@amlogic.com >>>> >>>> bap for big sync lost >>>> >>>> To: Linux Bluetooth <linux-bluetooth@vger.kernel.org> >>>> Signed-off-by: Yang Li <yang.li@amlogic.com> >>>> >>>> Changes in v2: >>>> - Add state check in stream_disable. >>>> - Add type check in stream_io_disconnected. >>>> - Link to v1: https://patch.msgid.link/20250624-bap_for_big_sync_lost-v1-1-0df90a0f55d0@amlogic.com >>>> --- >>>> src/shared/bap.c | 22 ++++++++++++++-------- >>>> 1 file changed, 14 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/src/shared/bap.c b/src/shared/bap.c >>>> index 40e1c974b..1790b277b 100644 >>>> --- a/src/shared/bap.c >>>> +++ b/src/shared/bap.c >>>> @@ -2131,14 +2131,20 @@ static uint8_t stream_disable(struct bt_bap_stream *stream, struct iovec *rsp) >>>> >>>> ascs_ase_rsp_success(rsp, stream->ep->id); >>>> >>>> - /* Sink can autonomously transit to QOS while source needs to go to >>>> - * Disabling until BT_ASCS_STOP is received. >>>> - */ >>>> - if (stream->ep->dir == BT_BAP_SINK) >>>> - stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); >>>> - >>>> - if (stream->ep->dir == BT_BAP_SOURCE) >>>> - stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); >>>> + switch (stream->ep->state) { >>>> + case BT_ASCS_ASE_STATE_ENABLING: >>>> + case BT_ASCS_ASE_STATE_STREAMING: >>>> + if (stream->ep->dir == BT_BAP_SINK) >>>> + stream_set_state(stream, BT_BAP_STREAM_STATE_QOS); >>>> + else if (stream->ep->dir == BT_BAP_SOURCE) >>>> + /* Sink can autonomously transit to QOS while source needs to go to >>>> + * Disabling until BT_ASCS_STOP is received. >>>> + */ >>>> + stream_set_state(stream, BT_BAP_STREAM_STATE_DISABLING); >>>> + break; >>>> + default: >>>> + break; >>>> + } >>>> >>>> return 0; >>>> } >>>> >>>> --- >>>> base-commit: 55a6763cde8a2309fd23a96479ee4cf2fc23a442 >>>> change-id: 20250624-bap_for_big_sync_lost-63476c679dbb >>>> >>>> Best regards, >>>> -- >>>> Yang Li <yang.li@amlogic.com> >>>> >>>> >>>> >>> -- >>> Luiz Augusto von Dentz > > > -- > Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-07-04 1:16 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-07-02 1:15 [PATCH BlueZ bluez v3] shared/bap: Add stream state check in stream_disable Yang Li via B4 Relay 2025-07-02 3:54 ` [BlueZ,bluez,v3] " bluez.test.bot 2025-07-02 13:01 ` [PATCH BlueZ bluez v3] " Luiz Augusto von Dentz 2025-07-03 8:40 ` Yang Li 2025-07-03 13:17 ` Luiz Augusto von Dentz 2025-07-04 1:16 ` Yang Li
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox