From patchwork Mon Nov 25 08:31:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sung-Chi, Li" X-Patchwork-Id: 13884555 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95A81176AC8 for ; Mon, 25 Nov 2024 08:31:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732523492; cv=none; b=heKfc99IRRu7857kVnc3cZll/Fos413joI/7eqynGQDIZZmtxOcqPyr1QoERmlDxKCtrOvosxIHGSldA0+0cGxJYiZHVa+L3eQpMb5G1YRz9O38Yj7i58HSwgswnVONp11ix1BuQG290tOnGgm6ewJYgwk0nZaYIiDxfKu7s7aU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732523492; c=relaxed/simple; bh=Z9o0zBt1p8Fbtg42SUEpQ9tA831XqF2aBKjtqmgJJZg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q68DOZrPkTspRzn5zygRL0D2gDPdseEkqYbWtvoykMJI23NHtRG/WIcijCRw0KmnbYAnfl1/S74/9ixIHO7/wtJi+zNc84C/7rvyhlNrz4agJRJ815B6qYxjD9AE8NUcHDrcJE8ggbs2V07nzWD7DPE6do1fGxZPyex/aX3KSGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=mlnuheE/; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mlnuheE/" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21207f0d949so38177705ad.2 for ; Mon, 25 Nov 2024 00:31:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732523490; x=1733128290; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gsxN4SRIKBH72Tu6V02jm4aTE1CgMy52+kme9RyF4tE=; b=mlnuheE/O2Y9T/CyKCceVUPO0eEfsqOZ0ous1MC2c4kDQdZYgX6BzuLq6b2i63pcig kQhfT7i3VO9MGhJkV1UmC4xMXg3nYU2G9ucN7YOONqXUiKlUbbj1f2SzZqtQsUoeUNnV jDt/WtyLOQpn9m147qo/W8yFwS3bK2L44CVgs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732523490; x=1733128290; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gsxN4SRIKBH72Tu6V02jm4aTE1CgMy52+kme9RyF4tE=; b=MaLZivvTpisNMG72+hok404KcEOyU53qB2W4lGZkapgB3ov3rEpVk6m29Dj9ciQVoX Lx+RePaO7QLrlsmhRRNb1ej1ucV1DbgDwrwlkdUAFBHd/lFZJVLtMQ/QmWadTzj+8cBV QSmOa4X+8pRELBuDMPnaMZcTR2H+WzPIjq0ak9d9FH7m4yTIJ2oFd69mf2VEpS3OuU/U vFVCxQ0aSa1z8xQjS0rKp3iJBLnHbYSxY8f93UiDvuF02cAEL/NFmFLIvEJsNmibbZyJ ONVk4SA4siiXqoX9X0i8+l73ZdIshLWovAImgKvKILYOMLejG+B+Y7I6zlQ1e9DCNobf v8vA== X-Gm-Message-State: AOJu0Ywtf4cr5LMIMPz/wznyMHnX2gv7JN5PhHQ8ecfdNSH8U6dtoyo/ IGN5UFDgDoqcSbK1FRBDgfQfW95HyJUEBcz16KVTV+UcveXnun0aroIqQj2DjA== X-Gm-Gg: ASbGncu2iEAm8I/Dj+R6HqJ0t5wNO5JNNO0IbyMlVBU6tXhkIbMaL0leJkiw4lTcDGs gne+mfdIK9OAL9AG+xIy/SppAcvvduH7TTVbmVpjIfnT38DVJh/Ib8ZOnvSkvcALiJDAxW9X0sL C9gCjULYCbVBOoen126eukSbr9Wh5rRZUGFvuNxL0qH2an2TNYJ47nZTZ+hBrNKpvbW+EIUm5Wu DX79jwhUlJEv6d7Yrw2YKBTKth7207ox+g1OC9N5a12sVnyxWEvJJC8AB2RHIa94Q1wDv+y X-Google-Smtp-Source: AGHT+IElfYm4ovmTHj2+mTSX4Iki8fGKuWTAto+ePAtH8SREZcFJUbZFxKAbnjYxZwRfgDH7pFKmgA== X-Received: by 2002:a17:902:d48b:b0:210:fce4:11db with SMTP id d9443c01a7336-2129f557214mr205937125ad.22.1732523489941; Mon, 25 Nov 2024 00:31:29 -0800 (PST) Received: from lschyi-p920.tpe.corp.google.com ([2401:fa00:1:10:66a3:d18f:544f:227a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2129dbfece2sm59090025ad.157.2024.11.25.00.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 00:31:29 -0800 (PST) From: Sung-Chi Li Date: Mon, 25 Nov 2024 16:31:16 +0800 Subject: [PATCH v2 1/2] power: supply: cros_usbpd-charger: extend as a thermal of cooling device Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-extend_power_limit-v2-1-c3266a86e9b1@chromium.org> References: <20241125-extend_power_limit-v2-0-c3266a86e9b1@chromium.org> In-Reply-To: <20241125-extend_power_limit-v2-0-c3266a86e9b1@chromium.org> To: Benson Leung , Guenter Roeck , Sebastian Reichel , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: chrome-platform@lists.linux.dev, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sung-Chi Li X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732523485; l=5418; i=lschyi@chromium.org; s=20241113; h=from:subject:message-id; bh=Z9o0zBt1p8Fbtg42SUEpQ9tA831XqF2aBKjtqmgJJZg=; b=u0ppdMgicsIpoqlOU/qoi5m7vJzwW0+wr7fdKUJ/u8eOUo4g3VrbIQDpVcfRCAqswBMrxU2QE W4e9WxlOzFJCCy9/oekvD4I0EUjz3+jrDw1b2ZfOP6/qqwX/gCaZZj/ X-Developer-Key: i=lschyi@chromium.org; a=ed25519; pk=nE3PJlqSK35GdWfB4oVLOwi4njfaUZRhM66HGos9P6o= A charge chip is connected to the ChromeOS Embedded Controller (EC). When external power input into the system, current would go through the charger chip, generating heat in the system. The EC supports limiting the input current, thus reducing the generated heat. cros_usbpd-charger is the driver that takes care the system input power from the pd charger. This driver also exposes the functionality to limit input current. As a result, extend this driver to make it as a passive thermal cooling device by limiting the input current. This commit implements the required cooling methods and OF style registration. Signed-off-by: Sung-Chi Li --- drivers/power/supply/cros_usbpd-charger.c | 84 ++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c index 47d3f58aa15c..a080090898c0 100644 --- a/drivers/power/supply/cros_usbpd-charger.c +++ b/drivers/power/supply/cros_usbpd-charger.c @@ -13,6 +13,7 @@ #include #include #include +#include #define CHARGER_USBPD_DIR_NAME "CROS_USBPD_CHARGER%d" #define CHARGER_DEDICATED_DIR_NAME "CROS_DEDICATED_CHARGER" @@ -22,6 +23,7 @@ sizeof(CHARGER_DEDICATED_DIR_NAME)) #define CHARGER_CACHE_UPDATE_DELAY msecs_to_jiffies(500) #define CHARGER_MANUFACTURER_MODEL_LENGTH 32 +#define CHARGER_COOLING_INTERVALS 10 #define DRV_NAME "cros-usbpd-charger" @@ -76,6 +78,8 @@ static enum power_supply_property cros_usbpd_dedicated_charger_props[] = { /* Input voltage/current limit in mV/mA. Default to none. */ static u16 input_voltage_limit = EC_POWER_LIMIT_NONE; static u16 input_current_limit = EC_POWER_LIMIT_NONE; +/* Cooling level interns of current limit */ +static u16 input_current_cooling_level; static bool cros_usbpd_charger_port_is_dedicated(struct port_data *port) { @@ -459,13 +463,19 @@ static int cros_usbpd_charger_set_prop(struct power_supply *psy, break; input_current_limit = intval; - if (input_current_limit == EC_POWER_LIMIT_NONE) + if (input_current_limit == EC_POWER_LIMIT_NONE) { dev_info(dev, "External Current Limit cleared for all ports\n"); - else + input_current_cooling_level = 0; + } else { dev_info(dev, "External Current Limit set to %dmA for all ports\n", input_current_limit); + input_current_cooling_level = + input_current_limit * + CHARGER_COOLING_INTERVALS / + port->psy_current_max; + } break; case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: ret = cros_usbpd_charger_set_ext_power_limit(charger, @@ -525,6 +535,64 @@ static void cros_usbpd_charger_unregister_notifier(void *data) cros_usbpd_unregister_notify(&charger->notifier); } +static int +cros_usbpd_charger_get_max_cooling_state(struct thermal_cooling_device *cdev, + unsigned long *cooling_level) +{ + *cooling_level = CHARGER_COOLING_INTERVALS; + return 0; +} + +static int +cros_usbpd_charger_get_cur_cooling_state(struct thermal_cooling_device *cdev, + unsigned long *cooling_level) +{ + *cooling_level = input_current_cooling_level; + return 0; +} + +static int +cros_usbpd_charger_set_cur_cooling_state(struct thermal_cooling_device *cdev, + unsigned long cooling_level) +{ + struct charger_data *charger = cdev->devdata; + struct port_data *port; + int current_limit; + int idx = -1; + int ret; + + for (int i = 0; i < charger->num_registered_psy; i++) { + port = charger->ports[i]; + if (port->psy_status == POWER_SUPPLY_STATUS_CHARGING) { + idx = i; + break; + } + } + + if (idx == -1) + return -EINVAL; + + current_limit = + port->psy_current_max - (cooling_level * port->psy_current_max / + CHARGER_COOLING_INTERVALS); + ret = cros_usbpd_charger_set_ext_power_limit(charger, current_limit, + input_voltage_limit); + if (ret < 0) + return ret; + + input_current_limit = (current_limit == port->psy_current_max) ? + EC_POWER_LIMIT_NONE : + current_limit; + input_current_cooling_level = cooling_level; + return 0; +} + +static const struct thermal_cooling_device_ops cros_usbpd_charger_cooling_ops = { + .get_max_state = cros_usbpd_charger_get_max_cooling_state, + .get_cur_state = cros_usbpd_charger_get_cur_cooling_state, + .set_cur_state = cros_usbpd_charger_set_cur_cooling_state, +}; + static int cros_usbpd_charger_probe(struct platform_device *pd) { struct cros_ec_dev *ec_dev = dev_get_drvdata(pd->dev.parent); @@ -534,6 +602,7 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) struct charger_data *charger; struct power_supply *psy; struct port_data *port; + struct thermal_cooling_device *cdev; int ret = -EINVAL; int i; @@ -674,6 +743,17 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) goto fail; } + if (IS_ENABLED(CONFIG_THERMAL_OF)) { + cdev = devm_thermal_of_cooling_device_register( + dev, ec_device->dev->of_node, DRV_NAME, charger, + &cros_usbpd_charger_cooling_ops); + if (IS_ERR(cdev)) { + dev_warn_probe( + dev, PTR_ERR(cdev), + "Failing register thermal cooling device\n"); + } + } + return 0; fail: From patchwork Mon Nov 25 08:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sung-Chi, Li" X-Patchwork-Id: 13884556 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D52818C337 for ; Mon, 25 Nov 2024 08:31:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732523494; cv=none; b=kTkVd5E11mxt+pr28zE5GhXzamqIWaoscIR/QQemONK0MhdlNXs7EVIF8IfXZ0TaC+JkD2Widc90LcMHDdhacvNv5SgZu0PLvxfGJWC3N8MmU7Wnky0pY34BAtChWurFPMpHc6GCsRHhhlLd3jomZrqro462bW81uXdjOS06Rnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732523494; c=relaxed/simple; bh=ktJPK16HT87IqUYNk6xW4DxEM+thEREPtW8kVjrlImY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iR/7YNlKYu2bdFlqj/nrpysru/82tfYNOc1eBcHMMSMLYYyQBuzez2wdhCjkDhJK2r/ECFXrmD6RKVG6l5p/ibZcwVxnzzN3cHzHNQxjxxBM12geuGqfUQm9UE+xllhDWCaouuyLnPxdRnE6stR7Q8SREJ+7cfFtSDIoGMI6l6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=m9M7P/Rr; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="m9M7P/Rr" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21288402a26so37629915ad.0 for ; Mon, 25 Nov 2024 00:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732523492; x=1733128292; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=POCxcDAs1OPhEdapqaVu7R6Wv3Kn60gIQbQM6aiBFqA=; b=m9M7P/Rrwp8K8JONWYjoFI1CocjNxDF8newT0oQR3z78cEtwFpdFi1776RXWyH/oIH w5T7UlmGdreoWp8fLnnNSkiPy3Xg68GzrgEyChMnnzxwe465T4GpK2JadXstmBW5kJa7 VUwPRi2OEKZmlICa/e4h0jzTifvHqb4TzdRQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732523492; x=1733128292; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=POCxcDAs1OPhEdapqaVu7R6Wv3Kn60gIQbQM6aiBFqA=; b=FL7NaJnH2xySX9R+2Xr1rfE53lZVyc5BQeHCraeZ3yPqiGHofedPHkX+QfjZeoxdDJ 3J5Ei14js1YgT0ahgf42cfw42DRfmkKRg5kD85EAHOgvBcSWLOnLl8hz5vUXmFz+2FE/ DxNkYfvpt3ddwMyVBaYweEjOuueu3Ztnsz75cytKCHcXavZjz9PQgk/qr3QBIibJ+kii MEFFJzV2deqe9lFrZiW4JCX+efAAZMDKz1lTf2rG4295KnxoUJ3eYMBn+8xy7DnOfsEG 3JB+XucEFcOcHBIi51PcJ26ABogatPUAQwD0SQKMFCYyLLxe1RJk+ryCy3lNIbshFYpn Wc/Q== X-Gm-Message-State: AOJu0YzjECUBSj3PNenufRwckD6H8oQYKI59SwMchysXAbFUxA9ifYB3 9JKfqNmECMRDbsGpFtK6ybP44CPOHmrMdx1MlnL/M24bHHFxbUMjCG2wTNjo9g== X-Gm-Gg: ASbGncsZSxYjAYN/tQIf5OiVYSorNgLUggpBIwWVq5KQ15jeQt36xKTF6sem7wY9d2i CCJ9OZWQDjepJfXod2yo5rvVvOKahtA6tkaVnPmDVKaCLUU43pkMz9t0udD25f4X3kglFwv83GW Co9ti1UqT8jW8Du1j6QIKLQvmSrNT9RvdbFxPt40ZD8kW+ppgGr/O2EXSQC0yf/Rl3ydklXg9dz nZTRQeVLCEGr+9B6YDL8HL5xnud1nIT8HE7CQQu94WMbHcn2b/7agwN+BMrb2IZyvsPU6+D X-Google-Smtp-Source: AGHT+IHSb4l363kSqeAiiJcrwoOGnozawSDBYK+oCcUIkkFt6/AtetpUnMMRtlfX7k/Ckh1KEU4bSg== X-Received: by 2002:a17:902:f685:b0:20c:9326:559 with SMTP id d9443c01a7336-2129f240de5mr179893455ad.29.1732523492519; Mon, 25 Nov 2024 00:31:32 -0800 (PST) Received: from lschyi-p920.tpe.corp.google.com ([2401:fa00:1:10:66a3:d18f:544f:227a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2129dbfece2sm59090025ad.157.2024.11.25.00.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 00:31:32 -0800 (PST) From: Sung-Chi Li Date: Mon, 25 Nov 2024 16:31:17 +0800 Subject: [PATCH v2 2/2] dt-bindings: mfd: cros-ec: add properties for thermal cooling cells Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-extend_power_limit-v2-2-c3266a86e9b1@chromium.org> References: <20241125-extend_power_limit-v2-0-c3266a86e9b1@chromium.org> In-Reply-To: <20241125-extend_power_limit-v2-0-c3266a86e9b1@chromium.org> To: Benson Leung , Guenter Roeck , Sebastian Reichel , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: chrome-platform@lists.linux.dev, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sung-Chi Li X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732523485; l=1439; i=lschyi@chromium.org; s=20241113; h=from:subject:message-id; bh=ktJPK16HT87IqUYNk6xW4DxEM+thEREPtW8kVjrlImY=; b=FpMKgfM5p9IzbPe7guqbp4Vjag/aqYKH4JxQjr2hWl48PN/wyJux8YdE/6fm8+fY0+2OLaW7c ohiglj075PQC4cCEHOJcL5SCqRAmB2aBhq+byXp6ug7DAA8KeGSGApQ X-Developer-Key: i=lschyi@chromium.org; a=ed25519; pk=nE3PJlqSK35GdWfB4oVLOwi4njfaUZRhM66HGos9P6o= A charger chip is connect to the ChromeOS Embedded Controller (EC). When external power input into the system, current would go through the charger chip, generating heat in the system. The EC supports limiting the input current, thus reducing the generated heat. As a result, EC is a simulated passive cooling device. We cannot reuse the existing charge managing mechanism in the power framework due to: - The power framework requires the charger to expose its thermal status, which is not a supported functionality on EC. - We need to use different thermal sensors to run thermal control, rather than using thermal sensor on the charger. Add the property '#cooling-cells' bindings, such that thermal framework can recognize cros_ec as a valid thermal cooling device. Signed-off-by: Sung-Chi Li --- Documentation/devicetree/bindings/mfd/google,cros-ec.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml index aac8819bd00b..2b6f098057af 100644 --- a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +++ b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml @@ -96,6 +96,9 @@ properties: '#gpio-cells': const: 2 + '#cooling-cells': + const: 2 + gpio-controller: true typec: