From patchwork Tue Jun 9 14:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Michaud X-Patchwork-Id: 11595775 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A8BB92A for ; Tue, 9 Jun 2020 14:04:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F00C207C3 for ; Tue, 9 Jun 2020 14:04:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="XRN2mSgB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730250AbgFIOEN (ORCPT ); Tue, 9 Jun 2020 10:04:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726967AbgFIOEM (ORCPT ); Tue, 9 Jun 2020 10:04:12 -0400 Received: from mail-vs1-xe44.google.com (mail-vs1-xe44.google.com [IPv6:2607:f8b0:4864:20::e44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29761C05BD1E for ; Tue, 9 Jun 2020 07:04:12 -0700 (PDT) Received: by mail-vs1-xe44.google.com with SMTP id u17so12012419vsu.7 for ; Tue, 09 Jun 2020 07:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pgMDFeLv3CuHVdyC+7IG9SC7auMQmM+m1GRNNNhmUP0=; b=XRN2mSgB+LEcAb0ppXrYlw4xDWYbfWDQ/ACT9m3u/UupU5biOyPZTwjLB7m8W5KbOB zrL1FvpBzT3Va3hlbpp4ENoYDPtfkkm0xxqhbHxUUooDDPUdtJevfpuajjCdYy3JbAdE eTsnZl8ffQVgCS6nxENsxSEJnRNLcCasWZ7ig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pgMDFeLv3CuHVdyC+7IG9SC7auMQmM+m1GRNNNhmUP0=; b=lU+tq4bgEd+x8cnwwwVuW1Zn9HnC1zh9YxVszzQFb9b3bTA7/Eqh33FTnumYgc4bSK 4VB8DcYTA7hRGx9ynbBy4DRW5WTzXiC85yyvdFnui5iLToAXkKXGUEc/kZkOARtfKp9T Lim6zlyYrCcY0Ow0w84dI6+H3sf8+ivC+OK14EKtMLLGd3j6holLU/oF7631WKpYpMsV vIGPue3njtCjHv4TfB2MTrGE+XR2lv6m0mTzUh8k567O2zhgUW8XoWOT4wOFfVI+1+Jo VxBjIgGROFZwb7Hpuey0sK/Gx4GLl3R2m9czUtOuam7rnaggbXV3zfFgcGmUs/f0zecN i+yg== X-Gm-Message-State: AOAM530NrTo6BU4CGhu9Brvd/jGkprFmy2EUKV3tU68DEtuG9+6DJYoQ MXfJEoFjdXBWKn3SF841caRp5lpLx4c= X-Google-Smtp-Source: ABdhPJynWyXxn/ACv1Lvwam9LP1tfy1XNc8wcj97SNnooT980x5nG/al996yPy0K31O0A1FoC/30Ww== X-Received: by 2002:a67:7c44:: with SMTP id x65mr3327813vsc.16.1591711450897; Tue, 09 Jun 2020 07:04:10 -0700 (PDT) Received: from alain.c.googlers.com.com (252.177.243.35.bc.googleusercontent.com. [35.243.177.252]) by smtp.gmail.com with ESMTPSA id b7sm403849vsc.13.2020.06.09.07.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 07:04:10 -0700 (PDT) From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: Alain Michaud , Abhishek Pandit-Subedi , Yu Liu Subject: [PATCH v1 1/3] mgmt: read/set system parameter definitions Date: Tue, 9 Jun 2020 14:03:50 +0000 Message-Id: <20200609140351.153833-2-alainm@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200609140351.153833-1-alainm@chromium.org> References: <20200609140351.153833-1-alainm@chromium.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch submits the corresponding kernel definitions to mgmt.h. This is submitted before the implementation to avoid any conflicts in values allocations. Reviewed-by: Abhishek Pandit-Subedi Reviewed-by: Yu Liu Signed-off-by: Alain Michaud --- include/net/bluetooth/mgmt.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 16e0d87bd8fa..1081e371f03d 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -702,6 +702,24 @@ struct mgmt_rp_set_exp_feature { __le32 flags; } __packed; +#define MGMT_OP_READ_DEFAULT_SYSTEM_PARAMETERS 0x004b + +struct mgmt_system_parameter_tlv { + __u16 type; + __u8 length; + __u8 value[]; +} __packed; + +struct mgmt_rp_read_default_system_parameters { + __u8 parameters[0]; /* mgmt_system_parameter_tlv */ +} __packed; + +#define MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS 0x004c + +struct mgmt_cp_set_default_system_parameters { + __u8 parameters[0]; /* mgmt_system_parameter_tlv */ +} __packed; + #define MGMT_EV_CMD_COMPLETE 0x0001 struct mgmt_ev_cmd_complete { __le16 opcode; From patchwork Tue Jun 9 14:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Michaud X-Patchwork-Id: 11595777 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6EAC92A for ; Tue, 9 Jun 2020 14:04:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B2D92078D for ; Tue, 9 Jun 2020 14:04:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FVq31Jtt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730143AbgFIOEa (ORCPT ); Tue, 9 Jun 2020 10:04:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730351AbgFIOEX (ORCPT ); Tue, 9 Jun 2020 10:04:23 -0400 Received: from mail-vs1-xe43.google.com (mail-vs1-xe43.google.com [IPv6:2607:f8b0:4864:20::e43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F8ABC05BD1E for ; Tue, 9 Jun 2020 07:04:22 -0700 (PDT) Received: by mail-vs1-xe43.google.com with SMTP id l10so9372491vsr.10 for ; Tue, 09 Jun 2020 07:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1eSWoC+ENIJoJDD4KPuRX2LwPpz2E7MZ+xdJMrSSPts=; b=FVq31JttBT0evDqGWa5Jk2doXXGb+c/GyTpjZ9q1UZBluBoZQbU+ycbEXSigMqKcOi QrXol5a++AoXtE07Euuk8ddPF5U1iEkOnHIQF/ICuF7iS4ubJ+IC60bSIxYzGQzYGhqD Z1DL6w0Nl0CGXWFmN1Uleghosn3LH3Jv1UqnY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1eSWoC+ENIJoJDD4KPuRX2LwPpz2E7MZ+xdJMrSSPts=; b=kHY1PXCCuoxvTxhnwqftI8g0g2twO//pH/5j71DCVPidR+vl0gzud3oZ1RmlOmAT/K Gd3o6lk0D0/bUZKHmc4OhhEaNO3eOMj5FdldBlpmD0jHQClQ/6gUuQtxOeuazjMerSYs Haa0iR7RMVMaFQpNlg3xj/I0Df03nEAb6fNIU/QSbYHC8USiIrDppn2I8ytzwr9J0A3i MNz514xDTh51zfpM0LVZdXU66/sHTRHml2Xa7ddml8QXPEKNc60yGLk8j0nnaN1F4HFf K86d6A9mIssU7ARdaSa0ZcbwvTYq0tr9vjMR/KlTfUlev8y815pf62nLv4vCYoYaHGaU Q8iQ== X-Gm-Message-State: AOAM530/m6CRyK9CxQPD08EughDWFQE2oj4FVG8hoG/zxVgbTpwl9ZpB OtchIYaczgiuEKEJG66gdqoJrEricLs= X-Google-Smtp-Source: ABdhPJzMlbJs/Ev/C5+NIOTwZveymieyXAZY3sYjRf9hn1inOFE1JpoMowSpAeMEZ9p3m8/zeOAfDQ== X-Received: by 2002:a67:fc17:: with SMTP id o23mr3256505vsq.92.1591711461340; Tue, 09 Jun 2020 07:04:21 -0700 (PDT) Received: from alain.c.googlers.com.com (252.177.243.35.bc.googleusercontent.com. [35.243.177.252]) by smtp.gmail.com with ESMTPSA id b7sm403849vsc.13.2020.06.09.07.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 07:04:20 -0700 (PDT) From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: Alain Michaud , Abhishek Pandit-Subedi Subject: [PATCH v1 2/3] bluetooth:centralize default value initialization. Date: Tue, 9 Jun 2020 14:03:52 +0000 Message-Id: <20200609140351.153833-3-alainm@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200609140351.153833-1-alainm@chromium.org> References: <20200609140351.153833-1-alainm@chromium.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch centralized the initialization of default parameters. This is required to allow clients to more easily customize the default system parameters. Reviewed-by: Abhishek Pandit-Subedi Signed-off-by: Alain Michaud --- include/net/bluetooth/hci_core.h | 18 ++++++++++++++++++ net/bluetooth/hci_conn.c | 14 ++++---------- net/bluetooth/hci_core.c | 14 +++++++++++++- net/bluetooth/hci_request.c | 15 +++++---------- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index cdd4f1db8670..0d5dbb6cb5a0 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -295,6 +295,14 @@ struct hci_dev { __u8 le_scan_type; __u16 le_scan_interval; __u16 le_scan_window; + __u16 le_scan_int_suspend; + __u16 le_scan_window_suspend; + __u16 le_scan_int_discovery; + __u16 le_scan_window_discovery; + __u16 le_scan_int_adv_monitor; + __u16 le_scan_window_adv_monitor; + __u16 le_scan_int_connect; + __u16 le_scan_window_connect; __u16 le_conn_min_interval; __u16 le_conn_max_interval; __u16 le_conn_latency; @@ -323,6 +331,16 @@ struct hci_dev { __u16 devid_product; __u16 devid_version; + __u8 def_page_scan_type; + __u16 def_page_scan_int; + __u16 def_page_scan_window; + __u8 def_inq_scan_type; + __u16 def_inq_scan_int; + __u16 def_inq_scan_window; + __u16 def_br_lsto; + __u16 def_page_timeout; + __u16 def_multi_adv_rotation_duration; + __u16 pkt_type; __u16 esco_type; __u16 link_policy; diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 307800fd18e6..9bdffc4e79b0 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -789,11 +789,8 @@ static void set_ext_conn_params(struct hci_conn *conn, memset(p, 0, sizeof(*p)); - /* Set window to be the same value as the interval to - * enable continuous scanning. - */ - p->scan_interval = cpu_to_le16(hdev->le_scan_interval); - p->scan_window = p->scan_interval; + p->scan_interval = cpu_to_le16(hdev->le_scan_int_connect); + p->scan_window = cpu_to_le16(hdev->le_scan_window_connect); p->conn_interval_min = cpu_to_le16(conn->le_conn_min_interval); p->conn_interval_max = cpu_to_le16(conn->le_conn_max_interval); p->conn_latency = cpu_to_le16(conn->le_conn_latency); @@ -875,11 +872,8 @@ static void hci_req_add_le_create_conn(struct hci_request *req, memset(&cp, 0, sizeof(cp)); - /* Set window to be the same value as the interval to enable - * continuous scanning. - */ - cp.scan_interval = cpu_to_le16(hdev->le_scan_interval); - cp.scan_window = cp.scan_interval; + cp.scan_interval = cpu_to_le16(hdev->le_scan_int_connect); + cp.scan_window = cpu_to_le16(hdev->le_scan_window_connect); bacpy(&cp.peer_addr, &conn->dst); cp.peer_addr_type = conn->dst_type; diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index dbe2d79f233f..122e44a82995 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2982,7 +2982,7 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, adv_instance->remaining_time = timeout; if (duration == 0) - adv_instance->duration = HCI_DEFAULT_ADV_DURATION; + adv_instance->duration = hdev->def_multi_adv_rotation_duration; else adv_instance->duration = duration; @@ -3397,6 +3397,12 @@ struct hci_dev *hci_alloc_dev(void) hdev->le_adv_max_interval = 0x0800; hdev->le_scan_interval = 0x0060; hdev->le_scan_window = 0x0030; + hdev->le_scan_int_suspend = 0x0400; + hdev->le_scan_window_suspend = 0x0012; + hdev->le_scan_int_discovery = DISCOV_LE_SCAN_INT; + hdev->le_scan_window_discovery = DISCOV_LE_SCAN_WIN; + hdev->le_scan_int_connect = 0x0060; + hdev->le_scan_window_connect = 0x0060; hdev->le_conn_min_interval = 0x0018; hdev->le_conn_max_interval = 0x0028; hdev->le_conn_latency = 0x0000; @@ -3412,6 +3418,7 @@ struct hci_dev *hci_alloc_dev(void) hdev->le_tx_def_phys = HCI_LE_SET_PHY_1M; hdev->le_rx_def_phys = HCI_LE_SET_PHY_1M; hdev->le_num_of_adv_sets = HCI_MAX_ADV_INSTANCES; + hdev->def_multi_adv_rotation_duration = HCI_DEFAULT_ADV_DURATION; hdev->rpa_timeout = HCI_DEFAULT_RPA_TIMEOUT; hdev->discov_interleaved_timeout = DISCOV_INTERLEAVED_TIMEOUT; @@ -3420,6 +3427,11 @@ struct hci_dev *hci_alloc_dev(void) hdev->auth_payload_timeout = DEFAULT_AUTH_PAYLOAD_TIMEOUT; hdev->min_enc_key_size = HCI_MIN_ENC_KEY_SIZE; + /* default 1.28 sec page scan */ + hdev->def_page_scan_type = PAGE_SCAN_TYPE_STANDARD; + hdev->def_page_scan_int = 0x0800; + hdev->def_page_scan_window = 0x0012; + mutex_init(&hdev->lock); mutex_init(&hdev->req_lock); diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 1acf5b8e0910..a7f572ad38ef 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -34,9 +34,6 @@ #define HCI_REQ_PEND 1 #define HCI_REQ_CANCELED 2 -#define LE_SUSPEND_SCAN_WINDOW 0x0012 -#define LE_SUSPEND_SCAN_INTERVAL 0x0400 - void hci_req_init(struct hci_request *req, struct hci_dev *hdev) { skb_queue_head_init(&req->cmd_q); @@ -366,13 +363,11 @@ void __hci_req_write_fast_connectable(struct hci_request *req, bool enable) /* 160 msec page scan interval */ acp.interval = cpu_to_le16(0x0100); } else { - type = PAGE_SCAN_TYPE_STANDARD; /* default */ - - /* default 1.28 sec page scan */ - acp.interval = cpu_to_le16(0x0800); + type = hdev->def_page_scan_type; + acp.interval = cpu_to_le16(hdev->def_page_scan_int); } - acp.window = cpu_to_le16(0x0012); + acp.window = cpu_to_le16(hdev->def_page_scan_window); if (__cpu_to_le16(hdev->page_scan_interval) != acp.interval || __cpu_to_le16(hdev->page_scan_window) != acp.window) @@ -927,8 +922,8 @@ void hci_req_add_le_passive_scan(struct hci_request *req) filter_policy |= 0x02; if (hdev->suspended) { - window = LE_SUSPEND_SCAN_WINDOW; - interval = LE_SUSPEND_SCAN_INTERVAL; + window = hdev->le_scan_window_suspend; + interval = hdev->le_scan_int_suspend; } else { window = hdev->le_scan_window; interval = hdev->le_scan_interval; From patchwork Tue Jun 9 14:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Michaud X-Patchwork-Id: 11595779 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 100A092A for ; Tue, 9 Jun 2020 14:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6E86207C3 for ; Tue, 9 Jun 2020 14:04:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="VJvbmLPh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729894AbgFIOEo (ORCPT ); Tue, 9 Jun 2020 10:04:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729793AbgFIOEn (ORCPT ); Tue, 9 Jun 2020 10:04:43 -0400 Received: from mail-vs1-xe43.google.com (mail-vs1-xe43.google.com [IPv6:2607:f8b0:4864:20::e43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A4BC05BD1E for ; Tue, 9 Jun 2020 07:04:42 -0700 (PDT) Received: by mail-vs1-xe43.google.com with SMTP id q2so12012680vsr.1 for ; Tue, 09 Jun 2020 07:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JSWgLEKXx9L3gBgRXcltbqOvDqH9BjptfAO1aHbSLJU=; b=VJvbmLPhrheuVcuiyhwUSjkMZLIwe1ip7OkQgsyVmkhfGCNjNwbwr+QyyhmZGOA2qy HLgbWjzGO5g0A1K/02LIa1THxmI9qCbrfGR+hY+tZrHClhcb6kY9tuZg4xRsbdPJ/7oB hpGRPyQH4hI+He20aibMj0ivDEpg7Amw7SJro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JSWgLEKXx9L3gBgRXcltbqOvDqH9BjptfAO1aHbSLJU=; b=ptJr19fXSU+rjYzWdKAHjEeUVT/LhpTb15YrCLo9bttr1WfwA+MjujQIHKwi3VvkSM +0KSivsjZdvyuGkFrenYCi1LvH5sVQGetONQnbmRRuXtuDO6ymgUhNn2yCoPnNg+oOwr YHFQGXy//0JxAB+n0sPgV+o54h6ULpoyuBYMU7K0oE5KlAyuObcvQLbuPoW0/Rtd6+Lv cxkAiXNICHkPssowIzsmgzcsMLIVkZUJ5ee6FzYAq8KQKxa8/MuZE9qatFBOO2S46YrQ 5sZonk6DafWCmqBpiw9JzuzOCPx58ZuL+a96RsR1fBcfFbT0po7ASnBOrg2beKTHICf5 FqAQ== X-Gm-Message-State: AOAM530qEBnZ86UFwSdjTAI/4Q4w7gEdBqLb423R4Ng8hQwtXai4gxwK +VnKMXrqqB7bG3G7zV7C1lbtEZYh2cg= X-Google-Smtp-Source: ABdhPJzd/W3PfVeX629ce5KfroO09YIBkR6sb1zpNyGfWQaxJ1mP/Eoi/IS0Q7ZVdphGgwuGIG0UPw== X-Received: by 2002:a05:6102:2373:: with SMTP id o19mr3034694vsa.205.1591711480070; Tue, 09 Jun 2020 07:04:40 -0700 (PDT) Received: from alain.c.googlers.com.com (252.177.243.35.bc.googleusercontent.com. [35.243.177.252]) by smtp.gmail.com with ESMTPSA id b7sm403849vsc.13.2020.06.09.07.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 07:04:39 -0700 (PDT) From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: Alain Michaud , Abhishek Pandit-Subedi Subject: [PATCH v1 3/3] bluetooth: implement read/set default system parameters mgmt Date: Tue, 9 Jun 2020 14:03:54 +0000 Message-Id: <20200609140351.153833-4-alainm@chromium.org> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog In-Reply-To: <20200609140351.153833-1-alainm@chromium.org> References: <20200609140351.153833-1-alainm@chromium.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch implements the read default system parameters and the set default system parameters mgmt commands. Reviewed-by: Abhishek Pandit-Subedi Signed-off-by: Alain Michaud --- net/bluetooth/mgmt.c | 429 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 429 insertions(+) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 9e8a3cccc6ca..98a4193c8e66 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -111,6 +111,8 @@ static const u16 mgmt_commands[] = { MGMT_OP_READ_SECURITY_INFO, MGMT_OP_READ_EXP_FEATURES_INFO, MGMT_OP_SET_EXP_FEATURE, + MGMT_OP_READ_DEFAULT_SYSTEM_PARAMETERS, + MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, }; static const u16 mgmt_events[] = { @@ -3849,6 +3851,431 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev, MGMT_STATUS_NOT_SUPPORTED); } +static int read_default_system_parameters(struct sock *sk, struct hci_dev *hdev, + void *data, u16 data_len) +{ + struct { + struct mgmt_system_parameter_tlv entry; + union { + /* This is a simplification for now since all values + * are 16 bits. In the future, this code may need + * refactoring to account for variable length values + * and properly calculate the required buffer size. + */ + u16 value; + }; + } __packed params[] = { + /* Please see mgmt-api.txt for documentation of these values */ + { + { 0x0000, sizeof(__u16) }, + { cpu_to_le16(hdev->def_page_scan_type) } + }, + { + { 0x0001, sizeof(__u16) }, + { cpu_to_le16(hdev->def_page_scan_int) } + }, + { + { 0x0002, sizeof(__u16) }, + { cpu_to_le16(hdev->def_page_scan_window) } + }, + { + { 0x0003, sizeof(__u16) }, + { cpu_to_le16(hdev->def_inq_scan_type) } + }, + { + { 0x0004, sizeof(__u16) }, + { cpu_to_le16(hdev->def_inq_scan_int) } + }, + { + { 0x0005, sizeof(__u16) }, + { cpu_to_le16(hdev->def_inq_scan_window) } + }, + { + { 0x0006, sizeof(__u16) }, + { cpu_to_le16(hdev->def_br_lsto) } + }, + { + { 0x0007, sizeof(__u16) }, + { cpu_to_le16(hdev->def_page_timeout) } + }, + { + { 0x0008, sizeof(__u16) }, + { cpu_to_le16(hdev->sniff_min_interval) } + }, + { + { 0x0009, sizeof(__u16) }, + { cpu_to_le16(hdev->sniff_max_interval) } + }, + { + { 0x000a, sizeof(__u16) }, + { cpu_to_le16(hdev->le_adv_min_interval) } + }, + { + { 0x000b, sizeof(__u16) }, + { cpu_to_le16(hdev->le_adv_max_interval) } + }, + { + { 0x000c, sizeof(__u16) }, + { cpu_to_le16(hdev->def_multi_adv_rotation_duration) } + }, + { + { 0x000d, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_interval) } + }, + { + { 0x000e, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_window) } + }, + { + { 0x000f, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_int_suspend) } + }, + { + { 0x0010, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_window_suspend) } + }, + { + { 0x0011, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_int_discovery) } + }, + { + { 0x0012, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_window_discovery) } + }, + { + { 0x0013, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_int_adv_monitor) } + }, + { + { 0x0014, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_window_adv_monitor) } + }, + { + { 0x0015, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_int_connect) } + }, + { + { 0x0016, sizeof(__u16) }, + { cpu_to_le16(hdev->le_scan_window_connect) } + }, + { + { 0x0017, sizeof(__u16) }, + { cpu_to_le16(hdev->le_conn_min_interval) } + }, + { + { 0x0018, sizeof(__u16) }, + { cpu_to_le16(hdev->le_conn_max_interval) } + }, + { + { 0x0019, sizeof(__u16) }, + { cpu_to_le16(hdev->le_conn_latency) } + }, + { + { 0x001a, sizeof(__u16) }, + { cpu_to_le16(hdev->le_supv_timeout) } + }, + }; + struct mgmt_rp_read_default_system_parameters *rp = (void *)params; + + bt_dev_dbg(hdev, "sock %p", sk); + + return mgmt_cmd_complete(sk, hdev->id, + MGMT_OP_READ_DEFAULT_SYSTEM_PARAMETERS, + 0, rp, sizeof(params)); +} + +#define TO_TLV(x) ((struct mgmt_system_parameter_tlv *)(x)) +#define TLV_VALUE_CAST(tlv, type) (*((type *)(TO_TLV(tlv)->value))) + +static int set_default_system_parameters(struct sock *sk, struct hci_dev *hdev, + void *data, u16 data_len) +{ + u16 buffer_left = data_len; + u8 *buffer = data; + + if (buffer_left < sizeof(struct mgmt_system_parameter_tlv)) { + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, + MGMT_STATUS_INVALID_PARAMS); + } + + /* First pass to validate the tlv */ + while (buffer_left >= sizeof(struct mgmt_system_parameter_tlv)) { + const u8 len = TO_TLV(buffer)->length; + const u16 exp_len = sizeof(struct mgmt_system_parameter_tlv) + + len; + const u16 type = le16_to_cpu(TO_TLV(buffer)->type); + + if (buffer_left < exp_len) { + bt_dev_warn(hdev, "invalid len left %d, exp >= %d", + buffer_left, exp_len); + + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, + MGMT_STATUS_INVALID_PARAMS); + } + + /* Please see mgmt-api.txt for documentation of these values */ + switch (type) { + case 0x0000: + case 0x0001: + case 0x0002: + case 0x0003: + case 0x0004: + case 0x0005: + case 0x0006: + case 0x0007: + case 0x0008: + case 0x0009: + case 0x000a: + case 0x000b: + case 0x000c: + case 0x000d: + case 0x000e: + case 0x000f: + case 0x0010: + case 0x0011: + case 0x0012: + case 0x0013: + case 0x0014: + case 0x0015: + case 0x0016: + case 0x0017: + case 0x0018: + case 0x0019: + case 0x001a: + if (len != sizeof(u16)) { + bt_dev_warn(hdev, "invalid length %d, exp %zu for type %d", + len, sizeof(u16), type); + + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, + MGMT_STATUS_INVALID_PARAMS); + } + break; + default: + bt_dev_warn(hdev, "unsupported parameter %u", type); + break; + } + + buffer_left -= exp_len; + buffer += exp_len; + } + + buffer_left = data_len; + buffer = data; + while (buffer_left >= sizeof(struct mgmt_system_parameter_tlv)) { + const u8 len = TO_TLV(buffer)->length; + const u16 exp_len = sizeof(struct mgmt_system_parameter_tlv) + + len; + const u16 type = le16_to_cpu(TO_TLV(buffer)->type); + + switch (type) { + case 0x0000: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_page_scan_type = le16_to_cpu(val); + break; + } + case 0x0001: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_page_scan_int = le16_to_cpu(val); + break; + } + case 0x0002: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_page_scan_window = le16_to_cpu(val); + break; + } + case 0x0003: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_inq_scan_type = le16_to_cpu(val); + break; + } + case 0x0004: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_inq_scan_int = le16_to_cpu(val); + break; + } + case 0x0005: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_inq_scan_window = le16_to_cpu(val); + break; + } + case 0x0006: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_br_lsto = le16_to_cpu(val); + break; + } + case 0x0007: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_page_timeout = le16_to_cpu(val); + break; + } + case 0x0008: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->sniff_min_interval = le16_to_cpu(val); + break; + } + case 0x0009: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->sniff_max_interval = le16_to_cpu(val); + break; + } + case 0x000a: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_adv_min_interval = le16_to_cpu(val); + break; + } + case 0x000b: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_adv_max_interval = le16_to_cpu(val); + break; + } + case 0x000c: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->def_multi_adv_rotation_duration = + le16_to_cpu(val); + break; + } + case 0x000d: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_interval = le16_to_cpu(val); + break; + } + case 0x000e: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_window = le16_to_cpu(val); + break; + } + case 0x000f: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_int_suspend = le16_to_cpu(val); + break; + } + case 0x0010: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_window_suspend = le16_to_cpu(val); + break; + } + case 0x0011: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_int_discovery = le16_to_cpu(val); + break; + } + case 0x00012: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_window_discovery = le16_to_cpu(val); + break; + } + case 0x00013: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_int_adv_monitor = le16_to_cpu(val); + break; + } + case 0x00014: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_window_adv_monitor = le16_to_cpu(val); + break; + } + case 0x00015: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_int_connect = le16_to_cpu(val); + break; + } + case 0x00016: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_scan_window_connect = le16_to_cpu(val); + break; + } + case 0x00017: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_conn_min_interval = le16_to_cpu(val); + break; + } + case 0x00018: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_conn_max_interval = le16_to_cpu(val); + break; + } + case 0x00019: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_conn_latency = le16_to_cpu(val); + break; + } + case 0x0001a: + { + const u16 val = TLV_VALUE_CAST(buffer, u16); + + hdev->le_supv_timeout = le16_to_cpu(val); + break; + } + default: + bt_dev_warn(hdev, "unsupported parameter %u", + buffer[0]); + break; + } + + buffer_left -= exp_len; + buffer += exp_len; + } + + return mgmt_cmd_status(sk, hdev->id, + MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, + MGMT_STATUS_SUCCESS); +} + static void read_local_oob_data_complete(struct hci_dev *hdev, u8 status, u16 opcode, struct sk_buff *skb) { @@ -7297,6 +7724,8 @@ static const struct hci_mgmt_handler mgmt_handlers[] = { { set_exp_feature, MGMT_SET_EXP_FEATURE_SIZE, HCI_MGMT_VAR_LEN | HCI_MGMT_HDEV_OPTIONAL }, + { read_default_system_parameters, 0, HCI_MGMT_UNTRUSTED }, + { set_default_system_parameters, 0, HCI_MGMT_VAR_LEN }, }; void mgmt_index_added(struct hci_dev *hdev)