From patchwork Mon Jun 29 23:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632801 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 DF64792A for ; Mon, 29 Jun 2020 23:02:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C58E220780 for ; Mon, 29 Jun 2020 23:02:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OdlZXXlp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728690AbgF2XCc (ORCPT ); Mon, 29 Jun 2020 19:02:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728591AbgF2XCc (ORCPT ); Mon, 29 Jun 2020 19:02:32 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF205C061755 for ; Mon, 29 Jun 2020 16:02:30 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id f2so7676191plr.8 for ; Mon, 29 Jun 2020 16:02:30 -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=hVvbR6QNmm9waRXWyOSgJ2bOxzhCSL1WQfugry/sT1M=; b=OdlZXXlpH60q8YZ2HvMJwooRdB3Ii0i6U6vjOq80mwOHGVPscEInyvFXIAwxvSVw+u SfhlJvyRcvTtqm+qeiXfL3yN9Q1NMOk5mOtMbf+v9clB9rYTWj2F5lGksSFWK//S8B7G kALSku8/1iJ+6sRKujEzG0tGBUhkCt2XUtup8= 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=hVvbR6QNmm9waRXWyOSgJ2bOxzhCSL1WQfugry/sT1M=; b=Cb1hEmDaljgdSr/kcjpJc/Gp1GFVreLOf2ikvtM7QfjvLL/SGMrDrsRwj8IAle1zzX u2pH1n19lg64a4XJlSSn2/gsB1NSJmsU4kSCLeYIHRATdzH/UK6KqAZQz/6doVuzmlKg H93dfBd6hpFtzXKW8/Wtx/eCUdBttJyWFaq1Iy3X/rf4Bymz+GtYpGqgPMWix1NjIglu GGyecVaamKVgPndrhFO8NV9x3/QRlzaO1/qc0feinp3O8H0ZsF7PkEbb3fVHWE2veRLW FLMmpZwd73QZeWZvVLF70W9LDAmfm53kNTp6pk4gu7ey4aOFv7meM8zXqkFCoVmr6cQi JOGg== X-Gm-Message-State: AOAM530r67vGXxyP0+oE+9fTZni7CZqvmBBuaVQ6vUp7W4wKu9Xbh+pB vtdnU3zts6Hdi5mmDm6cc1BLwKWAV/w= X-Google-Smtp-Source: ABdhPJyRoW8sPk9O/xRH4Y40JiGN7Ikj5uigiYJrumoQ7bj0zHIjnMorSNXXi4FpS0EXN/XaFaViqw== X-Received: by 2002:a17:902:ff0c:: with SMTP id f12mr15513333plj.254.1593471750394; Mon, 29 Jun 2020 16:02:30 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:29 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 1/6] mgmt: Add mgmt op and events for device flags Date: Mon, 29 Jun 2020 16:02:18 -0700 Message-Id: <20200629160206.BlueZ.v6.1.I3a6c238b09e1a0fad69e69cc2e6f4063af989b37@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 Add Get Device Flags, Set Device Flags and Device Flags Changed. --- Changes in v6: None Changes in v5: - Use device_flags mgmt op Changes in v4: None Changes in v3: None Changes in v2: None lib/mgmt.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/mgmt.h b/lib/mgmt.h index fad1f3dfe..525c4dd62 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -654,6 +654,27 @@ struct mgmt_cp_set_default_runtime_config { uint8_t parameters[0]; /* mgmt_tlv */ } __packed; +#define MGMT_OP_GET_DEVICE_FLAGS 0x004F +#define MGMT_GET_DEVICE_FLAGS_SIZE 7 +struct mgmt_cp_get_device_flags { + struct mgmt_addr_info addr; +} __packed; +struct mgmt_rp_get_device_flags { + struct mgmt_addr_info addr; + uint32_t supported_flags; + uint32_t current_flags; +} __packed; + +#define MGMT_OP_SET_DEVICE_FLAGS 0x0050 +#define MGMT_SET_DEVICE_FLAGS_SIZE 11 +struct mgmt_cp_set_device_flags { + struct mgmt_addr_info addr; + uint32_t current_flags; +} __packed; +struct mgmt_rp_set_device_flags { + struct mgmt_addr_info addr; +} __packed; + #define MGMT_ADV_MONITOR_FEATURE_MASK_OR_PATTERNS (1 << 0) #define MGMT_OP_READ_ADV_MONITOR_FEATURES 0x0051 @@ -919,6 +940,13 @@ struct mgmt_ev_exp_feature_changed { uint32_t flags; } __packed; +#define MGMT_EV_DEVICE_FLAGS_CHANGED 0x002a +struct mgmt_ev_device_flags_changed { + struct mgmt_addr_info addr; + uint32_t supported_flags; + uint32_t current_flags; +} __packed; + #define MGMT_EV_ADV_MONITOR_ADDED 0x002b struct mgmt_ev_adv_monitor_added { uint16_t monitor_handle; @@ -1007,6 +1035,8 @@ static const char *mgmt_op[] = { "Set Experimental Feature", "Read Default System Configuration", "Set Default System Configuration", + "Get Device Flags", + "Set Device Flags", /* 0x0050 */ "Read Advertisement Monitor Features", "Add Advertisement Patterns Monitor", "Remove Advertisement Monitor", @@ -1053,6 +1083,7 @@ static const char *mgmt_ev[] = { "Extended Controller Information Changed", "PHY Configuration Changed", "Experimental Feature Changed", + "Device Flags Changed", "Advertisement Monitor Added", /* 0x002b */ "Advertisement Monitor Removed", }; From patchwork Mon Jun 29 23:02:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632803 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 6D63313B4 for ; Mon, 29 Jun 2020 23:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56E9220780 for ; Mon, 29 Jun 2020 23:02:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="J9bGodhi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728735AbgF2XCe (ORCPT ); Mon, 29 Jun 2020 19:02:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728591AbgF2XCd (ORCPT ); Mon, 29 Jun 2020 19:02:33 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69484C061755 for ; Mon, 29 Jun 2020 16:02:32 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id q17so8532449pfu.8 for ; Mon, 29 Jun 2020 16:02:32 -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=/eYZRfxdDdMGipjAIlkGFO2L4zxv1b9ptR+ecHNecQA=; b=J9bGodhi+7K3mo8IPL4ZT9svT7SGLDZT4cXeFjogMReqFVKUqxplPzP3qm74OtYUTh /tXugW3W8W6MSipYrsz526U9pAUu0gDIfvnIA5cxtfa8KBfnmPk68nTh+3468xD2oTw8 BLzi7gMP4ZCMJJWbzbTgeGO9EdF84XENXBPjY= 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=/eYZRfxdDdMGipjAIlkGFO2L4zxv1b9ptR+ecHNecQA=; b=CZ7WAVvFRbamidf5SqO/4K51dXByK64iUk59cF7wWhyjWmm40Gl3oDbU4eyYShqqS2 V+JOSnJH+EZPOnWwYdGrKmZvKMD4CX/MAxdggwIBq9PJPESi9iQmjsACXUEojc2/GV7S GKOeQccJVrNn346EqM+ajxWyIzOGPnc61NI883+dPWxK4I149pNdl3cOETVAekKOj91t sw1kuBRmsOzbRxgXkUk0HReNzZ0Gx9neraqhTLfnhedielwAZbe6sQWM+4DcMOURBUF2 JhlcgSuUdvuJSdnTKv5l/uJsbFq2kgrfFrGohWiIj2SqefTDv8++Q5aD7RLBF1qVDzAM 9Ebg== X-Gm-Message-State: AOAM530COP7uD/3UntaPFLjgHeKnLqUB159YSpetKXDcD4zmKlBGAS6y 6xEZssmN4ob+DAcXUTya1jDVWw== X-Google-Smtp-Source: ABdhPJx81U/vQt54qQTLwVG+bJJiZs5g5XxOn3ghCVjjdBOcEDWmcftjxxZVZIqUUXBPOfEwOnWt9Q== X-Received: by 2002:a05:6a00:f:: with SMTP id h15mr16272889pfk.193.1593471751555; Mon, 29 Jun 2020 16:02:31 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:30 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 2/6] monitor: Decode device flags mgmt ops and event Date: Mon, 29 Jun 2020 16:02:19 -0700 Message-Id: <20200629160206.BlueZ.v6.2.Ieac700ddea68a19e8c3dc53528f686482076a77a@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 Add support for Get Device Flags and Set Device Flags mgmt operations and Device Flags Changed mgmt event. Sample trace: @ MGMT Command: Set Device Flags (0x0050) plen 11 {0x0002} [hci0] LE Address: CD:F3:CD:13:C5:91 (Static) Current Flags: 0x00000000 @ MGMT Event: Device Flags Changed (0x002a) plen 15 {0x0001} [hci0] LE Address: CD:F3:CD:13:C5:91 (Static) Supported Flags: 0x00000001 Remote Wakeup Current Flags: 0x00000000 @ MGMT Event: Device Flags Changed (0x002a) plen 15 {0x0004} [hci0] LE Address: CD:F3:CD:13:C5:91 (Static) Supported Flags: 0x00000001 Remote Wakeup Current Flags: 0x00000000 @ MGMT Event: Device Flags Changed (0x002a) plen 15 {0x0003} [hci0] LE Address: CD:F3:CD:13:C5:91 (Static) Supported Flags: 0x00000001 Remote Wakeup Current Flags: 0x00000000 @ MGMT Event: Command Complete (0x0001) plen 10 {0x0002} [hci0] Set Device Flags (0x0050) plen 7 Status: Success (0x00) LE Address: CD:F3:CD:13:C5:91 (Static) --- Changes in v6: * Fix up some build issues reported by bluez.test.bot Changes in v5: * Decode device flags Changes in v4: None Changes in v3: None Changes in v2: None monitor/packet.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/monitor/packet.c b/monitor/packet.c index 3b9c06512..431a39b66 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -100,6 +100,7 @@ #define COLOR_UNKNOWN_EXP_FEATURE_FLAG COLOR_WHITE_BG #define COLOR_UNKNOWN_ADV_FLAG COLOR_WHITE_BG #define COLOR_UNKNOWN_PHY COLOR_WHITE_BG +#define COLOR_UNKNOWN_ADDED_DEVICE_FLAG COLOR_WHITE_BG #define COLOR_PHY_PACKET COLOR_BLUE @@ -13099,6 +13100,56 @@ static void mgmt_set_exp_feature_rsp(const void *data, uint16_t size) mgmt_print_exp_feature(data); } +static const struct bitfield_data mgmt_added_device_flags_table[] = { + { 0, "Remote Wakeup" }, + { } +}; + +static void mgmt_print_added_device_flags(char *label, uint32_t flags) +{ + uint32_t mask; + + print_field("%s: 0x%8.8x", label, flags); + mask = print_bitfield(2, flags, mgmt_added_device_flags_table); + if (mask) + print_text(COLOR_UNKNOWN_ADDED_DEVICE_FLAG, + " Unknown Flags (0x%8.8x)", mask); +} + +static void mgmt_get_device_flags_cmd(const void *data, uint16_t size) +{ + uint8_t type = get_u8(data + 6); + + mgmt_print_address(data, type); +} + +static void mgmt_get_device_flags_rsp(const void *data, uint16_t size) +{ + uint8_t type = get_u8(data + 6); + uint32_t supported_flags = get_le32(data + 7); + uint32_t current_flags = get_le32(data + 11); + + mgmt_print_address(data, type); + mgmt_print_added_device_flags("Supported Flags", supported_flags); + mgmt_print_added_device_flags("Current Flags", current_flags); +} + +static void mgmt_set_device_flags_cmd(const void *data, uint16_t size) +{ + uint8_t type = get_u8(data + 6); + uint32_t current_flags = get_le32(data + 7); + + mgmt_print_address(data, type); + mgmt_print_added_device_flags("Current Flags", current_flags); +} + +static void mgmt_set_device_flags_rsp(const void *data, uint16_t size) +{ + uint8_t type = get_u8(data + 6); + + mgmt_print_address(data, type); +} + struct mgmt_data { uint16_t opcode; const char *str; @@ -13324,6 +13375,12 @@ static const struct mgmt_data mgmt_command_table[] = { { 0x004a, "Set Experimental Feature", mgmt_set_exp_feature_cmd, 17, true, mgmt_set_exp_feature_rsp, 20, true }, + { 0x004f, "Get Device Flags", + mgmt_get_device_flags_cmd, 7, true, + mgmt_get_device_flags_rsp, 15, true}, + { 0x0050, "Set Device Flags", + mgmt_set_device_flags_cmd, 11, true, + mgmt_set_device_flags_rsp, 7, true}, { } }; @@ -13714,6 +13771,17 @@ static void mgmt_exp_feature_changed_evt(const void *data, uint16_t size) mgmt_print_exp_feature(data); } +static void mgmt_device_flags_changed_evt(const void *data, uint16_t size) +{ + uint8_t type = get_u8(data + 6); + uint32_t supported_flags = get_le32(data + 7); + uint32_t current_flags = get_le32(data + 11); + + mgmt_print_address(data, type); + mgmt_print_added_device_flags("Supported Flags", supported_flags); + mgmt_print_added_device_flags("Current Flags", current_flags); +} + static const struct mgmt_data mgmt_event_table[] = { { 0x0001, "Command Complete", mgmt_command_complete_evt, 3, false }, @@ -13793,6 +13861,8 @@ static const struct mgmt_data mgmt_event_table[] = { mgmt_phy_changed_evt, 4, true }, { 0x0027, "Experimental Feature Changed", mgmt_exp_feature_changed_evt, 20, true }, + { 0x002a, "Device Flags Changed", + mgmt_device_flags_changed_evt, 15, true }, { } }; From patchwork Mon Jun 29 23:02:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632805 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 A74E713B4 for ; Mon, 29 Jun 2020 23:02:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FB9D206C3 for ; Mon, 29 Jun 2020 23:02:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Tk3KsGsZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728819AbgF2XCf (ORCPT ); Mon, 29 Jun 2020 19:02:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728591AbgF2XCe (ORCPT ); Mon, 29 Jun 2020 19:02:34 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F67EC03E979 for ; Mon, 29 Jun 2020 16:02:33 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id o13so6042575pgf.0 for ; Mon, 29 Jun 2020 16:02:33 -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=SPxskUi7G5BtqSsX8nYCdA9mCHQyN/elgbqYG2shIME=; b=Tk3KsGsZyxNrmhgkIJMbKgBV9SgLKJ19DidQGS/W/Wqg6QM/jUKyQaifUZENI95plI 8CyWFyc76bEWE9z/sMm5EGeTkPEo7zAkFWTOrdqPdnac5J4KFBi073Ys5MHbOwP00cad 7rqRYNreillJPOGaNVPp9INO9Cq+fRD4bfpwc= 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=SPxskUi7G5BtqSsX8nYCdA9mCHQyN/elgbqYG2shIME=; b=SeMIcJGaOvK4BWiLht38IUhHgrhm2QyHPRek6iRXK4m28GXMRyjBkgLuPtMHM8rMQk 6tyt6F6dVEZzlbz/M8vJHQzxBzUiovljitj4CASPrudOZ5yFlAKroUmL0fxpB51mDFpi mL2K/oEFvcTA8aMfPrdsKagarJWZr0drP3LpqxCQC/g07bk6nYmspXQsS+FmuL6G3Gii 1ubunuZpEyg30NvCiSiqoPRA5qnKGs2a87ZAa9F6Uzwe/Nzts2K1dTEOkrrI7YYAmfDO p9tlWwJHUuBdgsyRf/qgB1ddvHvqnF889Rz4nRinMibKs/4rUtaeVW/RhXIEj5UoJjeQ WpYQ== X-Gm-Message-State: AOAM532U+8vaKXm16+2rgYeCF4Ju6JJrAlC5nVdLdEljPrsxKCqCKgJI PLRVp+JCoivClxNlyciDZRQhGgLbaXc= X-Google-Smtp-Source: ABdhPJxmJkD1jPnj7nPzMAjpt/45OrvFDZz+id6AvQeIC4HwM2mWjpyh9AAVXkZuyBazeUTgZGhqaQ== X-Received: by 2002:aa7:871a:: with SMTP id b26mr10152266pfo.294.1593471752629; Mon, 29 Jun 2020 16:02:32 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:32 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 3/6] device: Support marking a device with wake allowed Date: Mon, 29 Jun 2020 16:02:20 -0700 Message-Id: <20200629160206.BlueZ.v6.3.I1b0ff04f458fdaec2a193d27c2b94ce8f2cc4138@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 If a device is allowed to wake the host system from suspend, it should be marked as wake allowed. We add support for a new property that is sent to the kernel via set device flags mgmt op. We also add the dbus endpoint to allow the wake allowed setting to be controlled. In order for wake allowed to be set, the profile must also support wake. This setting isn't exposed to the user but must be set by profiles that intend to support wake from suspend. If a device is connecting for the first time, it will be marked WakeAllowed if the profile supports it. On subsequent reloads of bluez, the stored setting "WakeAllowed" will be used to override any other setting. --- Changes in v6: * Save pending property id and emit success only after set flags returns * Ignore multiple calls to set_wake_allowed to the same value * Emit property error busy if same value is already sent to mgmt * Fix up build issues reported by bluez.test.bot Changes in v5: * Refactor to use set_wake_flags and respond to device flags changed * Add wake_override so we can keep track of user/profile configuration vs what is currently active Changes in v4: * Renamed wake_capable to wake_allowed * Removed set_wake_capable mgmt op and updated add_device to accept flags to set whether a device is wakeable * Refactored adapter_whitelist_add and adapter_auto_connect_add to call adapter_add_device Changes in v3: * Added profile_wake_support and made wake_capable dependent on it Changes in v2: * Added dbus api "WakeCapable" to set value * Update device_set_wake_capable to be called by adapter_set_wake_capable_complete so we can emit property changed lib/mgmt.h | 2 + src/adapter.c | 93 ++++++++++++++++++++++ src/adapter.h | 3 +- src/device.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/device.h | 10 +++ 5 files changed, 319 insertions(+), 1 deletion(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index 525c4dd62..a800bcab4 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -665,6 +665,8 @@ struct mgmt_rp_get_device_flags { uint32_t current_flags; } __packed; +#define DEVICE_FLAG_REMOTE_WAKEUP (1 << 0) + #define MGMT_OP_SET_DEVICE_FLAGS 0x0050 #define MGMT_SET_DEVICE_FLAGS_SIZE 11 struct mgmt_cp_set_device_flags { diff --git a/src/adapter.c b/src/adapter.c index 9ce351893..bccdbe8bf 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -5102,6 +5102,94 @@ void adapter_auto_connect_add(struct btd_adapter *adapter, adapter->connect_list = g_slist_append(adapter->connect_list, device); } +static void set_device_wakeable_complete(uint8_t status, uint16_t length, + const void *param, void *user_data) +{ + const struct mgmt_rp_set_device_flags *rp = param; + struct btd_adapter *adapter = user_data; + struct btd_device *dev; + char addr[18]; + + if (status != MGMT_STATUS_SUCCESS) { + btd_error(adapter->dev_id, "Set device flags return status: %s", + mgmt_errstr(status)); + return; + } + + if (length < sizeof(*rp)) { + btd_error(adapter->dev_id, + "Too small Set Device Flags complete event: %d", + length); + return; + } + + ba2str(&rp->addr.bdaddr, addr); + + dev = btd_adapter_find_device(adapter, &rp->addr.bdaddr, rp->addr.type); + if (!dev) { + btd_error(adapter->dev_id, + "Set Device Flags complete for unknown device %s", + addr); + return; + } + + device_set_wake_allowed_complete(dev); +} + +void adapter_set_device_wakeable(struct btd_adapter *adapter, + struct btd_device *device, bool wakeable) +{ + struct mgmt_cp_set_device_flags cp; + const bdaddr_t *bdaddr; + uint8_t bdaddr_type; + + if (!kernel_conn_control) + return; + + bdaddr = device_get_address(device); + bdaddr_type = btd_device_get_bdaddr_type(device); + + memset(&cp, 0, sizeof(cp)); + bacpy(&cp.addr.bdaddr, bdaddr); + cp.addr.type = bdaddr_type; + cp.current_flags = btd_device_get_current_flags(device); + if (wakeable) + cp.current_flags |= DEVICE_FLAG_REMOTE_WAKEUP; + else + cp.current_flags &= ~DEVICE_FLAG_REMOTE_WAKEUP; + + mgmt_send(adapter->mgmt, MGMT_OP_SET_DEVICE_FLAGS, adapter->dev_id, + sizeof(cp), &cp, set_device_wakeable_complete, adapter, NULL); +} + +static void device_flags_changed_callback(uint16_t index, uint16_t length, + const void *param, void *user_data) +{ + const struct mgmt_ev_device_flags_changed *ev = param; + struct btd_adapter *adapter = user_data; + struct btd_device *dev; + char addr[18]; + + if (length < sizeof(*ev)) { + btd_error(adapter->dev_id, + "Too small Device Flags Changed event: %d", + length); + return; + } + + ba2str(&ev->addr.bdaddr, addr); + + dev = btd_adapter_find_device(adapter, &ev->addr.bdaddr, ev->addr.type); + if (!dev) { + btd_error(adapter->dev_id, + "Device Flags Changed for unknown device %s", addr); + return; + } + + btd_device_flags_changed(dev, ev->supported_flags, ev->current_flags); +} + + static void remove_device_complete(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -8544,6 +8632,11 @@ static int adapter_register(struct btd_adapter *adapter) adapter, NULL); load: + mgmt_register(adapter->mgmt, MGMT_EV_DEVICE_FLAGS_CHANGED, + adapter->dev_id, + device_flags_changed_callback, + adapter, NULL); + load_config(adapter); fix_storage(adapter); load_drivers(adapter); diff --git a/src/adapter.h b/src/adapter.h index d0a5253bd..f8ac20261 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -213,6 +213,8 @@ int adapter_connect_list_add(struct btd_adapter *adapter, struct btd_device *device); void adapter_connect_list_remove(struct btd_adapter *adapter, struct btd_device *device); +void adapter_set_device_wakeable(struct btd_adapter *adapter, + struct btd_device *dev, bool wakeable); void adapter_auto_connect_add(struct btd_adapter *adapter, struct btd_device *device); void adapter_auto_connect_remove(struct btd_adapter *adapter, @@ -231,4 +233,3 @@ void btd_adapter_for_each_device(struct btd_adapter *adapter, void *data); bool btd_le_connect_before_pairing(void); - diff --git a/src/device.c b/src/device.c index 7b0eb256e..ceddb6f75 100644 --- a/src/device.c +++ b/src/device.c @@ -177,6 +177,12 @@ struct csrk_info { uint32_t counter; }; +enum { + WAKE_FLAG_DEFAULT = 0, + WAKE_FLAG_ENABLED, + WAKE_FLAG_DISABLED, +}; + struct btd_device { int ref_count; @@ -189,6 +195,21 @@ struct btd_device { bool le; bool pending_paired; /* "Paired" waiting for SDP */ bool svc_refreshed; + + /* Manage whether this device can wake the system from suspend. + * - wake_support: Requires a profile that supports wake (i.e. HID) + * - wake_allowed: Is wake currently allowed? + * - pending_wake_allowed - Wake flag sent via set_device_flags + * - wake_override - User configured wake setting + */ + bool wake_support; + bool wake_allowed; + bool pending_wake_allowed; + uint8_t wake_override; + GDBusPendingPropertySet wake_id; + + uint32_t supported_flags; + uint32_t current_flags; GSList *svc_callbacks; GSList *eir_uuids; struct bt_ad *ad; @@ -415,6 +436,12 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_set_boolean(key_file, "General", "Blocked", device->blocked); + if (device->wake_override != WAKE_FLAG_DEFAULT) { + g_key_file_set_boolean(key_file, "General", "WakeAllowed", + device->wake_override == + WAKE_FLAG_ENABLED); + } + if (device->uuids) { GSList *l; int i; @@ -1318,6 +1345,131 @@ dev_property_advertising_data_exist(const GDBusPropertyTable *property, return bt_ad_has_data(device->ad, NULL); } +bool device_get_wake_support(struct btd_device *device) +{ + return device->wake_support; +} + +void device_set_wake_support(struct btd_device *device, bool wake_support) +{ + device->wake_support = wake_support; + + /* If wake configuration has not been made yet, set the initial + * configuration. + */ + if (device->wake_override == WAKE_FLAG_DEFAULT) { + device_set_wake_override(device, wake_support); + device_set_wake_allowed(device, wake_support, -1U); + } +} + +bool device_get_wake_allowed(struct btd_device *device) +{ + return device->wake_allowed; +} + +void device_set_wake_override(struct btd_device *device, bool wake_override) +{ + if (wake_override) { + device->wake_override = WAKE_FLAG_ENABLED; + device->current_flags |= DEVICE_FLAG_REMOTE_WAKEUP; + } else { + device->wake_override = WAKE_FLAG_DISABLED; + device->current_flags &= ~DEVICE_FLAG_REMOTE_WAKEUP; + } +} + +void device_set_wake_allowed(struct btd_device *device, bool wake_allowed, + GDBusPendingPropertySet id) +{ + /* Pending and current value are the same unless there is a change in + * progress. Only update wake allowed if pending value doesn't match the + * new value. + */ + if (wake_allowed == device->pending_wake_allowed) { + return; + } + + device->wake_id = id; + device->pending_wake_allowed = wake_allowed; + adapter_set_device_wakeable(device_get_adapter(device), device, + wake_allowed); +} + +void device_set_wake_allowed_complete(struct btd_device *device) +{ + if (device->wake_id != -1U) { + g_dbus_pending_property_success(device->wake_id); + device->wake_id = -1U; + } + + device->wake_allowed = device->pending_wake_allowed; + g_dbus_emit_property_changed(dbus_conn, device->path, + DEVICE_INTERFACE, "WakeAllowed"); + + store_device_info(device); +} + + +static gboolean +dev_property_get_wake_allowed(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct btd_device *device = data; + dbus_bool_t wake_allowed = device_get_wake_allowed(device); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &wake_allowed); + + return TRUE; +} + +static void dev_property_set_wake_allowed(const GDBusPropertyTable *property, + DBusMessageIter *value, + GDBusPendingPropertySet id, void *data) +{ + struct btd_device *device = data; + dbus_bool_t b; + + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_BOOLEAN) { + g_dbus_pending_property_error(id, + ERROR_INTERFACE ".InvalidArguments", + "Invalid arguments in method call"); + return; + } + + if (device->temporary) { + g_dbus_pending_property_error(id, + ERROR_INTERFACE ".Unsupported", + "Cannot set property while temporary"); + return; + } + + /* Emit busy or success depending on current value. */ + if (b == device->pending_wake_allowed) { + if (device->wake_allowed == device->pending_wake_allowed) + g_dbus_pending_property_success(id); + else + g_dbus_pending_property_error( + id, ERROR_INTERFACE ".Busy", + "Property change in progress"); + + return; + } + + dbus_message_iter_get_basic(value, &b); + device_set_wake_override(device, b); + device_set_wake_allowed(device, b, id); +} + +static gboolean dev_property_wake_allowed_exist( + const GDBusPropertyTable *property, void *data) +{ + struct btd_device *device = data; + + return device_get_wake_support(device); +} + + static gboolean disconnect_all(gpointer user_data) { struct btd_device *device = user_data; @@ -2790,6 +2942,9 @@ static const GDBusPropertyTable device_properties[] = { { "AdvertisingData", "a{yv}", dev_property_get_advertising_data, NULL, dev_property_advertising_data_exist, G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, + { "WakeAllowed", "b", dev_property_get_wake_allowed, + dev_property_set_wake_allowed, + dev_property_wake_allowed_exist }, { } }; @@ -3038,9 +3193,11 @@ static void convert_info(struct btd_device *device, GKeyFile *key_file) static void load_info(struct btd_device *device, const char *local, const char *peer, GKeyFile *key_file) { + GError *gerr = NULL; char *str; gboolean store_needed = FALSE; gboolean blocked; + gboolean wake_allowed; char **uuids; int source, vendor, product, version; char **techno, **t; @@ -3152,6 +3309,18 @@ next: btd_device_set_pnpid(device, source, vendor, product, version); } + /* Wake allowed is only configured and stored if user changed it. + * Otherwise, we enable if profile supports it. + */ + wake_allowed = g_key_file_get_boolean(key_file, "General", + "WakeAllowed", &gerr); + if (!gerr) { + device_set_wake_override(device, wake_allowed); + } else { + g_error_free(gerr); + gerr = NULL; + } + if (store_needed) store_device_info(device); } @@ -6558,6 +6727,49 @@ void btd_device_set_pnpid(struct btd_device *device, uint16_t source, store_device_info(device); } +uint32_t btd_device_get_current_flags(struct btd_device *dev) +{ + return dev->current_flags; +} + +/* This event is sent immediately after add device on all mgmt sockets. + * Afterwards, it is only sent to mgmt sockets other than the one which called + * set_device_flags. + */ +void btd_device_flags_changed(struct btd_device *dev, uint32_t supported_flags, + uint32_t current_flags) +{ + int i; + const uint32_t changed_flags = dev->current_flags ^ current_flags; + bool flag_value; + + dev->supported_flags = supported_flags; + dev->current_flags = current_flags; + + if (!changed_flags) + return; + + if (changed_flags & DEVICE_FLAG_REMOTE_WAKEUP) { + flag_value = !!(current_flags & DEVICE_FLAG_REMOTE_WAKEUP); + dev->pending_wake_allowed = flag_value; + + /* If an override exists and doesn't match the current state, + * apply it. This logic will run after Add Device only and will + * enable wake for previously paired devices. + */ + if (dev->wake_override != WAKE_FLAG_DEFAULT) { + bool wake_allowed = + dev->wake_override == WAKE_FLAG_ENABLED; + if (flag_value != wake_allowed) + device_set_wake_allowed(dev, wake_allowed, -1U); + else + device_set_wake_allowed_complete(dev); + } else { + device_set_wake_allowed_complete(dev); + } + } +} + static void service_state_changed(struct btd_service *service, btd_service_state_t old_state, btd_service_state_t new_state, diff --git a/src/device.h b/src/device.h index 06b100499..cb8d884e8 100644 --- a/src/device.h +++ b/src/device.h @@ -33,6 +33,7 @@ struct btd_device *device_create_from_storage(struct btd_adapter *adapter, char *btd_device_get_storage_path(struct btd_device *device, const char *filename); + void btd_device_device_set_name(struct btd_device *device, const char *name); void device_store_cached_name(struct btd_device *dev, const char *name); void device_get_name(struct btd_device *device, char *name, size_t len); @@ -139,6 +140,11 @@ void device_store_svc_chng_ccc(struct btd_device *device, uint8_t bdaddr_type, uint16_t value); void device_load_svc_chng_ccc(struct btd_device *device, uint16_t *ccc_le, uint16_t *ccc_bredr); +void device_set_wake_support(struct btd_device *device, bool wake_support); +void device_set_wake_override(struct btd_device *device, bool wake_override); +void device_set_wake_allowed(struct btd_device *device, bool wake_allowed, + guint32 id); +void device_set_wake_allowed_complete(struct btd_device *device); typedef void (*disconnect_watch) (struct btd_device *device, gboolean removal, void *user_data); @@ -176,5 +182,9 @@ struct btd_service *btd_device_get_service(struct btd_device *dev, int device_discover_services(struct btd_device *device); int btd_device_connect_services(struct btd_device *dev, GSList *services); +uint32_t btd_device_get_current_flags(struct btd_device *dev); +void btd_device_flags_changed(struct btd_device *dev, uint32_t supported_flags, + uint32_t current_flags); + void btd_device_init(void); void btd_device_cleanup(void); From patchwork Mon Jun 29 23:02:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632807 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 3EA2E92A for ; Mon, 29 Jun 2020 23:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 233FA20780 for ; Mon, 29 Jun 2020 23:02:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lTJW6YCM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728842AbgF2XCf (ORCPT ); Mon, 29 Jun 2020 19:02:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728782AbgF2XCe (ORCPT ); Mon, 29 Jun 2020 19:02:34 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E00D4C061755 for ; Mon, 29 Jun 2020 16:02:34 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id d4so9005832pgk.4 for ; Mon, 29 Jun 2020 16:02:34 -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=r/3TX1GMSyX3TTscRoWjCKEmSjIsfk15HaizZFDaaBE=; b=lTJW6YCM5+pShACNr8EEFsMa3SNagZUkm2LSLPPyu4neBqCjEa11U5k/msctTp75T3 gaFYlEIabatzaok7X3Cr3UwRyeAdvCYDJdq2VTwaD2riGd4XQBuZnNQ9Et4rbaf2Q5wC RS7ZcF4vN7Pd1VjCVaM0W5iEETRzHbxs9uikQ= 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=r/3TX1GMSyX3TTscRoWjCKEmSjIsfk15HaizZFDaaBE=; b=ti8U/8/8B57MSCGkH8LIOovo6Lk4YOEfLKhEbPoIS1oVwyicZaLIlpG6yBRMzuug/u 1TIERBVSeJnhRAFManOWPE9jtXj2DU2Ly7BEP761md1oxme5DXlo63+P1SH0Dizga2+2 BfPFOsziz6rcu7fOIS0DDsITVdylHWuH3BW/5Jj6nD19hd63dauR5sJ+Oe1tGCcZKiVo /uZ0m517bX2oXm8kSUFysv85eRIQJ1VW7xbZHWJyqM0i28Svcst4lnayDWSESqo5dZUV g3sVJvT1eD3Q3GFI0ocEqTWiUVgijgUjOGxjseDFwKBcc0OzZAcx98JGlA5MAogUg3TA ih2Q== X-Gm-Message-State: AOAM533XunWPlgyKpo/4jpuwIlUtf5SIIupqcg6MIQ+jbL2no1QlqQs7 +iAvhaOSi4l3QSBu7yoGaq06Zw== X-Google-Smtp-Source: ABdhPJwdCt/7ZNtZCdGixklixX9Az48KALTznFLeHTndARzZcL92dOJjSx/TZ8gI3H7fzj4nxnypDw== X-Received: by 2002:a62:7712:: with SMTP id s18mr16684110pfc.145.1593471753544; Mon, 29 Jun 2020 16:02:33 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:33 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 4/6] client: Display wake allowed property with info Date: Mon, 29 Jun 2020 16:02:21 -0700 Message-Id: <20200629160206.BlueZ.v6.4.I45dbf8ee15dff6c9346dc9754574a0be9bee1fa1@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 Display whether the device is configured as wake allowed when queried with cmd_info. --- Changes in v6: None Changes in v5: None Changes in v4: * Renamed WakeCapable to WakeAllowed Changes in v3: None Changes in v2: * Newly added to show whether device is wake capable * Removed automatically setting wake capable for HID devices client/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.c b/client/main.c index 422da5593..4953f50f0 100644 --- a/client/main.c +++ b/client/main.c @@ -1637,6 +1637,7 @@ static void cmd_info(int argc, char *argv[]) print_property(proxy, "Trusted"); print_property(proxy, "Blocked"); print_property(proxy, "Connected"); + print_property(proxy, "WakeAllowed"); print_property(proxy, "LegacyPairing"); print_uuids(proxy); print_property(proxy, "Modalias"); From patchwork Mon Jun 29 23:02:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632809 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 9644414E3 for ; Mon, 29 Jun 2020 23:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DF56206E9 for ; Mon, 29 Jun 2020 23:02:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="TgqteYzF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728859AbgF2XCg (ORCPT ); Mon, 29 Jun 2020 19:02:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728855AbgF2XCf (ORCPT ); Mon, 29 Jun 2020 19:02:35 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85D84C061755 for ; Mon, 29 Jun 2020 16:02:35 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id k1so7688846pls.2 for ; Mon, 29 Jun 2020 16:02:35 -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=xY3f6LHANd9HL4qtWewE6j/avY0O3O3qpSOKn6v3IpA=; b=TgqteYzF3Qo8SNCLDAu3rSFoz4yt7f0q7lmXMZgfb+rHO72XZuJlEC+55r9B9t06U5 AUDTaHAZns0j5Cn3MAgEfIK1cCRigF0gPt2Dm/eAAIml3PE/2TWjpxqq1urb3Xva0EBo MY3L+3JDAO0Ev9lg8w1e8NsQW39LDf9wLcHp4= 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=xY3f6LHANd9HL4qtWewE6j/avY0O3O3qpSOKn6v3IpA=; b=NBmmqLQsJ0oTpJdwa+z+PWsoYNhcUU6rMbCfXt9HO2j9BExTJTsH3PUzY7tmTOSzXo xLb/gAIJwNG12Qqh2XwYljASlfkO5R2lbmOCEuYaNV621xyHk77bhGol/pONHnNDO1iZ 6Dnts3HjvCYbTJAzwpA9dm/NoglTjZylixV2Kcv/u+MWgCbkG6J1FCqZWOpluHoV4zEh NukMKeFk96PoH1g3PJE1A3AOTsHx0eH45RhCKYIIU7YglN3qu2nq51wBzOxSO8CQa+jB n8vkjAQmMosqKlS04grxrQSgWapmyy0qkvYrjTpLHdZAaUD5qluTLtSwjAq5J/665jij DVjw== X-Gm-Message-State: AOAM53351mP1I+/dwGMK6r4k6ClRKEZADJyVH2uO0LVTh0iw96IO4rOm MqjieWXnneMeEcK8jczHdQak4w== X-Google-Smtp-Source: ABdhPJzkQoby85gty2n0QUwDODB2heVXg5ccm3vGX9FUUp4oERuWFI6wET/Op5zKsjIWnVtYkvHOsw== X-Received: by 2002:a17:902:8c8a:: with SMTP id t10mr12742132plo.153.1593471755120; Mon, 29 Jun 2020 16:02:35 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:34 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 5/6] doc/device-api: Add WakeAllowed Date: Mon, 29 Jun 2020 16:02:22 -0700 Message-Id: <20200629160206.BlueZ.v6.5.If391d18ed934a1d9c24d3f54e4fee3fded0b17ab@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 Add documentation for WakeAllowed, which allows a device to wake the system from suspend. --- Changes in v6: None Changes in v5: None Changes in v4: * Renamed WakeCapable to WakeAllowed Changes in v3: * Added documentation for WakeCapable Changes in v2: None doc/device-api.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/device-api.txt b/doc/device-api.txt index 65d8fee37..4e824d2de 100644 --- a/doc/device-api.txt +++ b/doc/device-api.txt @@ -189,6 +189,11 @@ Properties string Address [readonly] drivers will also be removed and no new ones will be probed as long as the device is blocked. + boolean WakeAllowed [readwrite] + + If set to true this device will be allowed to wake the + host from system suspend. + string Alias [readwrite] The name alias for the remote device. The alias can From patchwork Mon Jun 29 23:02:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 11632811 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 0F6B992A for ; Mon, 29 Jun 2020 23:02:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECA8E20780 for ; Mon, 29 Jun 2020 23:02:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JxvkC+kr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728870AbgF2XCi (ORCPT ); Mon, 29 Jun 2020 19:02:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728855AbgF2XCh (ORCPT ); Mon, 29 Jun 2020 19:02:37 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE509C061755 for ; Mon, 29 Jun 2020 16:02:36 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id 67so4469107pfg.5 for ; Mon, 29 Jun 2020 16:02:36 -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=agMkRPFhgMe1f/hFXF9SjRTi2sxyZRnC9GuMfZzTrjc=; b=JxvkC+krK9jVF8aauUPT4a0+JgM9VTquGgkwnEGJBAGNw5+ivq6qIE9T21xD96F+mI y5qMrOldan0EA0MkPEX9qgehcibNmU7v3TvKKFUjKpSOBvcu/SZRBWrdLng3ZiAmqFJH A9VdLr+fHCJWS9fTftRERv9/dQk6KcRFJioCk= 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=agMkRPFhgMe1f/hFXF9SjRTi2sxyZRnC9GuMfZzTrjc=; b=YnQmykZVKGsFkdChw1rkEDpo+iqulaOhYS4b36g1V+zJrvhgZyIZFz/7s2T5qVVPOq R+ktMAAd6HpYzy+NKIWyJz2YXPJVTETEp1fS2/X8ORNDJupoCnEREOwPyZpmPb6ZMXO1 6Bm3kcVtby/a/9h7w/SHfVjEXPzJXDp/4b8lqd1m36NC9DBuNb+w1bJAbHSbkzMc8yO1 qK3PNfIp06obLuHZ8R9+x196qNP8qO85yRLdQt6SiASIfuaab4iypog4A5f5WKhLMzmp 23gk4fvibcNnkygE5yYi+ksR8dlmoAd+n3hqK5VrNR//XiMXx3zA5L6wLR1dcwvI1JkJ GnhA== X-Gm-Message-State: AOAM5300mXdkEz5ewLxb5DAYXKDPbuSMURW8kZAK6bCWFLY1aJiWhsZY 1JQeZs2aINrbejD2M9RBGPbcWw== X-Google-Smtp-Source: ABdhPJyihaBDtBDoNLeXy0/ngiL8p0sO2snTgxoepPvvnBczq7OX2koloKiIPgHYt2v6ecWBf69QgQ== X-Received: by 2002:aa7:8ad9:: with SMTP id b25mr16484227pfd.248.1593471756268; Mon, 29 Jun 2020 16:02:36 -0700 (PDT) Received: from apsdesk.mtv.corp.google.com ([2620:15c:202:1:e09a:8d06:a338:aafb]) by smtp.gmail.com with ESMTPSA id i13sm467275pjd.33.2020.06.29.16.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 16:02:35 -0700 (PDT) From: Abhishek Pandit-Subedi To: luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Cc: alainm@chromium.org, marcel@holtmann.org, chromeos-bluetooth-upstreaming@chromium.org, Abhishek Pandit-Subedi Subject: [BlueZ PATCH v6 6/6] input: Make HID devices support wake Date: Mon, 29 Jun 2020 16:02:23 -0700 Message-Id: <20200629160206.BlueZ.v6.6.I3290604153369ff32013f3dcadda4df3f2eb0f36@changeid> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog In-Reply-To: <20200629230223.3538949-1-abhishekpandit@chromium.org> References: <20200629230223.3538949-1-abhishekpandit@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 HID devices can wake the host from a suspended state. Mark the profiles to support wake when they are accepted. If the device hasn't already been configured with a Wake Allowed configuration, it will default to yes when the profile is accepted. --- Changes in v6: None Changes in v5: * Only call device_set_wake_support Changes in v4: * Renamed device_set_profile_wake_support to just device_set_wake_support Changes in v3: * Mark HID device to support wake from suspend Changes in v2: None profiles/input/device.c | 1 + profiles/input/hog.c | 1 + 2 files changed, 2 insertions(+) diff --git a/profiles/input/device.c b/profiles/input/device.c index d3724ed54..2dc2ecab2 100644 --- a/profiles/input/device.c +++ b/profiles/input/device.c @@ -1409,6 +1409,7 @@ int input_device_register(struct btd_service *service) } btd_service_set_user_data(service, idev); + device_set_wake_support(device, true); return 0; } diff --git a/profiles/input/hog.c b/profiles/input/hog.c index 9335b7e8b..130f696a9 100644 --- a/profiles/input/hog.c +++ b/profiles/input/hog.c @@ -166,6 +166,7 @@ static int hog_probe(struct btd_service *service) return -EINVAL; btd_service_set_user_data(service, dev); + device_set_wake_support(device, true); return 0; }