From patchwork Sun Mar 25 16:07:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Rivas Costa X-Patchwork-Id: 10306673 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 59F1660212 for ; Sun, 25 Mar 2018 16:07:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4994C292D4 for ; Sun, 25 Mar 2018 16:07:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DC1E292EF; Sun, 25 Mar 2018 16:07:45 +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=unavailable 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 BCC77292D4 for ; Sun, 25 Mar 2018 16:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753511AbeCYQH1 (ORCPT ); Sun, 25 Mar 2018 12:07:27 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34781 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753468AbeCYQHW (ORCPT ); Sun, 25 Mar 2018 12:07:22 -0400 Received: by mail-wm0-f66.google.com with SMTP id a20so13386078wmd.1; Sun, 25 Mar 2018 09:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KSEKdIFPa85BSs3CWBLWGZDt4jnASyt9ZHUDYf97y/U=; b=c97yZDMUbVAGJR5Xr4nKQ4wihU+t6dDLgeS4cdnn1pbpG59L2edgoyItZULIJcTbUv K7OawoOZvINTP5UL3NEXSQ0jnIiJcFnHLHQrOrWdFRP3IB3oMr+2fo1BoRUlSbU3WC5u aYg9IU+ed+9y0o82J/RdUUAtt/81wUQawvOtitJPdDHAY5+PdSR9ZJ+7wEzXcvPo/9S/ /4PJfDkUcKm+kDkrXH0OQpzFwQ7DQ6SUdvMZ6SQo3ADXyb7hIr50KwK+ko2Mw3tWHVWJ GWF3xiSy1Pgr08JEUUvIq8dn/EcTSEXCOFfrHSYPlEqWJYsWzvFGzbJrmuBNNMQdEAby 6XEQ== 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; bh=KSEKdIFPa85BSs3CWBLWGZDt4jnASyt9ZHUDYf97y/U=; b=PgJomtsSZGvZ2XxNyPo3TWd0aKbMMVO1VIuvacy4pMGIDi0nJHztcOiqPxDGW4ghOr cGecn7hqnScXYdiSdTbdFARZP5ZkJqBikeV2CWIdiYLpiapKDuLMFcbRVgSXjifoLJE+ y7z23qfbVMr5wNSlboBcIxQ7AUsXsFBB/yuJXE3it3miW59QeEzQ5bTRmPsHUHQJJYfv /ekZeyie5QsRa5RnsEPQ2fSQC7naTeF7rEkoColBtySn2aYlD2/jv7uPiuoD2VvAFq0k laP8x6vZSR+dHA8BUe+T9baPO5Z8XCQHSRa4PVzyLk+6OrZzEddePYvW/bOHcyNPDtxt fV3Q== X-Gm-Message-State: AElRT7E12LdVRZfph8ASY7Bm+zhDd8v5O90homxxQCduuYojqKosItRp +9SkWb71vwO5eZZ8DBezL5e2E1jb4hw= X-Google-Smtp-Source: AIpwx4/FstFfBPkJalkiUfkSFSeGoYbW2CHbhhS/tEBYPsXEeIFma1HtI30i20Ln/Or1HhPWcUVNhg== X-Received: by 10.28.14.9 with SMTP id 9mr8813274wmo.127.1521994040826; Sun, 25 Mar 2018 09:07:20 -0700 (PDT) Received: from localhost.localdomain ([2a01:c50e:5126:7a00:bd6c:45b8:67f:9f14]) by smtp.gmail.com with ESMTPSA id 67sm15359867wmq.17.2018.03.25.09.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Mar 2018 09:07:20 -0700 (PDT) From: Rodrigo Rivas Costa To: Benjamin Tissoires , "Pierre-Loup A. Griffais" , =?UTF-8?q?Cl=C3=A9ment=20VUCHENER?= , Jiri Kosina , Cameron Gutman , lkml , linux-input Cc: Rodrigo Rivas Costa Subject: [PATCH v7 2/2] HID: steam: add battery device. Date: Sun, 25 Mar 2018 18:07:03 +0200 Message-Id: <20180325160703.15997-3-rodrigorivascosta@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180325160703.15997-1-rodrigorivascosta@gmail.com> References: <20180325160703.15997-1-rodrigorivascosta@gmail.com> 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 wireless Steam Controller is battery operated, so add the battery device and power information. --- drivers/hid/hid-steam.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c index 3504d2e2d0e5..28dd5ebe2b9a 100644 --- a/drivers/hid/hid-steam.c +++ b/drivers/hid/hid-steam.c @@ -75,6 +75,10 @@ struct steam_device { struct work_struct work_connect; bool connected; char serial_no[STEAM_SERIAL_LEN + 1]; + struct power_supply_desc battery_desc; + struct power_supply __rcu *battery; + u8 battery_charge; + u16 voltage; }; static int steam_recv_report(struct steam_device *steam, @@ -238,6 +242,85 @@ static void steam_input_close(struct input_dev *dev) mutex_unlock(&steam->mutex); } +static enum power_supply_property steam_battery_props[] = { + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_SCOPE, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_CAPACITY, +}; + +static int steam_battery_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct steam_device *steam = power_supply_get_drvdata(psy); + unsigned long flags; + s16 volts; + u8 batt; + int ret = 0; + + spin_lock_irqsave(&steam->lock, flags); + volts = steam->voltage; + batt = steam->battery_charge; + spin_unlock_irqrestore(&steam->lock, flags); + + switch (psp) { + case POWER_SUPPLY_PROP_PRESENT: + val->intval = 1; + break; + case POWER_SUPPLY_PROP_SCOPE: + val->intval = POWER_SUPPLY_SCOPE_DEVICE; + break; + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + val->intval = volts * 1000; /* mV -> uV */ + break; + case POWER_SUPPLY_PROP_CAPACITY: + val->intval = batt; + break; + default: + ret = -EINVAL; + break; + } + return ret; +} + +static int steam_battery_register(struct steam_device *steam) +{ + struct power_supply *battery; + struct power_supply_config battery_cfg = { .drv_data = steam, }; + unsigned long flags; + int ret; + + steam->battery_desc.type = POWER_SUPPLY_TYPE_BATTERY; + steam->battery_desc.properties = steam_battery_props; + steam->battery_desc.num_properties = ARRAY_SIZE(steam_battery_props); + steam->battery_desc.get_property = steam_battery_get_property; + steam->battery_desc.name = devm_kasprintf(&steam->hdev->dev, + GFP_KERNEL, "steam-controller-%s-battery", + steam->serial_no); + if (!steam->battery_desc.name) + return -ENOMEM; + + /* avoid the warning of 0% battery while waiting for the first info */ + spin_lock_irqsave(&steam->lock, flags); + steam->voltage = 3000; + steam->battery_charge = 100; + spin_unlock_irqrestore(&steam->lock, flags); + + battery = power_supply_register(&steam->hdev->dev, + &steam->battery_desc, &battery_cfg); + if (IS_ERR(battery)) { + ret = PTR_ERR(battery); + hid_err(steam->hdev, + "%s:power_supply_register failed with error %d\n", + __func__, ret); + return ret; + } + rcu_assign_pointer(steam->battery, battery); + power_supply_powers(battery, &steam->hdev->dev); + return 0; +} + static int steam_register(struct steam_device *steam) { struct hid_device *hdev = steam->hdev; @@ -327,6 +410,10 @@ static int steam_register(struct steam_device *steam) rcu_assign_pointer(steam->input, input); + /* ignore battery errors, we can live without it */ + if (steam->quirks & STEAM_QUIRK_WIRELESS) + steam_battery_register(steam); + return 0; input_register_fail: @@ -337,11 +424,18 @@ static int steam_register(struct steam_device *steam) static void steam_unregister(struct steam_device *steam) { struct input_dev *input; + struct power_supply *battery; rcu_read_lock(); input = rcu_dereference(steam->input); + battery = rcu_dereference(steam->battery); rcu_read_unlock(); + if (battery) { + RCU_INIT_POINTER(steam->battery, NULL); + synchronize_rcu(); + power_supply_unregister(battery); + } if (input) { RCU_INIT_POINTER(steam->input, NULL); synchronize_rcu(); @@ -745,12 +839,44 @@ static void steam_do_input_event(struct steam_device *steam, input_sync(input); } +/* + * The size for this message payload is 11. + * The known values are: + * Offset| Type | Meaning + * -------+-------+--------------------------- + * 4-7 | u32 | sequence number + * 8-11 | -- | always 0 + * 12-13 | u16 | voltage (mV) + * 14 | u8 | battery percent + */ +static void steam_do_battery_event(struct steam_device *steam, + struct power_supply *battery, u8 *data) +{ + unsigned long flags; + + s16 volts = le16_to_cpup((__le16 *)(data + 12)); + u8 batt = data[14]; + + /* Creating the battery may have failed */ + rcu_read_lock(); + battery = rcu_dereference(steam->battery); + if (likely(battery)) { + spin_lock_irqsave(&steam->lock, flags); + steam->voltage = volts; + steam->battery_charge = batt; + spin_unlock_irqrestore(&steam->lock, flags); + power_supply_changed(battery); + } + rcu_read_unlock(); +} + static int steam_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { struct steam_device *steam = hid_get_drvdata(hdev); struct input_dev *input; + struct power_supply *battery; if (!steam) return 0; @@ -808,7 +934,19 @@ static int steam_raw_event(struct hid_device *hdev, } break; case 0x04: - /* TODO: battery status */ + if (steam->quirks & STEAM_QUIRK_WIRELESS) { + rcu_read_lock(); + battery = rcu_dereference(steam->battery); + if (likely(battery)) { + steam_do_battery_event(steam, battery, data); + } else { + dbg_hid( + "%s: battery data without connect event\n", + __func__); + steam_do_connect_event(steam, true); + } + rcu_read_unlock(); + } break; } return 0;