Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FF33C433FE for ; Wed, 27 Oct 2021 22:18:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0243960EBD for ; Wed, 27 Oct 2021 22:18:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230240AbhJ0WUu (ORCPT ); Wed, 27 Oct 2021 18:20:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbhJ0WUq (ORCPT ); Wed, 27 Oct 2021 18:20:46 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01A72C061243 for ; Wed, 27 Oct 2021 15:18:20 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id h193so4396597pgc.1 for ; Wed, 27 Oct 2021 15:18:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qbiAN6Jt4wR1xIQGLgqHIDqvML8Rxz+hL540BjfKGOU=; b=buhPj7atolJ9wWdLIPZwcsrIxPvhrK9La8Ft4lH9pbwBFJTGF5iLCL1ayqf2kBl6AC TvVPgI9lnoIqMvPr134h5TssVrgiGtkQQNn28a6rYNAahoak+WJu/hMQqohFmfCyLB+o /c+zxtxxPEbPQlXleS5HYUjpp3aYRz1nXVeftvxp6h2ZzsGtcxNUjFoH5wL3S353T53h IdMQglqguxTgBg3FM8LMrhDYMO+xUALXk4KfMhyDTctZsmsuYXT2WAe/e9c6BXnbn+Yr thTINdmuTjH3qstlboyVWbfNw7WbwDs1aGXFWcC24i46avWiyNgBcV/wPl6gwqhiFP/y IFTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qbiAN6Jt4wR1xIQGLgqHIDqvML8Rxz+hL540BjfKGOU=; b=5DZHYp3eR3n+xzd9Yhxpe1DOlGpAydUHr8uGZcsBqTEIaYEAx0CaX3n+rMXkS1ZY3S uUeFid9gTPnmyT8EAi8oIwd5JrI03OMijI/FHN0xFb8v0wyB2oPOjrtPSRyWhDiCQS6M i3fJgDYD+btQ8xNi6w6e4WrnNI2d7yeKJ2Ts3yEBIRfDJt+jJHWuNQ+J108CbbYb4vjT Gf7jsAKyu/FzCeroo623BDcdeJ8QGlybqODl173UXMPsKSnpKb0gU3pt8vfzE6eUnK7P Lb7d4RDmUFWTcUcusJro6lhtes6JzaBUV0qwPt9WG85rS8+JriB19PFJ8oiXUNoHn8pt sJyw== X-Gm-Message-State: AOAM530gO8ukAWKtyEYrTi438g6n/jc0u1hZh7I5OIo1leVBPGAT+/47 gsmoQkXH+o0gNpbiyt/lfXsRC8GUKg4= X-Google-Smtp-Source: ABdhPJzCjmWy3h2WrGcI2a/TAojLpQ0AUXrwJ/zEAaU8wHTkQyeG7HC6lP64boeUSsF1e9J0D8DMXw== X-Received: by 2002:a63:7e48:: with SMTP id o8mr339509pgn.157.1635373100103; Wed, 27 Oct 2021 15:18:20 -0700 (PDT) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id a25sm902760pfl.115.2021.10.27.15.18.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 15:18:19 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v7 19/23] Bluetooth: hci_sync: Convert MGMT_OP_SET_ADVERTISING Date: Wed, 27 Oct 2021 15:17:58 -0700 Message-Id: <20211027221802.1851851-20-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027221802.1851851-1-luiz.dentz@gmail.com> References: <20211027221802.1851851-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Brian Gix mgmt-test paths: Set powered on - Privacy and Advertising Set Advertising on - Success 2 Set Advertising on - Appearance 1 Set Advertising on - Local name 1 Set Advertising on - Name + Appear 1 Add Advertising - Success 4 Add Advertising - Success 5 Add Ext Advertising - Success 4 Add Ext Advertising - Success 5 Signed-off-by: Brian Gix --- net/bluetooth/mgmt.c | 103 ++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 9baa19d24475..391d87f85294 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -5608,29 +5608,25 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data, return err; } -static void enable_advertising_instance(struct hci_dev *hdev, u8 status, - u16 opcode) +static void enable_advertising_instance(struct hci_dev *hdev, int err) { - bt_dev_dbg(hdev, "status %u", status); + if (err) + bt_dev_err(hdev, "failed to re-configure advertising %d", err); + else + bt_dev_dbg(hdev, "status %d", err); } -static void set_advertising_complete(struct hci_dev *hdev, u8 status, - u16 opcode) +static void set_advertising_complete(struct hci_dev *hdev, void *data, int err) { struct cmd_lookup match = { NULL, hdev }; - struct hci_request req; u8 instance; struct adv_info *adv_instance; - int err; - - hci_dev_lock(hdev); + u8 status = mgmt_status(err); if (status) { - u8 mgmt_err = mgmt_status(status); - mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, - cmd_status_rsp, &mgmt_err); - goto unlock; + cmd_status_rsp, &status); + return; } if (hci_dev_test_flag(hdev, HCI_LE_ADV)) @@ -5662,30 +5658,55 @@ static void set_advertising_complete(struct hci_dev *hdev, u8 status, */ if (hci_dev_test_flag(hdev, HCI_ADVERTISING) || list_empty(&hdev->adv_instances)) - goto unlock; + return; instance = hdev->cur_adv_instance; if (!instance) { adv_instance = list_first_entry_or_null(&hdev->adv_instances, struct adv_info, list); if (!adv_instance) - goto unlock; + return; instance = adv_instance->instance; } - hci_req_init(&req, hdev); + err = hci_schedule_adv_instance_sync(hdev, instance, true); + + enable_advertising_instance(hdev, err); +} - err = __hci_req_schedule_adv_instance(&req, instance, true); +static int set_adv_sync(struct hci_dev *hdev, void *data) +{ + struct mgmt_pending_cmd *cmd = data; + struct mgmt_mode *cp = cmd->param; + u8 val = !!cp->val; - if (!err) - err = hci_req_run(&req, enable_advertising_instance); + if (cp->val == 0x02) + hci_dev_set_flag(hdev, HCI_ADVERTISING_CONNECTABLE); + else + hci_dev_clear_flag(hdev, HCI_ADVERTISING_CONNECTABLE); - if (err) - bt_dev_err(hdev, "failed to re-configure advertising"); + cancel_adv_timeout(hdev); -unlock: - hci_dev_unlock(hdev); + if (val) { + /* Switch to instance "0" for the Set Advertising setting. + * We cannot use update_[adv|scan_rsp]_data() here as the + * HCI_ADVERTISING flag is not yet set. + */ + hdev->cur_adv_instance = 0x00; + + if (ext_adv_capable(hdev)) { + hci_start_ext_adv_sync(hdev, 0x00); + } else { + hci_update_adv_data_sync(hdev, 0x00); + hci_update_scan_rsp_data_sync(hdev, 0x00); + hci_enable_advertising_sync(hdev); + } + } else { + hci_disable_advertising_sync(hdev); + } + + return 0; } static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data, @@ -5693,7 +5714,6 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data, { struct mgmt_mode *cp = data; struct mgmt_pending_cmd *cmd; - struct hci_request req; u8 val, status; int err; @@ -5759,40 +5779,13 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data, } cmd = mgmt_pending_add(sk, MGMT_OP_SET_ADVERTISING, hdev, data, len); - if (!cmd) { + if (!cmd) err = -ENOMEM; - goto unlock; - } - - hci_req_init(&req, hdev); - - if (cp->val == 0x02) - hci_dev_set_flag(hdev, HCI_ADVERTISING_CONNECTABLE); else - hci_dev_clear_flag(hdev, HCI_ADVERTISING_CONNECTABLE); - - cancel_adv_timeout(hdev); + err = hci_cmd_sync_queue(hdev, set_adv_sync, cmd, + set_advertising_complete); - if (val) { - /* Switch to instance "0" for the Set Advertising setting. - * We cannot use update_[adv|scan_rsp]_data() here as the - * HCI_ADVERTISING flag is not yet set. - */ - hdev->cur_adv_instance = 0x00; - - if (ext_adv_capable(hdev)) { - __hci_req_start_ext_adv(&req, 0x00); - } else { - __hci_req_update_adv_data(&req, 0x00); - __hci_req_update_scan_rsp_data(&req, 0x00); - __hci_req_enable_advertising(&req); - } - } else { - __hci_req_disable_advertising(&req); - } - - err = hci_req_run(&req, set_advertising_complete); - if (err < 0) + if (err < 0 && cmd) mgmt_pending_remove(cmd); unlock: -- 2.31.1