From patchwork Wed Feb 7 02:32:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szilard Fabian X-Patchwork-Id: 197706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1956819dyb; Tue, 6 Feb 2024 18:32:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGllxBVMeU3C3xd6O0sw5LiGa3S4CILdzhKoGSPeEXrxundhcAuSIhw1KzL1uff9fsUMXYP X-Received: by 2002:aa7:d308:0:b0:560:5fc:9f0d with SMTP id p8-20020aa7d308000000b0056005fc9f0dmr3222959edq.9.1707273172187; Tue, 06 Feb 2024 18:32:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707273172; cv=pass; d=google.com; s=arc-20160816; b=nMJpBwyW9cPj6UiyFKFzq5WqijzTpgN7EtRctBFJiNHRdXOSbBqeh2Rj6hpRPGz6Cp CebOUQUCJ8Kxlh68FGFc1yEIvIOcPjgzSsW++ykCRzMtHWOyJbNhl3WbPJhNGsYvrH92 Fg525jeo9X0Lu8bvs2pyvnag0fff3PFzVZTQD/au8GSYLHwW0IbPxzFVPCLtj+SG9fDe GCuJNaKwasNirWqLenSF/xS6lgaZUGkNXoQ5ekZAfH6BYxuYlqyRRldJWV7EYp5ie6DG KqmYi51IHwj/gZzfWRQjtxiGfe/eWQE529NC2tGMcLcMV+l1hs0FplyzaO6NrGnDXNKk XzzA== 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=RRMxXWKiNumTivPl5zD0nktyidYv+ZyY47zXaJ9WRng=; fh=16YIaYfNAaEq8bC3ZOeiiSRCmTmwZMwwayD775K5xKM=; b=0Tca/UIY5zPg7+7JUc34MuvRl2HYpVsc9En9ZD6r1hlylASf0e/kZrbSdFdmsi6+6V ZFpznb7Igrd4oUE3aPKHW/2t4gVY618ng+M6UGS4Ey3kTbKxqAWHsih+CtHL+UO/f+nD YiTb+1y2ARUKRSKNTZiTEYQDrqoeHRu6rKI7AXnRcfys7PJg42SckdCg8wjNWGDcAjJs pGlE7eDj4j+ZImSwwdBo2jGQbwLb6Scs7IWIX24PRBcdP/UthStqLshN2zLLc3dLDz8D KEWHf6yNm3dvaSdGUfk11CP6BsmXf6WXvwmjO+rzUtKGuhDDOKquhhpHwIIEZn8rIuI6 9V2A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bluemarch.art header.s=protonmail header.b=izFm5+dc; 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-55855-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55855-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bluemarch.art X-Forwarded-Encrypted: i=2; AJvYcCXVJUwK0UECzUAW0UVmwdFyyNcWt9HemqmF5S53sh5BHBin9cOIktUME0wLTNLoBeN8JdJp7iGbT9514wN5wVe6Ip/RkQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id bt19-20020a0564020a5300b00560302766e2si245479edb.138.2024.02.06.18.32.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 18:32:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55855-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=izFm5+dc; 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-55855-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55855-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 CA37D1F24C67 for ; Wed, 7 Feb 2024 02:32:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A5CBFC08; Wed, 7 Feb 2024 02:32:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bluemarch.art header.i=@bluemarch.art header.b="izFm5+dc" 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 83921F9D6 for ; Wed, 7 Feb 2024 02:32:33 +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=1707273156; cv=none; b=npRrqcIc74QMuEq7mUe4hI1w0B59wivF3wVg1Ni8EYylAw+lvz/R/KmbCB//g6ECuNOuw9zv3VspKhvsVzICnY1icxXyNzQIQkg4XdS7GlXdUoP7N3FncBcykhErU74XjEN+YXHN0yZerb9AkHsgYM7EWiId8OMhBxfRbxgNvCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707273156; c=relaxed/simple; bh=eQevGGFfOKK76esWgVcR2HYNk+G4v2RPjlX7E272UoU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Sbr32xhahCwkqIy7pgJmiRa6t6gu0zGxL6eFPepG5lr8RFCE7MG+HXQntPS49NayCcoFfoVMb80wfM/KKuAFDxuNeG5AcQK+Cl8A/2iZ4sxhbtTlNWqaCgWszBu+tUVoiLE/7JAf5OU8ib+1wdj+gHUBXgYuaVhkd8DGj/FkweE= 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=izFm5+dc; 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=1707273150; x=1707532350; bh=RRMxXWKiNumTivPl5zD0nktyidYv+ZyY47zXaJ9WRng=; 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=izFm5+dctBPeBrKstTm1tQEKGYVyUykUa4MqVoIgBrkiZClB1zBzRwwIsjbWAAoAP mhCkkeU1WqAKTSuBhFt3w+vt2U9ldmM9G5xLSDBLUvXSQKa8CBTHU3LobGmHKny+eS Y75dsfQC8Ggjaq1h5ecPDj+JZYG5NUwkGj7dLnNtakeOpVy0UYDCV8iBopgJhEv6Y3 1ReLceywm4Y26XbubW+vrhkDAtKG4owDTsoQhrnm66xACVNNJSuO1m3l1IhAEzUfiP 29zwwnE0rSxCpoIaj4Y03i0xIteZnVG5SqhcXJcgXFOwG4gnZAIX9IOGs5trDTBzcK DlV/Qt9W0cNfA== Date: Wed, 07 Feb 2024 02:32:15 +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: [RFC PATCH v3] platform/x86/fujitsu-laptop: Add battery charge control support Message-ID: <20240207023031.56805-2-szfabian@bluemarch.art> In-Reply-To: <20240129175714.164326-2-szfabian@bluemarch.art> References: <20240129163502.161409-2-szfabian@bluemarch.art> <20240129175714.164326-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: 1790205674089854781 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 --- 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/fujitsu-laptop.c | 125 ++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 085e044e888e..2fcbc10a0d9d 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 sprintf(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);