From patchwork Sun Oct 29 13:48:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 117407 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1527455qgn; Sun, 29 Oct 2017 06:49:38 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Tw8SwdJ1OC20Quux/dRdOEqf7DIXuHMcXqx0zT3TyBS9a6BjCoyJ787QM36quUAmIsOnao X-Received: by 10.98.56.204 with SMTP id f195mr5880865pfa.188.1509284978688; Sun, 29 Oct 2017 06:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509284978; cv=none; d=google.com; s=arc-20160816; b=MiHH7xOfhGc8ZDvRsOxwpZP7dQuSfdFE53S0jpjHMaeT+ZtSzSxzzYUgISVuOIECXr /SD0iL1SeJKthLVteVKFLmEdenm9sUg4RmuEWHTWofHOA/cq0KFztzbQixw0unana8G1 VI9uETBrrzORf6et7PRgvBCkfZabGF6ye91qIeuwByyX+bKdhhdw2eVQwDXBtFNA4Adk iLA54Z9fVEST9SZqAca5E3KJKnfZznZkr+VF3B9KxQzl+nR9cPMd+GivVTuXkKRSpNbM 8zrQPree/4G2K81skuLEGbCzYKnJTJNUs+OK3e2N+B7zWaGEAoDDvZNvISEQ9S3VWiBY mM4Q== 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=sPrAiBZmbIapUxXZ3rtZTh87IahEowRiXxQY/FmhmRk=; b=yXhgXNiP7tm2ewgLs6NCjSBOQ5xC8AKEZ+Y0myT9/an9ue2MG03l//yE80QCsdx3Le 7myuQqFynN4jP3/45vbodQrZ+NtbVbynRLOvw6RT75adK82/29bfiKOngUeR70HN/7/P nvXIVCQjnY4ehhhJevKI9TxGlDoVsdpujmPAzgNeg3QuhGwtVVxjf9QbekPtxbHgXN2w HJ4uZ/gvcjePTJVtWUXiOiBrZ/VDgn15q7ouuHsAsTcehgBY6lAcbu7tFw/XdjrNKpDv I5IShuvsUoo6sfsVAOMR9eNZk6gEo0Y01SmOj0n+nfrXbAtBiOjPzopi+wIj156Kchdx a+Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TcPfx0O6; 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 j6si8653501pfh.329.2017.10.29.06.49.38; Sun, 29 Oct 2017 06:49:38 -0700 (PDT) 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=TcPfx0O6; 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 S1751731AbdJ2NtZ (ORCPT + 27 others); Sun, 29 Oct 2017 09:49:25 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:52993 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbdJ2NtV (ORCPT ); Sun, 29 Oct 2017 09:49:21 -0400 Received: by mail-pf0-f194.google.com with SMTP id e64so8655326pfk.9 for ; Sun, 29 Oct 2017 06:49:21 -0700 (PDT) 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=sPrAiBZmbIapUxXZ3rtZTh87IahEowRiXxQY/FmhmRk=; b=TcPfx0O6/x+V7g85A+YJCBvrP7YfLhw7qFyOnj1bJsrBfz09jFP/vuzwMMoKJBwnMo PUkxpOqxYY4jiChaaLcXAD4taacwMoFyt+Kdf1VIpFYF0VAirEIIP8w81IT6DhjunYR1 GvN+JoFirWN/qkR4aPPcOKfMzW6OjMl6mK18Q= 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=sPrAiBZmbIapUxXZ3rtZTh87IahEowRiXxQY/FmhmRk=; b=Za2ViMcFCwBUKZ+qwKEtrKNjZrH1z2w5fA7zsBF7JPtpq2gTwfFwS2O7VOKsQccoCD LhHrPiKMyM2hOswFm95+M+CYjpaU6vNZqD4Fi1mfFT0AlB8r//FL0Umaf/yOJP95tb4O L4fFjquracZ3FGW9DJFwwIVv5AtEHx99GwBI+m1uplgIpZYS4NIydnzT8+8bkuPSr1kU miHK1bjQEcLAxBrFcIUEfgd+d/R0SxSp/3Pbje2BzajDEzYPsfxP3sE55Z9/l5QuiOw0 L6EOfx8i+U/8OFPowYh8kMBN5KFz1VRF7vXXcGTUvq5wsE8CKQENSDEWWPI5RUZoz4YR x0ZQ== X-Gm-Message-State: AMCzsaXvhoBjCQ05M/rAFbgx9b9GiK+jY1arM/0a1kVqIf1TGysRLv8Z 7UqJ+eIep41zio/iFFS+8qZDMA== X-Received: by 10.84.192.37 with SMTP id b34mr4826604pld.451.1509284961335; Sun, 29 Oct 2017 06:49:21 -0700 (PDT) Received: from localhost ([122.167.161.211]) by smtp.gmail.com with ESMTPSA id 189sm20246794pge.26.2017.10.29.06.49.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Oct 2017 06:49:20 -0700 (PDT) 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 V4 04/12] boot_constraint: Add support for supply constraints Date: Sun, 29 Oct 2017 19:18:52 +0530 Message-Id: <4e171b6a496a6f5645804d9ed9cb53b4bcbe75a0.1509284255.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.15.0.rc1.236.g92ea95045093 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_constraints/Makefile | 2 +- drivers/boot_constraints/core.c | 4 ++ drivers/boot_constraints/core.h | 3 ++ drivers/boot_constraints/supply.c | 98 +++++++++++++++++++++++++++++++++++++++ include/linux/boot_constraint.h | 8 +++- 5 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 drivers/boot_constraints/supply.c -- 2.15.0.rc1.236.g92ea95045093 diff --git a/drivers/boot_constraints/Makefile b/drivers/boot_constraints/Makefile index 0f2680177974..a45616f0c3b0 100644 --- a/drivers/boot_constraints/Makefile +++ b/drivers/boot_constraints/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_constraints/core.c b/drivers/boot_constraints/core.c index 366a05d6d9ba..b9c024a3bdf5 100644 --- a/drivers/boot_constraints/core.c +++ b/drivers/boot_constraints/core.c @@ -94,6 +94,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_constraints/core.h b/drivers/boot_constraints/core.h index 7ba4ac172c09..73b9d2d22a12 100644 --- a/drivers/boot_constraints/core.h +++ b/drivers/boot_constraints/core.h @@ -30,4 +30,7 @@ struct constraint { }; /* 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_constraints/supply.c b/drivers/boot_constraints/supply.c new file mode 100644 index 000000000000..30f816dbf12c --- /dev/null +++ b/drivers/boot_constraints/supply.c @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2017 Linaro. + * Viresh Kumar + * + * This file is released under the GPLv2. + */ + +#define pr_fmt(fmt) "Supply Boot Constraints: " fmt + +#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 2b816bf74144..fc8ec0ee82f3 100644 --- a/include/linux/boot_constraint.h +++ b/include/linux/boot_constraint.h @@ -15,7 +15,13 @@ struct device; enum dev_boot_constraint_type { - DEV_BOOT_CONSTRAINT_NONE, + DEV_BOOT_CONSTRAINT_SUPPLY, +}; + +struct dev_boot_constraint_supply_info { + const char *name; + unsigned int u_volt_min; + unsigned int u_volt_max; }; struct dev_boot_constraint {