* [PATCH v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
@ 2025-12-10 20:50 Luiz Augusto von Dentz
2025-12-10 21:39 ` [v1] " bluez.test.bot
2025-12-11 19:40 ` [PATCH v1] " patchwork-bot+bluetooth
0 siblings, 2 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2025-12-10 20:50 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
conn->le_{tx,rx}_phy is not actually a bitfield as it set by
HCI_EV_LE_PHY_UPDATE_COMPLETE it is actually correspond to the current
PHY in use not what is supported by the controller, so this introduces
different fields (conn->le_{tx,rx}_def_phys) to track what PHYs are
supported by the connection.
Fixes: eab2404ba798 ("Bluetooth: Add BT_PHY socket option")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_conn.c | 17 +++++++++++------
net/bluetooth/hci_event.c | 26 +++++++++++++++++++++++---
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 4263e71a23ef..8aadf4cdead2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -730,6 +730,8 @@ struct hci_conn {
__u16 le_per_adv_data_offset;
__u8 le_adv_phy;
__u8 le_adv_sec_phy;
+ __u8 le_tx_def_phys;
+ __u8 le_rx_def_phys;
__u8 le_tx_phy;
__u8 le_rx_phy;
__s8 rssi;
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index c3f7828bf9d5..5a4374ccf8e8 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1008,6 +1008,11 @@ static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,
/* conn->src should reflect the local identity address */
hci_copy_identity_address(hdev, &conn->src, &conn->src_type);
conn->mtu = hdev->le_mtu ? hdev->le_mtu : hdev->acl_mtu;
+ /* Use the controller supported PHYS as default until the
+ * remote features are resolved.
+ */
+ conn->le_tx_def_phys = hdev->le_tx_def_phys;
+ conn->le_rx_def_phys = hdev->le_tx_def_phys;
break;
case CIS_LINK:
/* conn->src should reflect the local identity address */
@@ -2928,22 +2933,22 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
break;
case LE_LINK:
- if (conn->le_tx_phy & HCI_LE_SET_PHY_1M)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_1M)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_RX;
- if (conn->le_tx_phy & HCI_LE_SET_PHY_2M)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_2M)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_RX;
- if (conn->le_tx_phy & HCI_LE_SET_PHY_CODED)
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_TX;
- if (conn->le_rx_phy & HCI_LE_SET_PHY_CODED)
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_RX;
break;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a9868f17ef40..bc3a90600d73 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6607,8 +6607,18 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, void *data,
conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
if (conn) {
- if (!ev->status)
- memcpy(conn->features[0], ev->features, 8);
+ if (!ev->status) {
+ memcpy(conn->le_features, ev->features, 8);
+
+ /* Update supported PHYs */
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_2M &&
+ !(conn->le_features[1] & HCI_LE_PHY_2M))
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_2M;
+
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_CODED &&
+ !(conn->le_features[1] & HCI_LE_PHY_CODED))
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ }
if (conn->state == BT_CONFIG) {
__u8 status;
@@ -7221,9 +7231,19 @@ static void hci_le_read_all_remote_features_evt(struct hci_dev *hdev,
if (!conn)
goto unlock;
- if (!ev->status)
+ if (!ev->status) {
memcpy(conn->le_features, ev->features, 248);
+ /* Update supported PHYs */
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_2M &&
+ !(conn->le_features[1] & HCI_LE_PHY_2M))
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_2M;
+
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_CODED &&
+ !(conn->le_features[1] & HCI_LE_PHY_CODED))
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_CODED;
+ }
+
if (conn->state == BT_CONFIG) {
__u8 status;
--
2.52.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
2025-12-10 20:50 [PATCH v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs Luiz Augusto von Dentz
@ 2025-12-10 21:39 ` bluez.test.bot
2025-12-11 19:40 ` [PATCH v1] " patchwork-bot+bluetooth
1 sibling, 0 replies; 3+ messages in thread
From: bluez.test.bot @ 2025-12-10 21:39 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 2874 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=1032101
---Test result---
Test Summary:
CheckPatch PENDING 0.47 seconds
GitLint PENDING 0.31 seconds
SubjectPrefix PASS 0.10 seconds
BuildKernel PASS 25.13 seconds
CheckAllWarning PASS 27.29 seconds
CheckSparse WARNING 30.65 seconds
BuildKernel32 PASS 24.83 seconds
TestRunnerSetup PASS 552.20 seconds
TestRunner_l2cap-tester PASS 24.00 seconds
TestRunner_iso-tester PASS 85.38 seconds
TestRunner_bnep-tester PASS 6.22 seconds
TestRunner_mgmt-tester FAIL 126.02 seconds
TestRunner_rfcomm-tester PASS 9.44 seconds
TestRunner_sco-tester FAIL 14.66 seconds
TestRunner_ioctl-tester PASS 10.16 seconds
TestRunner_mesh-tester FAIL 11.49 seconds
TestRunner_smp-tester PASS 8.61 seconds
TestRunner_userchan-tester PASS 6.55 seconds
IncrementalBuild PENDING 0.64 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 488 (98.8%), Failed: 2, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.106 seconds
LL Privacy - Set Flags 3 (2 Devices to RL) Failed 0.180 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
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.858 seconds
Mesh - Send cancel - 2 Timed out 1.997 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
2025-12-10 20:50 [PATCH v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs Luiz Augusto von Dentz
2025-12-10 21:39 ` [v1] " bluez.test.bot
@ 2025-12-11 19:40 ` patchwork-bot+bluetooth
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+bluetooth @ 2025-12-11 19:40 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:
On Wed, 10 Dec 2025 15:50:12 -0500 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> conn->le_{tx,rx}_phy is not actually a bitfield as it set by
> HCI_EV_LE_PHY_UPDATE_COMPLETE it is actually correspond to the current
> PHY in use not what is supported by the controller, so this introduces
> different fields (conn->le_{tx,rx}_def_phys) to track what PHYs are
> supported by the connection.
>
> [...]
Here is the summary with links:
- [v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs
https://git.kernel.org/bluetooth/bluetooth-next/c/305c1c5dd5f4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-11 19:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-10 20:50 [PATCH v1] Bluetooth: hci_conn: Fix using conn->le_{tx,rx}_phy as supported PHYs Luiz Augusto von Dentz
2025-12-10 21:39 ` [v1] " bluez.test.bot
2025-12-11 19:40 ` [PATCH v1] " patchwork-bot+bluetooth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).