From patchwork Tue Feb 27 12:05:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szilard Fabian X-Patchwork-Id: 207163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2648717dyb; Tue, 27 Feb 2024 04:06:11 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX4M9JQkAkv8sFJuP3kwsfYsyKvIQPc+A71bnmxQEu8ib2TT2JdoehB6j3x2gwx7VSGfusM8/tCg50FCjOSMDs8xTvQDw== X-Google-Smtp-Source: AGHT+IG6hqKsOe4s4ELHhueOJtuBX81w4U+pyOitfq/EtblievzQdVL4dLwULFGHkqTbxf4QlDrd X-Received: by 2002:a05:6808:168d:b0:3c1:7833:45a with SMTP id bb13-20020a056808168d00b003c17833045amr2303840oib.31.1709035571356; Tue, 27 Feb 2024 04:06:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709035571; cv=pass; d=google.com; s=arc-20160816; b=FuotttSZGOgeHOV0RpJbTNaUMIzuJWY9Ucg15f/FhRebFP+aqJLCItAsk7xlFNFaoL QsRO5x2gxLBJEBebVNzqM2tq3rA/UzAgsCowe0Xmn0gx7lm+l/hhbnIRWgji0+pbIzmv I5EcnTLmGAa71SRa2X748qiNPrLwkmU/SBpXWl0y/7lfbIAGjtM17ZpT/QoSeL87U9Ne fmH3+iXHx4WkkhxWjoLEhglZLVBfgLfQJdfE0k7hbRxZIvkpIZ88Z9Xth5jNHDDEalQp QU+jgKF8KB0wETKrQvHG1JN+0/hAobdEJNa+3rDB9EAMWB2BSAAoEWApCy8QBQ9g7JIC pA8w== 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=6yUsiJ0PB5lrHOt8k4FmFf0Mm7pU4waZWTbFCh5V/3o=; fh=0BykkNvFM3aWqQQ0r7p+NicWoXysUt0nXyg2+25Qf04=; b=pywRL41i0hfMNrOXM1QRb+7VD/bSWpJCAUce3exGtqpoizNIM94YwBjZcXv28T7h5e k1O+m7CeiEFjXESFB9Eo75EKDA4xhUftGFYyhhCOx+XsL0HNiN6E7jA60aw7garsNZ9w Htlk46OEq8lqA2x5EelSUC/o/Ds/4COAGCzqWHq1EGof89i/siu/9Wg5hntBmKrlp/WQ 4Q2M/exotQelcsqEfgDI5jaCmPdrxdzgp8MgDKBOjTeK4DyjM6NqroWTarmSl20gpH6l s6iLZEt8wmDDv1SN0QBIPOgnRSuB3r484hjZ8iMNp7tD1J+aSqM14hfnUs5m2+AzS+aD 2CXQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bluemarch.art header.s=protonmail header.b="c54F/7nk"; 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-83159-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-83159-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bluemarch.art Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id g7-20020ac85807000000b0042e047631a5si7780222qtg.245.2024.02.27.04.06.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 04:06:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-83159-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bluemarch.art header.s=protonmail header.b="c54F/7nk"; 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-83159-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-83159-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 190EF1C2143D for ; Tue, 27 Feb 2024 12:06:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2EDE113A275; Tue, 27 Feb 2024 12:05:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bluemarch.art header.i=@bluemarch.art header.b="c54F/7nk" Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) (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 B6B73137C20 for ; Tue, 27 Feb 2024 12:05:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709035554; cv=none; b=s63FG2EwefzfL8S5LeE9q2aO9631/0jKGdOfwb/cv4Hx4fNnmI1z+9+ruyvtHdmdy0ZH0dDzfsvQHxby+vGGfSkulKwFlpbUWm6tDIQhXyr86s09FaFoRuo12mnozUrGkXj/qsrkmOuK6NPqOKK9J2ZSy0FwhzlHp+tl8WcIcxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709035554; c=relaxed/simple; bh=Ws/rwHQKCLc1ZKZT4EifGV1uOCeyG+oWwq+ANSVu6AI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kS/2sJbuN0iWrgUXAAnIUHLB7l/CpsebzdGfWbxbJdvh2CXH/jLL8W7ik0tPi5TTIg5rN7NpIMjVuZUPN950pCZDyrw89WiyhjqIQax00B6XyGteBzZkVYIYKwBVZqzHZgD7hqfe0D5bYlu9WJgwCSC9vUjtWhvAl5Zke4j2qAU= 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=c54F/7nk; arc=none smtp.client-ip=185.70.43.17 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=1709035550; x=1709294750; bh=6yUsiJ0PB5lrHOt8k4FmFf0Mm7pU4waZWTbFCh5V/3o=; 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=c54F/7nkC1YvwsE9cU7q5UQ3zjiD9e78bT+2BaTgpDODHTGdnK4gJk/5L4NItiFQe KJMcxZQz6vCIcKooOEU4sFkpN+sOOS2lBzAEQiapiGPbyb4ZCTCQr+PK2qvZHolW83 6twBIc3xJt42C4jxvXvF7e1glt9x3p8g0KWnOA6XsUhzJJ4XHjq5zmbBMrwmpLUIBv moocyRGqkVk4PQXgkI/oHqe+q+hFW++vQzhiXug64n9hHR/m80E/AwupmyIFKcRNJE JtlB9nqICyaKJ1ULS52Lkl+7W1ASAyc5y76e6+imPyCY9+/v/hMRDOtYBxhZAGck53 89i37L9EcZ5KA== Date: Tue, 27 Feb 2024 12:05:45 +0000 To: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, jwoithe@just42.net, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, W_Armin@gmx.de From: Szilard Fabian Cc: Szilard Fabian Subject: [PATCH v5] platform/x86/fujitsu-laptop: Add battery charge control support Message-ID: <20240227120435.429687-2-szfabian@bluemarch.art> In-Reply-To: <20240215203012.228758-2-szfabian@bluemarch.art> References: <20240129163502.161409-2-szfabian@bluemarch.art> <20240129175714.164326-2-szfabian@bluemarch.art> <20240207023031.56805-2-szfabian@bluemarch.art> <20240215203012.228758-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: 1792053683358191419 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 Acked-by: Jonathan Woithe --- v5: * add ACPI_BATTERY dependency into Kconfig v4: * formatting fixes * replaced sprintf() with sysfs_emit() v3: * added additional error handling * removed if statement with device_create_file(), just returning that function instead * added bool charge_control_supported into struct fujitsu_laptop * added a 'charge_control_add' and 'charge_control_remove' function to be called from acpi_fujitsu_laptop_add() and acpi_fujitsu_laptop_remove() * moved FUJ02E3 S006 probing logic from the ACPI battery hooks to the new 'charge_control_*' functions v2: Forgot to sign-off the original commit. Fixed, sorry for the inconvenience. --- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/fujitsu-laptop.c | 125 ++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index bdd302274b9a..945295f98560 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -374,6 +374,7 @@ config FUJITSU_LAPTOP depends on ACPI depends on INPUT depends on BACKLIGHT_CLASS_DEVICE + depends on ACPI_BATTERY depends on ACPI_VIDEO || ACPI_VIDEO = n select INPUT_SPARSEKMAP select NEW_LEDS diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 085e044e888e..69f9730bb14a 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 @@ -132,6 +138,7 @@ struct fujitsu_laptop { spinlock_t fifo_lock; int flags_supported; int flags_state; + bool charge_control_supported; }; static struct acpi_device *fext; @@ -164,6 +171,118 @@ 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); + + if (s006_cc_return < 0) + return s006_cc_return; + + /* + * 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); + + if (status < 0) + return status; + + return sysfs_emit(buf, "%d\n", status); +} + +static DEVICE_ATTR_RW(charge_control_end_threshold); + +/* ACPI battery hook */ +static int fujitsu_battery_add_hook(struct power_supply *battery, + struct acpi_battery_hook *hook) +{ + return device_create_file(&battery->dev, + &dev_attr_charge_control_end_threshold); +} + +static int fujitsu_battery_remove_hook(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_hook, + .remove_battery = fujitsu_battery_remove_hook, + .name = "Fujitsu Battery Extension", +}; + +/* + * These functions are intended to be called from acpi_fujitsu_laptop_add and + * acpi_fujitsu_laptop_remove. + */ +static int fujitsu_battery_charge_control_add(struct acpi_device *device) +{ + struct fujitsu_laptop *priv = acpi_driver_data(device); + + priv->charge_control_supported = false; + + /* + * 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 < 0) + return s006_cc_return; + + if (s006_cc_return == UNSUPPORTED_CMD) + return -ENODEV; + + priv->charge_control_supported = true; + battery_hook_register(&battery_hook); + + return 0; +} + +static void fujitsu_battery_charge_control_remove(struct acpi_device *device) +{ + struct fujitsu_laptop *priv = acpi_driver_data(device); + + if (priv->charge_control_supported) + battery_hook_unregister(&battery_hook); +} + /* Hardware access for LCD brightness control */ static int set_lcd_level(struct acpi_device *device, int level) @@ -839,6 +958,10 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) if (ret) goto err_free_fifo; + ret = fujitsu_battery_charge_control_add(device); + if (ret < 0) + pr_warn("Unable to register battery charge control: %d\n", ret); + return 0; err_free_fifo: @@ -851,6 +974,8 @@ static void acpi_fujitsu_laptop_remove(struct acpi_device *device) { struct fujitsu_laptop *priv = acpi_driver_data(device); + fujitsu_battery_charge_control_remove(device); + fujitsu_laptop_platform_remove(device); kfifo_free(&priv->fifo);