From patchwork Tue Apr 3 17:52:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 10321597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28F9C60318 for ; Tue, 3 Apr 2018 17:52:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1883B28C83 for ; Tue, 3 Apr 2018 17:52:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D14028C85; Tue, 3 Apr 2018 17:52:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FF6828C83 for ; Tue, 3 Apr 2018 17:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685AbeDCRwY (ORCPT ); Tue, 3 Apr 2018 13:52:24 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:45851 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751561AbeDCRwX (ORCPT ); Tue, 3 Apr 2018 13:52:23 -0400 Received: by mail-pl0-f67.google.com with SMTP id v18-v6so7901361ply.12; Tue, 03 Apr 2018 10:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=XVryurwpM9Jp4bxtRDYwc/HkXwdrq1+ydmKTFXRv5sg=; b=HjQNUJGKTOBCmuZUlpvXOi40TSYpFdJ067QF0r3SsBDZtp1FMyKM3aosBtzgmmaoCa oeVLZ+sNHHmf4HC+gUpOdxlPzEu0dHIA7GZxk9w6u+1LkTACVFjOF1OT46ove+l4Yi+M p2hna4X2ZiCnEc+U6F/qnDBVKkJsbPodTWbi7qnjP5mCxd+zNIzAw72pEwswTWM35R+x Z5W0zSwXsJYwgM8cFCT7xgzMOTUs5xR6OAmycKQqQWFqHbrvlswJ9Uid2LhOLpbw9tdN FA4TlvWfdk2b6ZbeZv6WTyF4P6vBamyk0s3csvQgOAqajoxH5vh7QNG7DKCkjxOqAwX7 iPyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=XVryurwpM9Jp4bxtRDYwc/HkXwdrq1+ydmKTFXRv5sg=; b=IcQqrq0aX5CsWun/792nEL7XT8sWhdqiP4YYjX8p4F+inIzOtvogaXlcfWeMqOtbgu WpRTdUeZr8EomFWSyPctuddVRSO0GYIbscvscAH+2MCmUP5t24irBT13sTs4D43+WbyQ FdhYBNMlUyTPl4hFsmEgdlu/yjv3hXGrFdNpXxizZDlHLfMDg9B45Ud/AEywHygfQGJ0 dLPwIH2HIuZWKyIiiQNddFReTMJOI9GdK6ZNXh2erSx+90IRV0N1kTDF6k3SY3cFQBsf 3XaG0/PVUWZ77EaV7T6ctP6fbHC0ij2UcmULbgjH+mLN4YGs3NJ1lySfZbUyM4+N0aDA 8C7Q== X-Gm-Message-State: AElRT7FjYKQAjdsEOhH5e1rEifYK3lHWWMpYC3RW6SsJDiqp6cAVpjFz WYINao5PsF0mhizo54L3rPAtT3D1 X-Google-Smtp-Source: AIpwx49Kci/zI3rulXElMAyHYnfyL58W2PnuuS6N98JaIaC4+C8JyYIMzgpEjxN1vvZy18WUk76yrw== X-Received: by 10.99.155.2 with SMTP id r2mr9925414pgd.450.1522777942572; Tue, 03 Apr 2018 10:52:22 -0700 (PDT) Received: from dtor-ws ([2620:0:1000:1511:8de6:27a8:ed13:2ef5]) by smtp.gmail.com with ESMTPSA id c15sm6944591pfm.114.2018.04.03.10.52.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Apr 2018 10:52:22 -0700 (PDT) Date: Tue, 3 Apr 2018 10:52:20 -0700 From: Dmitry Torokhov To: Jiri Kosina , Martin Cc: Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] HID: input: fix battery level reporting on BT mice Message-ID: <20180403175220.GA148162@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit 581c4484769e ("HID: input: map digitizer battery usage") assumed that devices having input (qas opposed to feature) report for battery strength would report the data on their own, without the need to be polled by the kernel; unfortunately it is not so. Many wireless mice do not send unsolicited reports with battery strength data and have to be polled explicitly. As a complication, stylus devices on digitizers are not normally connected to the base and thus can not be polled - the base can only determine battery strength in the stylus when it is in proximity. To solve this issue, we add a special flag that tells the kernel to avoid polling the device (and expect unsolicited reports) and set it when report field with physical usage of digitizer stylus (HID_DG_STYLUS). Unless this flag is set, and we have not seen the unsolicited reports, the kernel will attempt to poll the device when userspace attempts to read "capacity" and "state" attributes of power_supply object corresponding to the devices battery. Fixes: 581c4484769e ("HID: input: map digitizer battery usage") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=198095 Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov --- Martin, give this patch a try and reply with your name/email if you want to be credited for reporting/testing. Thanks! drivers/hid/hid-input.c | 24 +++++++++++++++++------- include/linux/hid.h | 9 ++++++++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 6836a856c243..930652c25120 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -387,7 +387,8 @@ static int hidinput_get_battery_property(struct power_supply *psy, break; case POWER_SUPPLY_PROP_CAPACITY: - if (dev->battery_report_type == HID_FEATURE_REPORT) { + if (dev->battery_status != HID_BATTERY_REPORTED && + !dev->battery_avoid_query) { value = hidinput_query_battery_capacity(dev); if (value < 0) return value; @@ -403,17 +404,17 @@ static int hidinput_get_battery_property(struct power_supply *psy, break; case POWER_SUPPLY_PROP_STATUS: - if (!dev->battery_reported && - dev->battery_report_type == HID_FEATURE_REPORT) { + if (dev->battery_status != HID_BATTERY_REPORTED && + !dev->battery_avoid_query) { value = hidinput_query_battery_capacity(dev); if (value < 0) return value; dev->battery_capacity = value; - dev->battery_reported = true; + dev->battery_status = HID_BATTERY_QUERIED; } - if (!dev->battery_reported) + if (dev->battery_status == HID_BATTERY_UNKNOWN) val->intval = POWER_SUPPLY_STATUS_UNKNOWN; else if (dev->battery_capacity == 100) val->intval = POWER_SUPPLY_STATUS_FULL; @@ -486,6 +487,14 @@ static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type, dev->battery_report_type = report_type; dev->battery_report_id = field->report->id; + /* + * Stylus is normally not connected to the device and thus we + * can't query the device and get meaningful battery strength. + * We have to wait for the device to report it on its own. + */ + dev->battery_avoid_query = report_type == HID_INPUT_REPORT && + field->physical == HID_DG_STYLUS; + dev->battery = power_supply_register(&dev->dev, psy_desc, &psy_cfg); if (IS_ERR(dev->battery)) { error = PTR_ERR(dev->battery); @@ -530,9 +539,10 @@ static void hidinput_update_battery(struct hid_device *dev, int value) capacity = hidinput_scale_battery_capacity(dev, value); - if (!dev->battery_reported || capacity != dev->battery_capacity) { + if (dev->battery_status != HID_BATTERY_REPORTED || + capacity != dev->battery_capacity) { dev->battery_capacity = capacity; - dev->battery_reported = true; + dev->battery_status = HID_BATTERY_REPORTED; power_supply_changed(dev->battery); } } diff --git a/include/linux/hid.h b/include/linux/hid.h index 8da3e1f48195..26240a22978a 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -516,6 +516,12 @@ enum hid_type { HID_TYPE_USBNONE }; +enum hid_battery_status { + HID_BATTERY_UNKNOWN = 0, + HID_BATTERY_QUERIED, /* Kernel explicitly queried battery strength */ + HID_BATTERY_REPORTED, /* Device sent unsolicited battery strength report */ +}; + struct hid_driver; struct hid_ll_driver; @@ -558,7 +564,8 @@ struct hid_device { /* device report descriptor */ __s32 battery_max; __s32 battery_report_type; __s32 battery_report_id; - bool battery_reported; + enum hid_battery_status battery_status; + bool battery_avoid_query; #endif unsigned int status; /* see STAT flags above */