From patchwork Fri Nov 22 03:47:21 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: 13882744 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (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 96CC815ADAB for ; Fri, 22 Nov 2024 03:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732247260; cv=none; b=aWSmFro6sGvZeORK6zKqESZBllfv/mPvuONez/IalYbuGOj0oQPOa8i+6uqN2EnWdhPMUSMP8HyBJ6ujwUphfYkAafWyeupphdclozuxnozUzI/FAoUUTDjDbZP2ZCzwips0XM3frdhkh8WSUA2SQBSJUbm0J6jHvslJGmh6hVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732247260; c=relaxed/simple; bh=0NAcyLrHHDhRn82WN0izrFPbVZrkw97X7FSs9cPtqXA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SZW+/uNR7aSPhrB0snxxLirP5wjyVtKH9+PYqgN1DS7m5hhtDagGhyK0Fq2K3ThnvA0yjp88PwAAuKVIefLpA75lW7z5MxbI3rVRuWmNej5OJgITBsiyqcmH2SqiF8GU/iHZO+FDEzjKJpunFUsrM4XqT8JH5ENhRucOjh2sjN0= 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=K6DqeaxF; arc=none smtp.client-ip=209.85.167.176 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="K6DqeaxF" Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3e601b6a33aso1090020b6e.0 for ; Thu, 21 Nov 2024 19:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732247257; x=1732852057; 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=d5LY5RXpPtd9Rkf3ibKsfLHvQo7hHTlxcwyEUNtbdks=; b=K6DqeaxFx5WuYr37lmj6vpxPbhks1SDASvkk12YDqOv95+SojV1K624Tj2yad63zXx r0DGeP+YH8nLIxuzficvX/nIozJiVgXFj/YYAoJspiMuLIewc93sxFAeRnQPSXEIT1G8 Pk+UJ2E4FZ9dCZVA3o2iJe35XtEkaD4iQq94M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732247257; x=1732852057; 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=d5LY5RXpPtd9Rkf3ibKsfLHvQo7hHTlxcwyEUNtbdks=; b=DvGrtX6G10Obe9xaQheY/lReYrWXbCET29LvP5VqlqBx4zhqp8WLFyHWvK3vclNU5Q lEWxgbXz+vvFmDmPNtGo1lK5e3/ssxD1AnECJGji7Y+Rx13YWr1tOIz/JWHsl6LtVd/A JKOBiho9W/jF0mz6WXeYTklZB4BKwFgax1kHekZhluBSKtrlsJsX+w8iGixVOPF0AOts S5O7tcw+Fb5bSws6ZCoucTD/O78j+zI2b11+NAUeuOklPqYigfCJJsFTmv7NdT36wUFN oolVe3ICNHnXW8b9o/admFaM3dtBrJvyqCxndO2zW1uiEdQ1YQ9K7IxVhPJjNEIOv0Lm vgZQ== X-Gm-Message-State: AOJu0YzuhxxVj1j6KsaihHxksrgR3oL5mHiRlIfZBYHRDuxLjgTjdCvC FOarndbOwtNb8PL4pJceup91rl0Ao1euG3D//t4Y2jz4zeE7xxllsupc8+v+Tg== X-Gm-Gg: ASbGncuopeICo5uvdRIM/qwv7+EYv0kYULyrud4wlIR/dxKgW19lRlkXinoYp5NBTpr WNBfpFz/1QM/0qtmj7bSyz+hYWwB6sChGK0b3X8ZoDvxfyVdPqXC2A6FS0Ir9HKHRvF06L8BZNO 9/nBP/mJAMyTgQEvLm0Nyo96PL2kyJs7ZmXDvcMbXSFTRt/2/u5OsmjrO+j1SniZ20xwAOQpKz4 bDLJW3bmq8xiPSNfqQ/V8C8mh7OLt5enN5s+Azly4xZZe9vDLkWYIHEM1ZJ6ksuLhsgLQM= X-Google-Smtp-Source: AGHT+IHryHek2XRVYS94YH2r4x03SqrwmBMFwfNHTimqb3KpUJr+MKVD5jT0i5y4nF7OMpy8M9x55A== X-Received: by 2002:a05:6808:2205:b0:3e7:60b1:1f49 with SMTP id 5614622812f47-3e9157a1595mr1527992b6e.4.1732247256800; Thu, 21 Nov 2024 19:47:36 -0800 (PST) Received: from lschyi-p920.tpe.corp.google.com ([2401:fa00:1:10:533e:26bf:b63:973a]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de554b11sm550174b3a.133.2024.11.21.19.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 19:47:36 -0800 (PST) From: Sung-Chi Li Date: Fri, 22 Nov 2024 11:47:21 +0800 Subject: [PATCH 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: <20241122-extend_power_limit-v1-1-a3ecd87afa76@chromium.org> References: <20241122-extend_power_limit-v1-0-a3ecd87afa76@chromium.org> In-Reply-To: <20241122-extend_power_limit-v1-0-a3ecd87afa76@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=1732247251; l=5457; i=lschyi@chromium.org; s=20241113; h=from:subject:message-id; bh=0NAcyLrHHDhRn82WN0izrFPbVZrkw97X7FSs9cPtqXA=; b=5RorBRojsc5DW6lyjii3KCfqlhvUkvwWPGbGmaVKEbwGjzsUje+27mQCbi8dCQMkBIUiTJa7T qCyOSvMN0GDAcumVzpM//xx+QPNcqSTpAAZ42bBWRr5S0yxWN39oTIi X-Developer-Key: i=lschyi@chromium.org; a=ed25519; pk=nE3PJlqSK35GdWfB4oVLOwi4njfaUZRhM66HGos9P6o= 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. We can extend this driver to make it as a passive thermal cooling device by limiting the input current. As such, this commit implements the required cooling methods and OF style registration. Signed-off-by: Sung-Chi Li --- drivers/power/supply/cros_usbpd-charger.c | 98 +++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c index 47d3f58aa15c..a0451630cdd7 100644 --- a/drivers/power/supply/cros_usbpd-charger.c +++ b/drivers/power/supply/cros_usbpd-charger.c @@ -13,6 +13,9 @@ #include #include #include +#ifdef CONFIG_THERMAL_OF +#include +#endif /* CONFIG_THERMAL_OF */ #define CHARGER_USBPD_DIR_NAME "CROS_USBPD_CHARGER%d" #define CHARGER_DEDICATED_DIR_NAME "CROS_DEDICATED_CHARGER" @@ -22,6 +25,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 +80,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 +465,20 @@ 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 - dev_info(dev, - "External Current Limit set to %dmA for all ports\n", - input_current_limit); + 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 +538,66 @@ static void cros_usbpd_charger_unregister_notifier(void *data) cros_usbpd_unregister_notify(&charger->notifier); } +#ifdef CONFIG_THERMAL_OF +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 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, +}; +#endif /* CONFIG_THERMAL_OF */ + static int cros_usbpd_charger_probe(struct platform_device *pd) { struct cros_ec_dev *ec_dev = dev_get_drvdata(pd->dev.parent); @@ -534,6 +607,9 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) struct charger_data *charger; struct power_supply *psy; struct port_data *port; +#ifdef CONFIG_THERMAL_OF + struct thermal_cooling_device *cdev; +#endif /* CONFIG_THERMAL_OF */ int ret = -EINVAL; int i; @@ -674,6 +750,18 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) goto fail; } +#ifdef 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_err(dev, + "Failing register thermal cooling device (err:%pe)\n", + cdev); + goto fail; + } +#endif /* CONFIG_THERMAL_OF */ + return 0; fail: From patchwork Fri Nov 22 03:47:22 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: 13882745 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.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 07C5616133C for ; Fri, 22 Nov 2024 03:47:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732247262; cv=none; b=sf02voBj5g7mrlzpTIKGmwngHaBXcikQWXhCuJzR6mhpYiUG99VaHKclhd5KPXU+shfcYBRYBnLaf/prEMULlc3amNy4Gk7ogkr+lRn6HgkIF7zoRbnQghfCY/mD91umeGHcItCHcQJcEM9UPR7zyaL7y9K/u78fwEYYkzNH01c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732247262; c=relaxed/simple; bh=ecrPWNCROGbCGBvflsd6cHirBTqgXm1cERWiLr23QUw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rt6AMrf/alCzgVE+FqcRlQd8f9Tri96OAIpuA2LYa6nKzus7zGdEB6mUdxaVa1R9QuzRlTgD/XDXWGvnSU/YJq5wFSdwH6/T0wYwTixp4aMZMucYh7Afu3yc3ZOsS2V5OY2XYDQwVXLZDn+XL/Yd4VaHbmcIvWm7Fo5kZ05nx4E= 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=J+BGHwli; arc=none smtp.client-ip=209.85.167.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="J+BGHwli" Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3e5f835c024so1075394b6e.2 for ; Thu, 21 Nov 2024 19:47:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732247259; x=1732852059; 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=knk5bhF5K5WlFtwhF1HiZTyghnwunglBtYROl19Amnc=; b=J+BGHwligmNpY17vRH9kUze0s4HULKSLKLxJ/RJ0BRunBVXKqKUHYdt1kV+CTPifgW fdC2pOVyxUeJ1fuzJZk8iJI25ZA52nRkqw4+zch7CjZiI0WfvO1Yg5k8ZWnI3mAE9Sk+ T9N8T33/4UKkH0CcmF73V5Gyh64Gg16Pp5sVY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732247259; x=1732852059; 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=knk5bhF5K5WlFtwhF1HiZTyghnwunglBtYROl19Amnc=; b=M9frGn0EzhQ4Km+3xUFZGWN0mC43hM2wDA1dUNRYhgOw4DFQMF/Kv76jRowUeQ88hW z7p9rVgDuX7ydHUVZNbrPAwfo3BA4x1bVoMv9hftWnfYlkkIoVE9JXFkDl2a/75MmTC+ ht3ZGWumDnK8IWYV23I3Wyr8nnXmV4km+GxgNnwMZ+Yi/p9vOc1IVGvC+SOPHHO/mWHD YYuhGHnYbSDHb7RiuzzUhEZl/2tgrbnscv9md3AghjpBHQB57/DGzVLhysH4xVgO29ej Ha4ark3Volf4E4Iypobw4bLUqK8Esr1WSj7OL+iEgJ4b/6Avg0AXw6CDFNPX6UowaSKA aUfw== X-Gm-Message-State: AOJu0YxkowhTydwIr9SzVpxrjOIKR9NfsRvSOQ7xNWa16JwFEW0oPB71 B4bmXk7sHUUrhN4+oOTdp7lU1KYWA/mfv4YsikgOaqikPwe4HCmGoIonAGYF5A== X-Gm-Gg: ASbGnctFRShUml1ZrsP5Df5C2uxz/Q+0RpJganWZbIrOfxyiuX/wTGwk9sBvpKxKIdx zGEXmxYjVPw7cdjAUpFsQFdPYMRfUF2PIEHQwhWlt1t03IXIr0+H54gKDK0jgQS3RmrpH07QL/D FLQktcxTgClvnIb0HpkzOZLRarJJLaJWS+XzpMhUBGkB7Rfew6Takvow3psAvNWdVlCsnQjmciR mLZKiYxowENtgScQ51qXQavu0gaEk8kMMrSsW6UmySKOu2dVljHQw+7FZC9JTstszHU9lU= X-Google-Smtp-Source: AGHT+IG9TmutnyL2idfCzGrxIgPrFSPj4hupzoYH5zYY4fJEibqFwqT2kUZnaPO1+nOzBHXjr0fcdQ== X-Received: by 2002:a05:6808:3186:b0:3e6:10d1:ecb6 with SMTP id 5614622812f47-3e915afc2f0mr2042657b6e.28.1732247259232; Thu, 21 Nov 2024 19:47:39 -0800 (PST) Received: from lschyi-p920.tpe.corp.google.com ([2401:fa00:1:10:533e:26bf:b63:973a]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de554b11sm550174b3a.133.2024.11.21.19.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 19:47:38 -0800 (PST) From: Sung-Chi Li Date: Fri, 22 Nov 2024 11:47:22 +0800 Subject: [PATCH 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: <20241122-extend_power_limit-v1-2-a3ecd87afa76@chromium.org> References: <20241122-extend_power_limit-v1-0-a3ecd87afa76@chromium.org> In-Reply-To: <20241122-extend_power_limit-v1-0-a3ecd87afa76@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=1732247251; l=873; i=lschyi@chromium.org; s=20241113; h=from:subject:message-id; bh=ecrPWNCROGbCGBvflsd6cHirBTqgXm1cERWiLr23QUw=; b=+Ar7fFL4Es6YoP98iJ8z+ts7PPhZxkPpxs/twgJcXy9F+hxWQE8UDw3qtSLkVEsv8smzvWQH5 xC5M1yQiGp1B2ApDAeFU70wlo7L2T10cnh4QYIQ6sueAac/a24ZnXMn X-Developer-Key: i=lschyi@chromium.org; a=ed25519; pk=nE3PJlqSK35GdWfB4oVLOwi4njfaUZRhM66HGos9P6o= The cros_ec supports limiting the input current to act as a passive thermal cooling device. 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: