| Message ID | 20210802235619.238065-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND,1/2] Bluetooth: HCI: Add proper tracking for enable status of adv instances | expand |
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=525275 ---Test result--- Test Summary: CheckPatch PASS 1.31 seconds GitLint PASS 0.20 seconds BuildKernel PASS 512.06 seconds TestRunner: Setup PASS 338.65 seconds TestRunner: l2cap-tester PASS 2.52 seconds TestRunner: bnep-tester PASS 1.89 seconds TestRunner: mgmt-tester PASS 29.91 seconds TestRunner: rfcomm-tester PASS 2.06 seconds TestRunner: sco-tester PASS 2.01 seconds TestRunner: smp-tester FAIL 2.09 seconds TestRunner: userchan-tester PASS 1.91 seconds Details ############################## Test: CheckPatch - PASS - 1.31 seconds Run checkpatch.pl script with rule in .checkpatch.conf ############################## Test: GitLint - PASS - 0.20 seconds Run gitlint with rule in .gitlint ############################## Test: BuildKernel - PASS - 512.06 seconds Build Kernel with minimal configuration supports Bluetooth ############################## Test: TestRunner: Setup - PASS - 338.65 seconds Setup environment for running Test Runner ############################## Test: TestRunner: l2cap-tester - PASS - 2.52 seconds Run test-runner with l2cap-tester Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: bnep-tester - PASS - 1.89 seconds Run test-runner with bnep-tester Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: mgmt-tester - PASS - 29.91 seconds Run test-runner with mgmt-tester Total: 448, Passed: 445 (99.3%), Failed: 0, Not Run: 3 ############################## Test: TestRunner: rfcomm-tester - PASS - 2.06 seconds Run test-runner with rfcomm-tester Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: sco-tester - PASS - 2.01 seconds Run test-runner with sco-tester Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0 ############################## Test: TestRunner: smp-tester - FAIL - 2.09 seconds Run test-runner with smp-tester Total: 8, Passed: 7 (87.5%), Failed: 1, Not Run: 0 Failed Test Cases SMP Client - SC Request 2 Failed 0.029 seconds ############################## Test: TestRunner: userchan-tester - PASS - 1.91 seconds Run test-runner with userchan-tester Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0 --- Regards, Linux Bluetooth
Hi Luiz, > This adds a field to track if advertising instances are enabled or not > and only clear HCI_LE_ADV flag if there is no instance left advertising. > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > --- > include/net/bluetooth/hci_core.h | 1 + > net/bluetooth/hci_event.c | 28 ++++++++++++++++++++++++++++ > 2 files changed, 29 insertions(+) patch has been applied to bluetooth-next tree. Regards Marcel
Hi Luiz, > Code was checking if random_addr and hdev->rpa match without first > checking if the RPA has not been set (BDADDR_ANY), furthermore it was > clearing HCI_RPA_EXPIRED before the command completes and the RPA is > actually programmed which in case of failure would leave the expired > RPA still set. > > Since advertising instance have a similar problem the clearing of > HCI_RPA_EXPIRED has been moved to hci_event.c after checking the random > address is in fact the hdev->rap and then proceed to set the expire > timeout. > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > --- > include/net/bluetooth/hci_core.h | 4 ++ > net/bluetooth/hci_event.c | 32 +++++++++---- > net/bluetooth/hci_request.c | 81 ++++++++++++++------------------ > 3 files changed, 61 insertions(+), 56 deletions(-) patch has been applied to bluetooth-next tree. Regards Marcel
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 4abe3c494002..b79b31359bf8 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -221,6 +221,7 @@ struct oob_data { struct adv_info { struct list_head list; + bool enabled; bool pending; __u8 instance; __u32 flags; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ea7fc09478be..35c5cc9f91b0 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1277,7 +1277,9 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) { struct hci_cp_le_set_ext_adv_enable *cp; + struct hci_cp_ext_adv_set *set; __u8 status = *((__u8 *) skb->data); + struct adv_info *adv = NULL, *n; BT_DBG("%s status 0x%2.2x", hdev->name, status); @@ -1288,22 +1290,48 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev, if (!cp) return; + set = (void *)cp->data; + hci_dev_lock(hdev); + if (cp->num_of_sets) + adv = hci_find_adv_instance(hdev, set->handle); + if (cp->enable) { struct hci_conn *conn; hci_dev_set_flag(hdev, HCI_LE_ADV); + if (adv) + adv->enabled = true; + conn = hci_lookup_le_connect(hdev); if (conn) queue_delayed_work(hdev->workqueue, &conn->le_conn_timeout, conn->conn_timeout); } else { + if (adv) { + adv->enabled = false; + /* If just one instance was disabled check if there are + * any other instance enabled before clearing HCI_LE_ADV + */ + list_for_each_entry_safe(adv, n, &hdev->adv_instances, + list) { + if (adv->enabled) + goto unlock; + } + } else { + /* All instances shall be considered disabled */ + list_for_each_entry_safe(adv, n, &hdev->adv_instances, + list) + adv->enabled = false; + } + hci_dev_clear_flag(hdev, HCI_LE_ADV); } +unlock: hci_dev_unlock(hdev); }