From patchwork Mon Jan 29 18:00:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szilard Fabian X-Patchwork-Id: 193631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp736432dyb; Mon, 29 Jan 2024 10:01:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHRsdBDwpXBs1QUbvjNzlRAhWyvmiK8sGfBxS1Si1U0NcVV4NrjEqfVnr0u+0djVnJ6u8dE X-Received: by 2002:a05:6402:b76:b0:55e:f3ce:c621 with SMTP id cb22-20020a0564020b7600b0055ef3cec621mr2521552edb.2.1706551316787; Mon, 29 Jan 2024 10:01:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706551316; cv=pass; d=google.com; s=arc-20160816; b=wYFyP24scFoqOfizTceIqYO529aLqcHK0ZbpbY7KcM4tTgZvStgx+HtJ/eeD8CfdCv dNuVnmUuV30lhCFCzhBE3WpgZtYhM32WWBP5NpsjxGy4dwIGcrhHDNmEOzUwa/hfer12 S492JGylJih/yAYimWvzWEtkcHOPFBrWK1/9kVtI59NbKJVFssOpDp0kjQt924Lrdt7b ePUZkhaQwhNNmGb0oWGk4G5FcW1c7F1g9+pY5U2jJr+6COD0n7kZlAl/z7/2UApDzaeT hozMdash0yn+BU7RDLzH7c0Qd2JkJaDfoczqMgOQDTp8XQWE4Ppuvym66lbEsSvQQUxV F8/Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:feedback-id:references :in-reply-to:message-id:subject:cc:from:to:date:dkim-signature; bh=kWKQ4f/Bj8ANB5Z+gowC7n7O4QcvZo07zvKsDMyLdv4=; fh=wyr5kd+OHhec+fSqlVS0QwHY6kapvvv7KAguD+qAyuw=; b=lvfMSsMbfD5DNPh19mslcSWj21jX8BwONRrEFA10V6G2ZKXw6+ShPNBA7RenGvQtck VyizXKsOPInjozlo378EwT13FkSAgLr52YW/Uj382/XJ2LX1Zq5rDE754xtUKNBrJ4bx GwqdwL2QEQtrtzQFP6dMd10eyStJIRC4gnjrfemUmMRpodzZJP+P3XghSXcGcMyzsRv9 yeyWEuD6dMSUmzo7arAxBHh++yzpxEsiFXAA8KTcnjn4CbIa2d7ddHhY5996ewZO5heb 6DmTQbhGncQk2iP44cOBNaiM2uc2Q5POZXTZ8AcgYfXW0WgODC/4VDVMuYndvfgQkl3H +f3Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bluemarch.art header.s=protonmail header.b=H9CPCZo2; arc=pass (i=1 spf=pass spfdomain=bluemarch.art dkim=pass dkdomain=bluemarch.art dmarc=pass fromdomain=bluemarch.art); spf=pass (google.com: domain of linux-kernel+bounces-43257-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-43257-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bluemarch.art Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id dj11-20020a05640231ab00b00559675992b4si3825778edb.593.2024.01.29.10.01.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 10:01:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-43257-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@bluemarch.art header.s=protonmail header.b=H9CPCZo2; arc=pass (i=1 spf=pass spfdomain=bluemarch.art dkim=pass dkdomain=bluemarch.art dmarc=pass fromdomain=bluemarch.art); spf=pass (google.com: domain of linux-kernel+bounces-43257-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-43257-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bluemarch.art Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A494A1F24381 for ; Mon, 29 Jan 2024 18:01:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 095D3156967; Mon, 29 Jan 2024 18:00:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bluemarch.art header.i=@bluemarch.art header.b="H9CPCZo2" Received: from mail-4323.proton.ch (mail-4323.proton.ch [185.70.43.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5924A76020; Mon, 29 Jan 2024 18:00:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.23 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706551247; cv=none; b=IJK2v7f3eV2bkqbllXWRZUywJ34ropj49hfsHcyQpKxbp5dyo4k43xJAXDNDq3MjjWnRSZ7qsyDC3PhKIJO+cPfgZjFvDibaUg653PITsDTwh5Gukrb2PClZbBTy5dpUWV8k/doox7ImVuyyd44cZ/V3RMtedYKgqMQ7Y1JVTXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706551247; c=relaxed/simple; bh=9+ZXDWdPJAeaOha4zQ1+0jITzNR/67zdHl/455cVzFs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MsaCpdY6O2im0DTNzkjSB8L8FGhw2c7oPo1XEwY6RNpN3n4jwMqzIylumvcRpACxLoT4vPjg++aGnblgGvEKBailjulZpCI5++LrZXaGF2Uvb1Pj6Y5Tx54CCed0NkBAkhgTi24w2DvKiftSo+yAjLmme/7IHseZ9hKlYsTFKZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bluemarch.art; spf=pass smtp.mailfrom=bluemarch.art; dkim=pass (2048-bit key) header.d=bluemarch.art header.i=@bluemarch.art header.b=H9CPCZo2; arc=none smtp.client-ip=185.70.43.23 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bluemarch.art Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bluemarch.art DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bluemarch.art; s=protonmail; t=1706551238; x=1706810438; bh=kWKQ4f/Bj8ANB5Z+gowC7n7O4QcvZo07zvKsDMyLdv4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=H9CPCZo2u6qZ/3/9eT+ywwPT/1puRst6FP4/qIpwh+wing44HiWGvRGgYQbLh0Ucz Iio49A695GWzfpsNggg/t6gyvdeGj4b8YOCRYiud7OVWEue+akyp5ink+tUzf/j446 CxaCm382vSV00P02NHEEOXWGT2hXEzZ5ZcOiADCdH/I6HtRtAiZwJQSkhiEbziNq9A msAL/yj/7/KuAjPUTFuM2Q5qQd1xTSo+Gr4XTpqD58pjXNGeUOQ/OqHlLWYtt85FEg 8Gxwzv6RGf1Xr5d0wV2IQJASAQx6qQIo7Opkc2GCsZvE5CyWCkaE7ujBUiG+E92zHv cM0cZthzt7UBA== Date: Mon, 29 Jan 2024 18:00:23 +0000 To: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, jwoithe@just42.net, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com From: Szilard Fabian Cc: Szilard Fabian Subject: [RFC PATCH v2] platform/x86/fujitsu-laptop: Add battery charge control support Message-ID: <20240129175714.164326-2-szfabian@bluemarch.art> In-Reply-To: <20240129163502.161409-2-szfabian@bluemarch.art> References: <20240129163502.161409-2-szfabian@bluemarch.art> Feedback-ID: 87830438:user:proton Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789443686763452094 X-GMAIL-MSGID: 1789448753732862263 This patch adds battery charge control support on Fujitsu notebooks via the S006 method of the FUJ02E3 ACPI device. With this method it's possible to set charge_control_end_threshold between 50 and 100%. Tested on Lifebook E5411 and Lifebook U728. Sadly I can't test this patch on a dual battery one, but I didn't find any clue about independent battery charge control on dual battery Fujitsu notebooks either. And by that I mean checking the DSDT table of various Lifebook notebooks and reverse engineering FUJ02E3.dll. Signed-off-by: Szilard Fabian --- v2: Forgot to sign-off the original commit. Fixed, sorry for the inconvenience. --- drivers/platform/x86/fujitsu-laptop.c | 95 +++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 085e044e888e..bf3df74e4d63 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -49,6 +49,8 @@ #include #include #include +#include +#include #include #define FUJITSU_DRIVER_VERSION "0.6.0" @@ -97,6 +99,10 @@ #define BACKLIGHT_OFF (BIT(0) | BIT(1)) #define BACKLIGHT_ON 0 +/* FUNC interface - battery control interface */ +#define FUNC_S006_METHOD 0x1006 +#define CHARGE_CONTROL_RW 0x21 + /* Scancodes read from the GIRB register */ #define KEY1_CODE 0x410 #define KEY2_CODE 0x411 @@ -164,6 +170,91 @@ static int call_fext_func(struct acpi_device *device, return value; } +/* Battery charge control code */ + +static ssize_t charge_control_end_threshold_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + int value, ret; + + ret = kstrtouint(buf, 10, &value); + if (ret) + return ret; + + if (value < 50 || value > 100) + return -EINVAL; + + int cc_end_value, s006_cc_return; + + cc_end_value = value * 0x100 + 0x20; + s006_cc_return = call_fext_func(fext, FUNC_S006_METHOD, + CHARGE_CONTROL_RW, cc_end_value, 0x0); + + /* + * The S006 0x21 method returns 0x00 in case the provided value + * is invalid. + */ + if (s006_cc_return == 0x00) + return -EINVAL; + + return count; +} + +static ssize_t charge_control_end_threshold_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + int status; + status = call_fext_func(fext, FUNC_S006_METHOD, + CHARGE_CONTROL_RW, 0x21, 0x0); + + return sprintf(buf, "%d\n", status); +} + +static DEVICE_ATTR_RW(charge_control_end_threshold); + +/* ACPI battery hook */ + +static int fujitsu_battery_add(struct power_supply *battery, + struct acpi_battery_hook *hook) +{ + /* Check if there is an existing FUJ02E3 ACPI device. */ + if (fext == NULL) + return -ENODEV; + + /* + * Check if the S006 0x21 method exists by trying to get the current + * battery charge limit. + */ + int s006_cc_return; + s006_cc_return = call_fext_func(fext, FUNC_S006_METHOD, + CHARGE_CONTROL_RW, 0x21, 0x0); + if (s006_cc_return == UNSUPPORTED_CMD) + return -ENODEV; + + if (device_create_file(&battery->dev, + &dev_attr_charge_control_end_threshold)) + return -ENODEV; + + return 0; +} + +static int fujitsu_battery_remove(struct power_supply *battery, + struct acpi_battery_hook *hook) +{ + device_remove_file(&battery->dev, + &dev_attr_charge_control_end_threshold); + + return 0; +} + +static struct acpi_battery_hook battery_hook = { + .add_battery = fujitsu_battery_add, + .remove_battery = fujitsu_battery_remove, + .name = "Fujitsu Battery Extension", +}; + /* Hardware access for LCD brightness control */ static int set_lcd_level(struct acpi_device *device, int level) @@ -839,6 +930,8 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) if (ret) goto err_free_fifo; + battery_hook_register(&battery_hook); + return 0; err_free_fifo: @@ -851,6 +944,8 @@ static void acpi_fujitsu_laptop_remove(struct acpi_device *device) { struct fujitsu_laptop *priv = acpi_driver_data(device); + battery_hook_unregister(&battery_hook); + fujitsu_laptop_platform_remove(device); kfifo_free(&priv->fifo);