Received: by 2002:ab2:68c1:0:b0:1fd:9a81:d0e4 with SMTP id e1csp208490lqp; Sat, 8 Jun 2024 12:20:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVAOCnw2mRdW/s0ZzOotmtvNioFday3U7gt+YXZDxBhysFU7dux30qinYiD/Fbbxv1sUl12zuRO3HKdZ3DDZaCXD6PYENXJ2mC+4B8Cgg== X-Google-Smtp-Source: AGHT+IEi5PUL6HcxLoQR2zzRoEoil5Ol1vN8yJqXGCskBx4xLzqXI2maqTNNV95Q81WhNvYrs+IA X-Received: by 2002:ac8:5a8f:0:b0:43a:f443:d126 with SMTP id d75a77b69052e-44041c65806mr56420581cf.48.1717874404089; Sat, 08 Jun 2024 12:20:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717874404; cv=pass; d=google.com; s=arc-20160816; b=pl3e/Q1g3VqdUXgurTDhTBLgRh0IoWi9QOh81LSLo5dXLvDxnJ/UF4CIfhfSXMnAOC 8RatDIYZrEXaOARM4ONyA7y1DyjuyP2VLMOgvEK4A7RNwxQrhhENNhF9CGZ5D0m0vVRi y9/g2Z+Zq4Jk3QbmwH1952JbxnUUHGm5dl29Z7byXvS/aXuW8pYGkm18utjGyGI1/OFY /i4s7jlblpVdT7DJ5lN9NMlF9n1Evpa5kBJHp/Dxm1GCds0wJhXChrwQNzckngylwMEx e28oKTC8sXgh0xNrLCvbEnjUF/alyJle6AR6b/MFfhG6qOXbp81Bd2fl2ohMx0dkwEF/ t+1g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=AphdGZK2fnZI0/mU8PjYsS+LnegXEeFlIh165WIi1wE=; fh=eOxR+HlUDW9pAnybZfJjcM2qgS8yWO9jKAm3v1++6bE=; b=J/9icO1H7R/3pFT7Pvd1CdTLV0jndJSfeDzay9eq2LT7roWx5w6Grp30XcCAv7MsIw ygvmqe6qoiDjpidtAhoL5uzcu+pTSG32IDzuHobufWSL+5+WamlNDlIxOXAlij5UQaGR IgZDbGhOEUhRgiLB2baFDAysvjRKaBtJtBDE3Xwy8RbVsXOLqzrecAMzCH3fYOBcLG16 cumZvu34UR6ASfOhXZOxoQd2zRurPsbpply6mj/Vaw3C3H9LtDul4tqJjxYDwcB/tQfN jesnsDBnpouzEKSE9ruEG6sxf3yomWJ3Z0WXz/xOF5QOsWbhr/47QMbkZa9IeOFK2q5I fwKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ixLaohDg; arc=pass (i=1 spf=pass spfdomain=weissschuh.net dkim=pass dkdomain=weissschuh.net dmarc=pass fromdomain=weissschuh.net); spf=pass (google.com: domain of linux-kernel+bounces-207177-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207177-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=weissschuh.net Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-44038b5ee2bsi33014651cf.542.2024.06.08.12.20.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jun 2024 12:20:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-207177-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=ixLaohDg; arc=pass (i=1 spf=pass spfdomain=weissschuh.net dkim=pass dkdomain=weissschuh.net dmarc=pass fromdomain=weissschuh.net); spf=pass (google.com: domain of linux-kernel+bounces-207177-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-207177-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=weissschuh.net 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 AD1571C20E34 for ; Sat, 8 Jun 2024 19:20:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8716E2137F; Sat, 8 Jun 2024 19:19:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="ixLaohDg" Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 9E0BE208D0; Sat, 8 Jun 2024 19:19:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717874388; cv=none; b=gO52VcdmQu+S5RIZ+g/ovnZ0m4FjSqs/5YafGMkpSiMHX2bxUiccfH6j1uegEJPcdtlFkHzmoQd6kdUUx5jJXIwrb9cR30TEHrK0F8Zgg/kVWYknuSeQAs3wvI9QcKRaSBAdXiDJj4uhEprZ76fN5Ko1+F8FUj2rgQQaXAxKwKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717874388; c=relaxed/simple; bh=NVTFW9lAWIoQvL0uH2dUd52c6tWadKD9uO+zu4zfROE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TYHjUu39E1H3VIUVGyE1k8g4X4zuw/zpKkjbwdYkr0XudKgxOJKe7S/Kwq0+C/E8Mx59laN8Y3qeHziqdAJ+1Zj28YFd07z1451zQi8gy8C4kf1gJzfpDSoZvaLU+A5udXb6axd+IwxAV0fEItIYpcv28wtyPCs0q0xr0GncHfk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=ixLaohDg; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1717874384; bh=NVTFW9lAWIoQvL0uH2dUd52c6tWadKD9uO+zu4zfROE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ixLaohDge3pqrTGVuskx0P4Wdfn0PFaqg7N7IVBaWpuDtEsa58BAfhOw2tfVO+BEx jCNACM+kLLw2MPSAgRhCOAaXBvo1L25QhYUtpz9Okge8NYacl/yDoYSurjABHlKmJe uNJGdQnrEMYjVkKCwEOr+5nYc22Do2D6OqR8ilHg= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 08 Jun 2024 21:19:40 +0200 Subject: [PATCH RFC v2 4/5] power: supply: test-power: implement a power supply extension Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240608-power-supply-extensions-v2-4-2dcd35b012ad@weissschuh.net> References: <20240608-power-supply-extensions-v2-0-2dcd35b012ad@weissschuh.net> In-Reply-To: <20240608-power-supply-extensions-v2-0-2dcd35b012ad@weissschuh.net> To: Sebastian Reichel , Armin Wolf Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1717874383; l=5076; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=NVTFW9lAWIoQvL0uH2dUd52c6tWadKD9uO+zu4zfROE=; b=BHP6KKIkH5Qayt4PMND8WwZC4/znxn7BNRlcZJNtteTApXR71PBaWNsTKwjGm+J1pPa877HkA Vc93fTKeUpDAL8zPNiUhvlGq3PDkAWhM9zyaLH16QHwXAVGpNgvA6jJ X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Allow easy testing of the new power supply extension functionality. Signed-off-by: Thomas Weißschuh --- drivers/power/supply/test_power.c | 101 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c index 442ceb7795e1..12c1573e547a 100644 --- a/drivers/power/supply/test_power.c +++ b/drivers/power/supply/test_power.c @@ -37,6 +37,7 @@ static int battery_charge_counter = -1000; static int battery_current = -1600; static enum power_supply_charge_behaviour battery_charge_behaviour = POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO; +static bool battery_hook; static bool module_initialized; @@ -238,6 +239,79 @@ static const struct power_supply_config test_power_configs[] = { }, }; +static int power_supply_ext_manufacture_year = 1234; +static const enum power_supply_property power_supply_ext_props[] = { + POWER_SUPPLY_PROP_MANUFACTURE_YEAR, +}; + +static int power_supply_ext_get_property(struct power_supply *psy, + const struct power_supply_ext *ext, + enum power_supply_property psp, + union power_supply_propval *val) +{ + switch (psp) { + case POWER_SUPPLY_PROP_MANUFACTURE_YEAR: + val->intval = power_supply_ext_manufacture_year; + break; + default: + pr_info("%s: some properties deliberately report errors.\n", + __func__); + return -EINVAL; + } + return 0; +} + +static int power_supply_ext_set_property(struct power_supply *psy, + const struct power_supply_ext *ext, + enum power_supply_property psp, + const union power_supply_propval *val) +{ + switch (psp) { + case POWER_SUPPLY_PROP_MANUFACTURE_YEAR: + power_supply_ext_manufacture_year = val->intval; + break; + default: + return -EINVAL; + } + return 0; +} + +static int power_supply_ext_property_is_writeable(struct power_supply *psy, + const struct power_supply_ext *ext, + enum power_supply_property psp) +{ + return true; +} + +static const struct power_supply_ext power_supply_ext = { + .properties = power_supply_ext_props, + .num_properties = ARRAY_SIZE(power_supply_ext_props), + .get_property = power_supply_ext_get_property, + .set_property = power_supply_ext_set_property, + .property_is_writeable = power_supply_ext_property_is_writeable, +}; + +static void test_battery_configure_battery_hook(bool enable) +{ + struct power_supply *psy; + + if (battery_hook == enable) + return; + + psy = test_power_supplies[TEST_BATTERY]; + + if (enable) { + if (power_supply_register_extension(psy, &power_supply_ext)) { + pr_err("registering battery extension failed\n"); + return; + } + } else { + power_supply_unregister_extension(psy, &power_supply_ext); + } + + battery_hook = enable; +} + static int __init test_power_init(void) { int i; @@ -258,6 +332,8 @@ static int __init test_power_init(void) } } + test_battery_configure_battery_hook(true); + module_initialized = true; return 0; failed: @@ -524,6 +600,22 @@ static int param_set_battery_current(const char *key, #define param_get_battery_current param_get_int +static int param_set_battery_hook(const char *key, + const struct kernel_param *kp) +{ + int tmp; + + if (1 != sscanf(key, "%d", &tmp)) + return -EINVAL; + if (tmp != 1 && tmp != 0) + return -EINVAL; + + test_battery_configure_battery_hook(tmp); + return 0; +} + +#define param_get_battery_hook param_get_int + static const struct kernel_param_ops param_ops_ac_online = { .set = param_set_ac_online, .get = param_get_ac_online, @@ -574,6 +666,11 @@ static const struct kernel_param_ops param_ops_battery_current = { .get = param_get_battery_current, }; +static const struct kernel_param_ops param_ops_battery_hook = { + .set = param_set_battery_hook, + .get = param_get_battery_hook, +}; + #define param_check_ac_online(name, p) __param_check(name, p, void); #define param_check_usb_online(name, p) __param_check(name, p, void); #define param_check_battery_status(name, p) __param_check(name, p, void); @@ -584,6 +681,7 @@ static const struct kernel_param_ops param_ops_battery_current = { #define param_check_battery_voltage(name, p) __param_check(name, p, void); #define param_check_battery_charge_counter(name, p) __param_check(name, p, void); #define param_check_battery_current(name, p) __param_check(name, p, void); +#define param_check_battery_hook(name, p) __param_check(name, p, void); module_param(ac_online, ac_online, 0644); @@ -621,6 +719,9 @@ MODULE_PARM_DESC(battery_charge_counter, module_param(battery_current, battery_current, 0644); MODULE_PARM_DESC(battery_current, "battery current (milliampere)"); +module_param(battery_hook, battery_hook, 0644); +MODULE_PARM_DESC(battery_hook, "battery hook"); + MODULE_DESCRIPTION("Power supply driver for testing"); MODULE_AUTHOR("Anton Vorontsov "); MODULE_LICENSE("GPL"); -- 2.45.2