From patchwork Wed Jan 10 03:47:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 123999 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4788433qgn; Tue, 9 Jan 2018 19:48:12 -0800 (PST) X-Google-Smtp-Source: ACJfBosRFwYWilGsEUwEg8fA6UUQ/tJ+wkfCIEMtTwsiuM/KJjnjkXZIPDVxvRfq22lpW0A0yilc X-Received: by 10.99.116.26 with SMTP id p26mr6294692pgc.320.1515556092645; Tue, 09 Jan 2018 19:48:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515556092; cv=none; d=google.com; s=arc-20160816; b=W6Zo9xLZK6Eb1NOpc/1E2f7J0fx2tIBHoGsF0uHFVAZwg42Il6L5oerMymbA765tKJ dulqJ4jFM3kDwiTy6PLeES+TQIybsfrdioRhj/dZabAdzx7/3NgSEyqS8nSSiXf5LOJW P2u+yoKgD9sjR5kg+JAi+ybdrMNJJ/V0wMAVnqOkvxjp5XBKvSFV7Z2FcVFrMBVNVgHF MEE5KMg73irn4fhUcJfxOSzP9LuisP2dx1zZZpv4cd3RUAkb+6MRI7ljCulkmYKxld0Q ggA6mgQFeQxzHG1JLKH99AMLYrb3G2DsGiWaeKCr5r429EbYaTBf43Q6Ckyj4eYN/WE1 8b6g== 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=icrIZ+0hNJgAa851BNV/t+RWElv/Pouel/nrtZERfj0=; b=Tg/0Fp55Uj5+Lu6q7t7JmbmO9KGZXqAaDe0IRlJxqtLR+nIYxPAK7QWDZvsrt9PO+x qKSOSAQnIqw3M80W60ezeC1BlndAiHcJ+Pze/bml8pXXAMx6oBqAbFon6AROEqCdqRT7 CKz8Vh4ZmjHk7BxHnD1+8hZox9g/rumD/x5n1gzNXxE9xWvrpVILoZawsF8NbuMjvo7A +wSst9L3CkUw6l44ldWRsI+bRbhPSEj4yL4aLLPyapM6giy08DrDu9Qz65ntoYsNiJnZ bvR/zZt67mNljvrQaJD4Y17+NaVeZtFHYa3yU4RAeZgD7tSA9ZScRlEgjcTiWOGnWHTv dqSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FsuGWVjm; 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 z10si2359910pgp.671.2018.01.09.19.48.12; Tue, 09 Jan 2018 19:48:12 -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=FsuGWVjm; 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 S965197AbeAJDsJ (ORCPT + 28 others); Tue, 9 Jan 2018 22:48:09 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:40046 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965127AbeAJDsE (ORCPT ); Tue, 9 Jan 2018 22:48:04 -0500 Received: by mail-pl0-f68.google.com with SMTP id 62so6514594pld.7 for ; Tue, 09 Jan 2018 19:48:03 -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=icrIZ+0hNJgAa851BNV/t+RWElv/Pouel/nrtZERfj0=; b=FsuGWVjmrjoP6gbAnwUYNa+tEj3CEtPecf2VQrkU013fAkqO5N/8jmQtBKtOH4dGzP R0f9iL3OB6WmNbhdW7BqvHxpsyRE9j2z8uRlyAf5/9HmtwB1dR5RjRwuZfzEsG7Gz9H3 dB/smse3ZeHLHc1Pd7tsR5l7yBaN0Fpc6isiY= 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=icrIZ+0hNJgAa851BNV/t+RWElv/Pouel/nrtZERfj0=; b=rz+CDefoCinsg9QylIE6K/Se7O0qqvV8M78sc8/0QQBJ4AkiDR5jhVMlrSBgsig2eb aXJual2wiNlrTczQeRBcdEKdqtsxmjOXTQQILq7NhDo5MA8F6rQmBVqzl8/irzhKQrLk zXpO+V6l3V7lpZmOH5pCZK3wT+lWSgEqHz+pkEEDuIUDc5deRShyYkYsXU+vdIUjhVxl x0pS17P4cfWxPkxqRISwRT7y2R5CUKhJ9diBQRvOFycxYiUZz0VXEyDVbAaEW52GbI3f 0FQi2RAMFKxf1VTyWyFFXJQYBA9vv/QTGwCBg0brDkyPFjSfXfPkV3AYxyPCQtcPzpHH uFXw== X-Gm-Message-State: AKGB3mLR0w7HRO0VgL2fqWY+Q4NnprDSfiZ/YOmA3sTIidqRwgtNWjXN N7Lia6AStUcywChbnIdKbkG6tQ== X-Received: by 10.84.211.9 with SMTP id b9mr17612156pli.152.1515556083478; Tue, 09 Jan 2018 19:48:03 -0800 (PST) Received: from localhost ([122.172.19.39]) by smtp.gmail.com with ESMTPSA id m22sm33124727pfg.120.2018.01.09.19.48.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 19:48:02 -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 Subject: [PATCH V6 04/13] boot_constraint: Add support for supply constraints Date: Wed, 10 Jan 2018 09:17:33 +0530 Message-Id: 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/boot_constraint/Makefile | 2 +- drivers/boot_constraint/core.c | 4 ++ drivers/boot_constraint/core.h | 5 +++ drivers/boot_constraint/supply.c | 95 ++++++++++++++++++++++++++++++++++++++++ include/linux/boot_constraint.h | 17 ++++++- 5 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 drivers/boot_constraint/supply.c -- 2.15.0.194.g9af6a3dea062 diff --git a/drivers/boot_constraint/Makefile b/drivers/boot_constraint/Makefile index 0f2680177974..a45616f0c3b0 100644 --- a/drivers/boot_constraint/Makefile +++ b/drivers/boot_constraint/Makefile @@ -1,3 +1,3 @@ # Makefile for device boot constraints -obj-y := core.o +obj-y := core.o supply.o diff --git a/drivers/boot_constraint/core.c b/drivers/boot_constraint/core.c index 45a0fbed1b11..63a4b1a2fa2c 100644 --- a/drivers/boot_constraint/core.c +++ b/drivers/boot_constraint/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/boot_constraint/core.h b/drivers/boot_constraint/core.h index 1e87125de531..d0d3e7bf7d57 100644 --- a/drivers/boot_constraint/core.h +++ b/drivers/boot_constraint/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/boot_constraint/supply.c b/drivers/boot_constraint/supply.c new file mode 100644 index 000000000000..916e5d6848d5 --- /dev/null +++ b/drivers/boot_constraint/supply.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 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 2ce62b7b3cc6..1db24d53b622 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; }; /**