Bluetooth: MGMT: Fix Set PHY Configuration command
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/2 Bluetooth: MGMT: Fix Set PHY Configuration command
From: Luiz Augusto von Dentz <[email protected]>
The command shall accept any subset that is considered configurable but instead it was only accepting the exact match causing errors such as:
[mgmt]# phy
Supported phys: BR1M1SLOT BR1M3SLOT BR1M5SLOT EDR2M1SLOT EDR2M3SLOT EDR2M5SLOT EDR3M1SLOT EDR3M3SLOT EDR3M5SLOT LE1MTX LE1MRX LE2MTX LE2MRX LECODEDTX LECODEDRX
Configurable phys: BR1M3SLOT BR1M5SLOT EDR2M1SLOT EDR2M3SLOT EDR2M5SLOT EDR3M1SLOT EDR3M3SLOT EDR3M5SLOT LE2MTX LE2MRX LECODEDTX LECODEDRX Selected phys: BR1M1SLOT BR1M3SLOT BR1M5SLOT EDR2M1SLOT EDR2M3SLOT EDR2M5SLOT EDR3M1SLOT EDR3M3SLOT EDR3M5SLOT LE1MTX LE1MRX [mgmt]# phy BR1M3SLOT BR1M5SLOT EDR2M1SLOT EDR2M3SLOT EDR2M5SLOT EDR3M1SLOT EDR3M3SLOT EDR3M5SLOT LE2MTX LE2MRX
Could not set PHY Configuration with status 0x0d (Invalid Parameters)
--- net/bluetooth/mgmt.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
net/bluetooth/mgmt.c +5 -13
@@ -4020,8 +4020,8 @@ static int set_default_phy_sync(struct hci_dev *hdev, void *data)if (!(selected_phys &MGMT_PHY_LE_RX_MASK )) cp_phy.all_phys |=0x02 ; -if (selected_phys &MGMT_PHY_LE_1M_TX ) - cp_phy.tx_phys |=HCI_LE_SET_PHY_1M ; +/* 1M PHY shall always be supported */ + cp_phy.tx_phys |=HCI_LE_SET_PHY_1M ;if (selected_phys &MGMT_PHY_LE_2M_TX ) cp_phy.tx_phys |=HCI_LE_SET_PHY_2M ;
@@ -4029,8 +4029,8 @@ static int set_default_phy_sync(struct hci_dev *hdev, void *data)if (selected_phys &MGMT_PHY_LE_CODED_TX ) cp_phy.tx_phys |=HCI_LE_SET_PHY_CODED ; -if (selected_phys &MGMT_PHY_LE_1M_RX ) - cp_phy.rx_phys |=HCI_LE_SET_PHY_1M ; +/* 1M PHY shall always be supported */ + cp_phy.rx_phys |=HCI_LE_SET_PHY_1M ;if (selected_phys &MGMT_PHY_LE_2M_RX ) cp_phy.rx_phys |=HCI_LE_SET_PHY_2M ;
@@ -4049,14 +4049,13 @@ static int set_phy_configuration(struct sock *sk, struct hci_dev *hdev, {struct mgmt_cp_set_phy_configuration *cp = data;struct mgmt_pending_cmd *cmd; -u32 selected_phys, configurable_phys, supported_phys, unconfigure_phys; +u32 selected_phys, supported_phys;u16 pkt_type = (HCI_DH1 |HCI_DM1 );bool changed = false;int err;bt_dev_dbg (hdev,"sock %p" , sk); - configurable_phys =get_configurable_phys (hdev); supported_phys =get_supported_phys (hdev); selected_phys =__le32_to_cpu (cp->selected_phys);
@@ -4065,13 +4064,6 @@ static int set_phy_configuration(struct sock *sk, struct hci_dev *hdev,MGMT_OP_SET_PHY_CONFIGURATION , MGMT_STATUS_INVALID_PARAMS); - unconfigure_phys = supported_phys & ~configurable_phys; - -if ((selected_phys & unconfigure_phys) != unconfigure_phys) -return mgmt_cmd_status (sk, hdev->id, -MGMT_OP_SET_PHY_CONFIGURATION , -MGMT_STATUS_INVALID_PARAMS ); -if (selected_phys ==get_selected_phys (hdev)) return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_PHY_CONFIGURATION,
Signature · 1 line
2.37.2
Luiz Augusto von Dentz
maintainerPATCH v2 2/2 Bluetooth: Enable all supported LE PHY by default
From: Luiz Augusto von Dentz <[email protected]>
This enables 2M and Coded PHY by default if they are marked as supported in the LE features bits.
--- include/net/bluetooth/hci_core.h | 4 ++++ net/bluetooth/hci_sync.c | 28 ++++++++++++++++++++++++---- net/bluetooth/mgmt.c | 4 ++-- 3 files changed, 30 insertions(+), 6 deletions(-)
include/net/bluetooth/hci_core.h +4 -0
@@ -1665,9 +1665,13 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define scan_1m (dev) (((dev)->le_tx_def_phys & HCI_LE_SET_PHY_1M) || \ ((dev)->le_rx_def_phys & HCI_LE_SET_PHY_1M)) +#define le_2m_capable (dev) (((dev)->le_features[1] & HCI_LE_PHY_2M)) +#define scan_2m (dev) (((dev)->le_tx_def_phys & HCI_LE_SET_PHY_2M) || \ ((dev)->le_rx_def_phys & HCI_LE_SET_PHY_2M)) +#define le_coded_capable (dev) (((dev)->le_features[1] & HCI_LE_PHY_CODED)) +#define scan_coded (dev) (((dev)->le_tx_def_phys & HCI_LE_SET_PHY_CODED) || \ ((dev)->le_rx_def_phys & HCI_LE_SET_PHY_CODED))
net/bluetooth/hci_sync.c +24 -4
@@ -4348,18 +4348,38 @@ static int hci_le_set_write_def_data_len_sync(struct hci_dev *hdev) sizeof(cp), &cp, HCI_CMD_TIMEOUT); } -/* Set Default PHY parameters if command is supported */ +/* Set Default PHY parameters if command is supported, enables all supported +* PHYs according to the LE Features bits. +*/ static int hci_le_set_default_phy_sync (struct hci_dev *hdev) {struct hci_cp_le_set_default_phy cp; -if (!(hdev->commands[35 ] &0x20 )) +if (!(hdev->commands[35 ] &0x20 )) { +/* If the command is not supported it means only 1M PHY is +* supported. +*/ + hdev->le_tx_def_phys =HCI_LE_SET_PHY_1M ; + hdev->le_rx_def_phys =HCI_LE_SET_PHY_1M ;return 0 ; + }memset (&cp,0 ,sizeof (cp)); cp.all_phys =0x00 ; - cp.tx_phys = hdev->le_tx_def_phys; - cp.rx_phys = hdev->le_rx_def_phys; + cp.tx_phys =HCI_LE_SET_PHY_1M ; + cp.rx_phys =HCI_LE_SET_PHY_1M ; + +/* Enables 2M PHY if supported */ +if (le_2m_capable (hdev)) { + cp.tx_phys |=HCI_LE_SET_PHY_2M ; + cp.rx_phys |=HCI_LE_SET_PHY_2M ; + } + +/* Enables Coded PHY if supported */ +if (le_coded_capable (hdev)) { + cp.tx_phys |=HCI_LE_SET_PHY_CODED ; + cp.rx_phys |=HCI_LE_SET_PHY_CODED ; + }return __hci_cmd_sync_status (hdev,HCI_OP_LE_SET_DEFAULT_PHY ,sizeof (cp), &cp,HCI_CMD_TIMEOUT );
net/bluetooth/mgmt.c +2 -2
@@ -8380,10 +8380,10 @@ static u32 get_supported_adv_flags(struct hci_dev *hdev) flags |=MGMT_ADV_FLAG_HW_OFFLOAD ; flags |=MGMT_ADV_FLAG_CAN_SET_TX_POWER ; -if (hdev->le_features[1 ] &HCI_LE_PHY_2M ) +if (le_2m_capable (hdev)) flags |=MGMT_ADV_FLAG_SEC_2M ; -if (hdev->le_features[1 ] &HCI_LE_PHY_CODED ) +if (le_coded_capable (hdev)) flags |=MGMT_ADV_FLAG_SEC_CODED ; }
Signature · 1 line
2.37.2
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=675023
---Test result---
Test Summary:
CheckPatch PASS 3.90 seconds GitLint PASS 1.73 seconds SubjectPrefix PASS 1.33 seconds BuildKernel PASS 48.30 seconds BuildKernel32 PASS 43.32 seconds Incremental Build with patchesPASS 103.45 seconds TestRunner: Setup PASS 716.81 seconds TestRunner: l2cap-tester PASS 21.36 seconds TestRunner: iso-tester PASS 22.48 seconds TestRunner: bnep-tester PASS 8.75 seconds TestRunner: mgmt-tester FAIL 140.53 seconds TestRunner: rfcomm-tester PASS 13.52 seconds TestRunner: sco-tester PASS 12.75 seconds TestRunner: smp-tester PASS 12.71 seconds TestRunner: userchan-tester PASS 9.03 seconds
Details
##############################
Test: TestRunner: mgmt-tester - FAIL - 140.53 seconds Run test-runner with mgmt-tester
Total: 494, Passed: 491 (99.4%), Failed: 3, Not Run: 0
Failed Test Cases
Get PHY Success Failed 0.164 seconds Set PHY 1m 2m coded Succcess Timed out 2.716 seconds Start Discovery LE - (Ext Scan Param) Failed 0.188 seconds
---
Regards,
Linux Bluetooth