From patchwork Fri Feb 23 10:23:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 129341 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp435283lja; Fri, 23 Feb 2018 02:24:24 -0800 (PST) X-Google-Smtp-Source: AH8x227SV2ggFBGPgzLyG3lRyzLarYc7zvpC/1zVk7DkHD2bizLgU6roYHSDCxRha1cNUkB1r2HF X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr1275117plf.48.1519381464276; Fri, 23 Feb 2018 02:24:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519381464; cv=none; d=google.com; s=arc-20160816; b=B09+2DjDzOh44Q874khrfgb7Ej7+YFZxotVHIWqubV82qHOdkPz0JxlD4pHuC2gAVS mpZGxIkgIKFX3XJt+hJTj9Ljsjff48I+qEHUjrgv5qxTuOzOktnM0pZ+uPPStV3ffeHN kEQhh+SoCinlSYzBZoS7syyISxVBQm/SJTjyd0IkX0edx5VHuR/+8jg9xhcc/iaWJU2Z ksyybwbXVK0KLI2IfNKh+nj2YUZU92WXg90tJVvO7psYAigRUHSs0TwiWxd3Y94AQoL3 /t006P/dhVhsbeWDVHxSR9a9e7pZFkIuZDTG2lp6pbkmjbFpGgR8r1CyNClV/+lQpPyk sUvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=NEHZacP+KL+rUypqnXnVYM/ZBgBS8SyS2IS4QXMto1Q=; b=ifULCUxvotp83bAfiV43KJCpV7w7r9XshYPpWAKAQnJMVn526B5Zs3tc4C6wnsrWRn 2HvKVlbAbZYW30VWibh7ussQOzdrRX1jNXvxj+sNJJ8iqdDE2QCVKjL1mBbRt6TST4GY zVzHNegmdWHyXT5xBl6PpL8A8NlR+Txrc0WgrqzAYU9TKVwWGiyUukZKR5s7xqUm97ie WL0IOe9mHR4d4Rn1Mmta1sgYWRltJetyr5d4pf58+2lQSKDHaFWrvqj3kDNI30yqu9N2 PXUr15QXRo+Hbfd7IxqiPRQ9R3QyDCbFnSQPTCAAaNwQLiJXr1L/Kz+LX0RuM3eFdKQG yzPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=evdnR6He; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y184si1350278pgd.291.2018.02.23.02.24.23; Fri, 23 Feb 2018 02:24:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=evdnR6He; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751567AbeBWKYU (ORCPT + 28 others); Fri, 23 Feb 2018 05:24:20 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:37201 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbeBWKYQ (ORCPT ); Fri, 23 Feb 2018 05:24:16 -0500 Received: by mail-pg0-f67.google.com with SMTP id y26so3200897pgv.4 for ; Fri, 23 Feb 2018 02:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=NEHZacP+KL+rUypqnXnVYM/ZBgBS8SyS2IS4QXMto1Q=; b=evdnR6He4LMJvgvRD6Vzy9TrtqNC03fb5h97koPNf+m461YiQHjN0tyLD6Bsvmm9dt jagX5MYz71ALr8OgbS68i+n6zNaSLfgwxy0gGcm2SebcpIP1vTh6EmYzF0LErbBpBCVG kSgpih1alB8VRKQaOzLfDXlcL2ge0HtMzv01I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=NEHZacP+KL+rUypqnXnVYM/ZBgBS8SyS2IS4QXMto1Q=; b=IOYX/lQhG4xFptnqwTJwX26mScCnuf1JCAESsNHHOPZ76a5duHaN/avtQHYrcqNApB lL7xOMzXcXbmMw1ILNFOxPmL1OpDINM7BuNa0k2K3Q69OOsZR5fqnIaxlbjrL2BSTKAr st31GIlNEilYIZazfQMPoH7+JNF67HBNPJ71u+wA+/glR/7G54g5iXjRJYR9mX2sa+f5 0kbiAcNLguZMpKBQLPoBn+pjI/m1AfKlvuhXL4FvG4S3wPlT82Lhfm4Tp7UNzeUmzAdI jRErDiGHWH56ohJWqK3bH//coNV1TdMr4YcVB8bBJAQ2M04I7jM1VBooJ3I3MCyV4YQS LRMA== X-Gm-Message-State: APf1xPA30jj3XCwsW9LMsGRcbRrQ44jpTXlxcNQk54S0aMr7iddHFO1R TaVDWNd7mAtswKTQ06jqMlVzIg== X-Received: by 10.98.198.1 with SMTP id m1mr1266712pfg.90.1519381455839; Fri, 23 Feb 2018 02:24:15 -0800 (PST) Received: from localhost ([122.167.232.138]) by smtp.gmail.com with ESMTPSA id p3sm4024590pfh.7.2018.02.23.02.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 02:24:15 -0800 (PST) From: Viresh Kumar To: Greg Kroah-Hartman Cc: Viresh Kumar , Vincent Guittot , Stephen Boyd , Rajendra Nayak , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, robdclark@gmail.com, s.hauer@pengutronix.de, l.stach@pengutronix.de, shawnguo@kernel.org, fabio.estevam@nxp.com, nm@ti.com, xuwei5@hisilicon.com, robh+dt@kernel.org, olof@lixom.net Subject: [PATCH V7 04/13] boot_constraint: Add support for supply constraints Date: Fri, 23 Feb 2018 15:53:43 +0530 Message-Id: <4425c187bddde1baf7a17cb52e36aae746626add.1519380923.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.15.0.194.g9af6a3dea062 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds the first constraint type: power-supply. The constraint is set by enabling the regulator and setting a voltage range (if required) for the respective regulator device, which will be honored by the regulator core even if more users turn up. Once the device is probed, the regulator is released and the constraint is removed. Tested-by: Rajendra Nayak Signed-off-by: Viresh Kumar --- drivers/bootconstraint/Makefile | 2 +- drivers/bootconstraint/core.c | 4 ++ drivers/bootconstraint/core.h | 5 +++ drivers/bootconstraint/supply.c | 95 +++++++++++++++++++++++++++++++++++++++++ include/linux/boot_constraint.h | 17 +++++++- 5 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 drivers/bootconstraint/supply.c -- 2.15.0.194.g9af6a3dea062 diff --git a/drivers/bootconstraint/Makefile b/drivers/bootconstraint/Makefile index 0f2680177974..a45616f0c3b0 100644 --- a/drivers/bootconstraint/Makefile +++ b/drivers/bootconstraint/Makefile @@ -1,3 +1,3 @@ # Makefile for device boot constraints -obj-y := core.o +obj-y := core.o supply.o diff --git a/drivers/bootconstraint/core.c b/drivers/bootconstraint/core.c index a9f38a0febb3..2973f8dd9094 100644 --- a/drivers/bootconstraint/core.c +++ b/drivers/bootconstraint/core.c @@ -91,6 +91,10 @@ static struct constraint *constraint_allocate(struct constraint_dev *cdev, void (*remove)(struct constraint *constraint); switch (type) { + case DEV_BOOT_CONSTRAINT_SUPPLY: + add = constraint_supply_add; + remove = constraint_supply_remove; + break; default: return ERR_PTR(-EINVAL); } diff --git a/drivers/bootconstraint/core.h b/drivers/bootconstraint/core.h index d04bd484b2a7..44c219716be5 100644 --- a/drivers/bootconstraint/core.h +++ b/drivers/bootconstraint/core.h @@ -27,4 +27,9 @@ struct constraint { void (*remove)(struct constraint *constraint); void *private; }; + +/* Forward declarations of constraint specific callbacks */ +int constraint_supply_add(struct constraint *constraint, void *data); +void constraint_supply_remove(struct constraint *constraint); + #endif /* _CORE_H */ diff --git a/drivers/bootconstraint/supply.c b/drivers/bootconstraint/supply.c new file mode 100644 index 000000000000..352ded92d057 --- /dev/null +++ b/drivers/bootconstraint/supply.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 Linaro. + * Viresh Kumar + */ + +#include +#include +#include + +#include "core.h" + +struct constraint_supply { + struct dev_boot_constraint_supply_info supply; + struct regulator *reg; +}; + +int constraint_supply_add(struct constraint *constraint, void *data) +{ + struct dev_boot_constraint_supply_info *supply = data; + struct constraint_supply *csupply; + struct device *dev = constraint->cdev->dev; + int ret; + + csupply = kzalloc(sizeof(*csupply), GFP_KERNEL); + if (!csupply) + return -ENOMEM; + + csupply->reg = regulator_get(dev, supply->name); + if (IS_ERR(csupply->reg)) { + ret = PTR_ERR(csupply->reg); + if (ret != -EPROBE_DEFER) { + dev_err(dev, "regulator_get() failed for %s (%d)\n", + supply->name, ret); + } + goto free; + } + + if (supply->u_volt_min != 0 && supply->u_volt_max != 0) { + ret = regulator_set_voltage(csupply->reg, supply->u_volt_min, + supply->u_volt_max); + if (ret) { + dev_err(dev, "regulator_set_voltage %s failed (%d)\n", + supply->name, ret); + goto free_regulator; + } + } + + ret = regulator_enable(csupply->reg); + if (ret) { + dev_err(dev, "regulator_enable %s failed (%d)\n", + supply->name, ret); + goto remove_voltage; + } + + memcpy(&csupply->supply, supply, sizeof(*supply)); + csupply->supply.name = kstrdup_const(supply->name, GFP_KERNEL); + constraint->private = csupply; + + return 0; + +remove_voltage: + if (supply->u_volt_min != 0 && supply->u_volt_max != 0) + regulator_set_voltage(csupply->reg, 0, INT_MAX); +free_regulator: + regulator_put(csupply->reg); +free: + kfree(csupply); + + return ret; +} + +void constraint_supply_remove(struct constraint *constraint) +{ + struct constraint_supply *csupply = constraint->private; + struct dev_boot_constraint_supply_info *supply = &csupply->supply; + struct device *dev = constraint->cdev->dev; + int ret; + + kfree_const(supply->name); + + ret = regulator_disable(csupply->reg); + if (ret) + dev_err(dev, "regulator_disable failed (%d)\n", ret); + + if (supply->u_volt_min != 0 && supply->u_volt_max != 0) { + ret = regulator_set_voltage(csupply->reg, 0, INT_MAX); + if (ret) + dev_err(dev, "regulator_set_voltage failed (%d)\n", + ret); + } + + regulator_put(csupply->reg); + kfree(csupply); +} diff --git a/include/linux/boot_constraint.h b/include/linux/boot_constraint.h index d56e33f3f921..736fe09a8589 100644 --- a/include/linux/boot_constraint.h +++ b/include/linux/boot_constraint.h @@ -16,9 +16,24 @@ struct device; /** * enum dev_boot_constraint_type - This defines different boot constraint types. * + * @DEV_BOOT_CONSTRAINT_SUPPLY: This represents a power supply boot constraint. */ enum dev_boot_constraint_type { - DEV_BOOT_CONSTRAINT_NONE, + DEV_BOOT_CONSTRAINT_SUPPLY, +}; + +/** + * struct dev_boot_constraint_supply_info - Power supply boot constraint + * information. + * + * @name: This must match the power supply name for the device. + * @u_volt_min: This is the minimum microvolts value supported by the device. + * @u_volt_max: This is the maximum microvolts value supported by the device. + */ +struct dev_boot_constraint_supply_info { + const char *name; + unsigned int u_volt_min; + unsigned int u_volt_max; }; /**