From patchwork Fri May 29 14:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Michaud X-Patchwork-Id: 11579005 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 733C092A for ; Fri, 29 May 2020 14:50:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50AFE2077D for ; Fri, 29 May 2020 14:50:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="GqLAFAnP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbgE2Oux (ORCPT ); Fri, 29 May 2020 10:50:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726838AbgE2Ouw (ORCPT ); Fri, 29 May 2020 10:50:52 -0400 Received: from mail-ua1-x942.google.com (mail-ua1-x942.google.com [IPv6:2607:f8b0:4864:20::942]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C19C03E969 for ; Fri, 29 May 2020 07:50:51 -0700 (PDT) Received: by mail-ua1-x942.google.com with SMTP id k3so877033ual.8 for ; Fri, 29 May 2020 07:50:51 -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=sFOBeMzcdDrnp5sCK1izhx9oF5C9Rvc1zxW/M94RojY=; b=GqLAFAnPZCAur7o3YyajH0fJVMoFHbeOqHxJAy+QAjtrLdGSYapzZj+VUxOySqYlxC qBZjCsBMVWYrn8X/Zx2JHtstHbgVHfH1LcpHL2CeXKgnZZ0K+GmcOuM4qIJ7y9VQtvF6 SJowNyrq7L4EO35W57QkjOLis6TsUdYHQCZP0= 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=sFOBeMzcdDrnp5sCK1izhx9oF5C9Rvc1zxW/M94RojY=; b=UrbfybQ+lh3BwdUFoFWPpiLRqcrwQzMDWKs+9H6p+hjUYvjqt9wVFsDaMlF9XhCpfS YVnjwJItgTrRwT9KwrmGSf/fmQNEafmUZramM3c2QjHfCYRxxW2eYOv6PsTzNtE884HQ 0pBAr0adhjAEk9PWhAXt/YykeAfGISjlHg307Dj0CDwMbCfodseK7C4dlVTKLPRID9TH a/lzW2nT7B1kmpJ3zGUFJLMB6r7JJUXcoLxWFWBof4zcR9A9uZNY7IJ76ElVUNFCZx40 xJUueW7V4mbU1gzpR5gdaEPOEZ8re3GOKVBmQSKnS2hDVssiG4KZoyOcPP9iSDQ6X/oH 0HCg== X-Gm-Message-State: AOAM532IpYry7jdVvtP80kv0Avq7zuaoEfCHtYbkk8PSLSC6dcojp5oy G2ZxKM7Oaw+5ccLbWK7gH/OrhIezqlc= X-Google-Smtp-Source: ABdhPJy4YYZS8hJnyxn4ig2SaJAVrAkW2f6XFQ4bXDozNPyQpnv4oCTZziBHjZhM+j0u2SMTrmg63g== X-Received: by 2002:a9f:236e:: with SMTP id 101mr1705217uae.103.1590763850040; Fri, 29 May 2020 07:50:50 -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 c65sm1196998vkh.32.2020.05.29.07.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:50:49 -0700 (PDT) From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: Alain Michaud Subject: [BlueZ PATCH 2/3] adapter:set default system configuration if available Date: Fri, 29 May 2020 14:50:08 +0000 Message-Id: <20200529145007.198906-3-alainm@chromium.org> X-Mailer: git-send-email 2.27.0.rc0.183.gde8f92d652-goog In-Reply-To: <20200529145007.198906-1-alainm@chromium.org> References: <20200529145007.198906-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 change loads any specified system configuration if provided and supported by the kernel. --- src/adapter.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/hcid.h | 39 ++++++++ 2 files changed, 290 insertions(+) diff --git a/src/adapter.c b/src/adapter.c index 972d88772..a5eba8ef7 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -120,6 +120,8 @@ static bool kernel_conn_control = false; static bool kernel_blocked_keys_supported = false; +static bool kernel_set_system_params = false; + static GList *adapter_list = NULL; static unsigned int adapter_remaining = 0; static bool powering_down = false; @@ -4157,6 +4159,250 @@ static void probe_devices(void *user_data) device_probe_profiles(device, btd_device_get_uuids(device)); } +static void load_default_system_params(struct btd_adapter *adapter) +{ + /* note: for now all params are 2 bytes, if varying size params are + * added, calculating the right size of buffer will be necessary first. + */ + struct controller_params_tlv { + uint16_t parameter_type; + uint8_t length; + uint16_t value; + } __packed; + + struct controller_params_tlv *params = NULL; + uint16_t i = 0; + size_t cp_size; + + if (!main_opts.default_params.num_set_params || + !kernel_set_system_params) + return; + + cp_size = sizeof(struct controller_params_tlv) * + main_opts.default_params.num_set_params; + params = g_try_malloc0(cp_size); + if (!params) + return; + + if (main_opts.default_params.br_page_scan_type != 0xFFFF) { + params[i].parameter_type = 0x0000; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.br_page_scan_type; + ++i; + } + + if (main_opts.default_params.br_page_scan_interval) { + params[i].parameter_type = 0x0001; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_page_scan_interval; + ++i; + } + + if (main_opts.default_params.br_page_scan_window) { + params[i].parameter_type = 0x0002; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.br_page_scan_window; + ++i; + } + + if (main_opts.default_params.br_inquiry_scan_type != 0xFFFF) { + params[i].parameter_type = 0x0003; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.br_inquiry_scan_type; + ++i; + } + + if (main_opts.default_params.br_inquiry_scan_interval) { + params[i].parameter_type = 0x0004; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_inquiry_scan_interval; + ++i; + } + + if (main_opts.default_params.br_inquiry_scan_window) { + params[i].parameter_type = 0x0005; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_inquiry_scan_window; + ++i; + } + + if (main_opts.default_params.br_link_supervision_timeout) { + params[i].parameter_type = 0x0006; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_link_supervision_timeout; + ++i; + } + + if (main_opts.default_params.br_page_timeout) { + params[i].parameter_type = 0x0007; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.br_page_timeout; + ++i; + } + + if (main_opts.default_params.br_min_sniff_interval) { + params[i].parameter_type = 0x0008; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_min_sniff_interval; + ++i; + } + + if (main_opts.default_params.br_max_sniff_interval) { + params[i].parameter_type = 0x0009; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.br_max_sniff_interval; + ++i; + } + + if (main_opts.default_params.le_min_adv_interval) { + params[i].parameter_type = 0x000a; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.le_min_adv_interval; + ++i; + } + + if (main_opts.default_params.le_max_adv_interval) { + params[i].parameter_type = 0x000b; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.le_max_adv_interval; + ++i; + } + + if (main_opts.default_params.le_multi_adv_rotation_interval) { + params[i].parameter_type = 0x000c; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_multi_adv_rotation_interval; + ++i; + } + + if (main_opts.default_params.le_scan_interval_autoconnect) { + params[i].parameter_type = 0x000d; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_interval_autoconnect; + ++i; + } + + if (main_opts.default_params.le_scan_window_autoconnect) { + params[i].parameter_type = 0x000e; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_window_autoconnect; + ++i; + } + + if (main_opts.default_params.le_scan_interval_suspend) { + params[i].parameter_type = 0x000f; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_interval_suspend; + ++i; + } + + if (main_opts.default_params.le_scan_window_suspend) { + params[i].parameter_type = 0x0010; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_window_suspend; + ++i; + } + + if (main_opts.default_params.le_scan_interval_discovery) { + params[i].parameter_type = 0x0011; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_interval_discovery; + ++i; + } + + if (main_opts.default_params.le_scan_window_discovery) { + params[i].parameter_type = 0x0012; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_window_discovery; + ++i; + } + + if (main_opts.default_params.le_scan_interval_adv_monitor) { + params[i].parameter_type = 0x0013; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_interval_adv_monitor; + ++i; + } + + if (main_opts.default_params.le_scan_window_adv_monitor) { + params[i].parameter_type = 0x0014; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_window_adv_monitor; + ++i; + } + + if (main_opts.default_params.le_scan_interval_connect) { + params[i].parameter_type = 0x0015; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_interval_connect; + ++i; + } + + if (main_opts.default_params.le_scan_window_connect) { + params[i].parameter_type = 0x0016; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_scan_window_connect; + ++i; + } + + if (main_opts.default_params.le_min_connection_interval) { + params[i].parameter_type = 0x0017; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_min_connection_interval; + ++i; + } + + if (main_opts.default_params.le_max_connection_interval) { + params[i].parameter_type = 0x0018; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_max_connection_interval; + ++i; + } + + if (main_opts.default_params.le_connection_latency) { + params[i].parameter_type = 0x0019; + params[i].length = sizeof(params[i].value); + params[i].value = + main_opts.default_params.le_connection_latency; + ++i; + } + + if (main_opts.default_params.le_connection_lsto) { + params[i].parameter_type = 0x001a; + params[i].length = sizeof(params[i].value); + params[i].value = main_opts.default_params.le_connection_lsto; + ++i; + } + + mgmt_send(adapter->mgmt,MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS, + adapter->dev_id, cp_size, params, NULL, NULL, NULL); + + btd_error(adapter->dev_id, + "Failed to set default system params for hci%u", + adapter->dev_id); + + g_free(params); +} + static void load_devices(struct btd_adapter *adapter) { char dirname[PATH_MAX]; @@ -8265,6 +8511,7 @@ load: load_drivers(adapter); btd_profile_foreach(probe_profile, adapter); clear_blocked(adapter); + load_default_system_params(adapter); load_devices(adapter); /* restore Service Changed CCC value for bonded devices */ @@ -9158,6 +9405,10 @@ static void read_commands_complete(uint8_t status, uint16_t length, DBG("kernel supports the set_blocked_keys op"); kernel_blocked_keys_supported = true; break; + case MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS: + DBG("kernel supports set system params"); + kernel_set_system_params = true; + break; default: break; } diff --git a/src/hcid.h b/src/hcid.h index 1bf93784d..e6d966c58 100644 --- a/src/hcid.h +++ b/src/hcid.h @@ -49,6 +49,45 @@ struct main_opts { uint32_t discovto; uint8_t privacy; + struct { + uint16_t num_set_params; + + uint16_t br_page_scan_type; + uint16_t br_page_scan_interval; + uint16_t br_page_scan_window; + + uint16_t br_inquiry_scan_type; + uint16_t br_inquiry_scan_interval; + uint16_t br_inquiry_scan_window; + + uint16_t br_link_supervision_timeout; + uint16_t br_page_timeout; + + uint16_t br_min_sniff_interval; + uint16_t br_max_sniff_interval; + + uint16_t le_min_adv_interval; + uint16_t le_max_adv_interval; + uint16_t le_multi_adv_rotation_interval; + + uint16_t le_scan_interval_autoconnect; + uint16_t le_scan_window_autoconnect; + uint16_t le_scan_interval_suspend; + uint16_t le_scan_window_suspend; + uint16_t le_scan_interval_discovery; + uint16_t le_scan_window_discovery; + uint16_t le_scan_interval_adv_monitor; + uint16_t le_scan_window_adv_monitor; + uint16_t le_scan_interval_connect; + uint16_t le_scan_window_connect; + + uint16_t le_min_connection_interval; + uint16_t le_max_connection_interval; + uint16_t le_connection_latency; + uint16_t le_connection_lsto; + } default_params; + + gboolean reverse_discovery; gboolean name_resolv; gboolean debug_keys;