From patchwork Thu Dec 14 15:33:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 121975 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6960139qgn; Thu, 14 Dec 2017 07:34:11 -0800 (PST) X-Google-Smtp-Source: ACJfBotIw+rq+ONf2CDFs15VvNPX3dkzrwYUDOP1btnjIT2laiYC7HZoLRNncprVfV2ojIzhYn5u X-Received: by 10.99.127.70 with SMTP id p6mr8754839pgn.418.1513265651638; Thu, 14 Dec 2017 07:34:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513265651; cv=none; d=google.com; s=arc-20160816; b=JqwUGYd1x68DqQwDpTBjLidRQhPRZNsS/pus7toE0/WlpnxUzUPsWEPOAaLV/QQyB1 nUnAqzjV1+ZXcErMY6yD9sVjYe7dPIMi/wu3QCwlZGhBNW8LCLdUPXiltQv0OMpMuivY uEo+HbqGFB3Tj5jRd5ZJ/4jY5HTgahY6e8HhCGxjmYRcEY05EgNumqcEM0ESwNuyO5qj moQJzO9kFsSx4Yp67P+dSEx4d64V9BSLVxCfrVP1Y643KWbM8/uE2PiU+pt9P7Jpuzu8 eCIl2rfMtQmOodYoN5bxF0hUzyD6ciCutPk9A9ln3UkP1aGgGmPQ7qcUgdW8qmEvDvkk 793A== 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=96/PenY+L4PT6MZMyfgg3j5Cpr3agCdGKBAcQne3S8E=; b=hF4OCIyQJ27HFHR56CAuEVtn0/JX3oHi5DU/JY1Bz8oTxlzCKGq7uvwrI9qpCXZWlG zvrd3VEqKk+PoO9cdVo6RXz2gIRgeEL2oMcXOPmyMbiPBeAVysXVr1NRVEY3cDono9LA Mk7QkX3mKxU1Sbe3LhTKNL/fX9jQEmKaqVLjVr3ACLqkO1xPnL8tzWrP3+oyDBGM8LJY vqYuPzXPzcrHXEEL/FhSxGdM0bAXImWCtBPT1cw8TU3zR7CqfRa1vPthNxbOQnb0Dhup DxBrS9B9TpCIUN7Ie8b2z0vI6oX/XHXwvjkqKeV2wAAJ0rQUaURbNjfAuMIFxptJnvmZ Cyng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RMX6yglh; 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 q12si3358439pls.475.2017.12.14.07.34.11; Thu, 14 Dec 2017 07:34:11 -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=RMX6yglh; 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 S1753444AbdLNPeJ (ORCPT + 19 others); Thu, 14 Dec 2017 10:34:09 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33100 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753264AbdLNPeF (ORCPT ); Thu, 14 Dec 2017 10:34:05 -0500 Received: by mail-pf0-f196.google.com with SMTP id y89so3861684pfk.0 for ; Thu, 14 Dec 2017 07:34:05 -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=96/PenY+L4PT6MZMyfgg3j5Cpr3agCdGKBAcQne3S8E=; b=RMX6yglhKo0Od2dfIeF3KvGc8xecnI7SWYZ/zm/BMTCGA6jTijPWO2/vOrt/OueX3X 1lJHLnUUYXZZhTe2H3ms4kDRv/SFDfdrDTm7tfPyWFJbOrchYPI3N+dkdik3EESuUykh cTXcdbge6e21vXuSbjoru9q7seeuJ/babuNOw= 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=96/PenY+L4PT6MZMyfgg3j5Cpr3agCdGKBAcQne3S8E=; b=l5476x3x31ymRJ6ed6Y5TPySdo/nzhcB/COY99v2xcg4TDBzOoSb0QM4staL7Af59E LBiXgE6rrAMZtaya20J1V92EaLs5hrdqRtbb2PaZMJLr9CZzf5VKAFUhQRLgYTdYSQZY IrBH8Fy7WjrE3X+GgZmeuAuRaH+BLM4Nr7s5r0qA+eMFogrVFk5C42l90JEm5JKJ071v DGSfY28WlReowQg0/YtgBLmKmvrvcZKsj8q0MbRKV5GEhQSOI/zgPOU2hSuIEnPG4Xo3 zFJel3qiJvRBl6YJn0UpS4RcRRYA2O7ddP2m58CuXukZ83d11Rn+/UmF0nGnVel9Yhb4 dMaw== X-Gm-Message-State: AKGB3mIOW1bFrGp+Fb8oP0BvLfjeKF80Mviy/C4DuAjTgM1jqBIu3SZD y94dnQtcz3gRM4+8RTkWEPSs0g== X-Received: by 10.159.242.132 with SMTP id u4mr9985674plr.296.1513265645077; Thu, 14 Dec 2017 07:34:05 -0800 (PST) Received: from localhost ([122.172.99.7]) by smtp.gmail.com with ESMTPSA id b10sm8503649pfj.20.2017.12.14.07.34.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 07:34:04 -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 V5 05/13] boot_constraint: Add support for clk constraints Date: Thu, 14 Dec 2017 21:03:12 +0530 Message-Id: <1384510a9ca95d307e6a23b32cb467a2e23b22b6.1513264961.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 clk constraint type. The constraint is set by enabling the clk for the device. Once the device is probed, the clk is disabled and the constraint is removed. We may want to do clk_set_rate() from here, but lets wait for some real users that really want it. Tested-by: Rajendra Nayak Signed-off-by: Viresh Kumar --- drivers/boot_constraint/Makefile | 2 +- drivers/boot_constraint/clk.c | 67 ++++++++++++++++++++++++++++++++++++++++ drivers/boot_constraint/core.c | 4 +++ drivers/boot_constraint/core.h | 3 ++ include/linux/boot_constraint.h | 11 +++++++ 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 drivers/boot_constraint/clk.c -- 2.15.0.194.g9af6a3dea062 diff --git a/drivers/boot_constraint/Makefile b/drivers/boot_constraint/Makefile index a45616f0c3b0..3424379fd1e4 100644 --- a/drivers/boot_constraint/Makefile +++ b/drivers/boot_constraint/Makefile @@ -1,3 +1,3 @@ # Makefile for device boot constraints -obj-y := core.o supply.o +obj-y := clk.o core.o supply.o diff --git a/drivers/boot_constraint/clk.c b/drivers/boot_constraint/clk.c new file mode 100644 index 000000000000..db22acff43e6 --- /dev/null +++ b/drivers/boot_constraint/clk.c @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 Linaro. + * Viresh Kumar + */ + +#include +#include +#include + +#include "core.h" + +struct constraint_clk { + struct dev_boot_constraint_clk_info clk_info; + struct clk *clk; +}; + +int constraint_clk_add(struct constraint *constraint, void *data) +{ + struct dev_boot_constraint_clk_info *clk_info = data; + struct constraint_clk *cclk; + struct device *dev = constraint->cdev->dev; + int ret; + + cclk = kzalloc(sizeof(*cclk), GFP_KERNEL); + if (!cclk) + return -ENOMEM; + + cclk->clk = clk_get(dev, clk_info->name); + if (IS_ERR(cclk->clk)) { + ret = PTR_ERR(cclk->clk); + if (ret != -EPROBE_DEFER) { + dev_err(dev, "clk_get() failed for %s (%d)\n", + clk_info->name, ret); + } + goto free; + } + + ret = clk_prepare_enable(cclk->clk); + if (ret) { + dev_err(dev, "clk_prepare_enable() %s failed (%d)\n", + clk_info->name, ret); + goto put_clk; + } + + cclk->clk_info.name = kstrdup_const(clk_info->name, GFP_KERNEL); + constraint->private = cclk; + + return 0; + +put_clk: + clk_put(cclk->clk); +free: + kfree(cclk); + + return ret; +} + +void constraint_clk_remove(struct constraint *constraint) +{ + struct constraint_clk *cclk = constraint->private; + + kfree_const(cclk->clk_info.name); + clk_disable_unprepare(cclk->clk); + clk_put(cclk->clk); + kfree(cclk); +} diff --git a/drivers/boot_constraint/core.c b/drivers/boot_constraint/core.c index 63a4b1a2fa2c..df9e0bddbfbe 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_CLK: + add = constraint_clk_add; + remove = constraint_clk_remove; + break; case DEV_BOOT_CONSTRAINT_SUPPLY: add = constraint_supply_add; remove = constraint_supply_remove; diff --git a/drivers/boot_constraint/core.h b/drivers/boot_constraint/core.h index d0d3e7bf7d57..720bda0a0f44 100644 --- a/drivers/boot_constraint/core.h +++ b/drivers/boot_constraint/core.h @@ -29,6 +29,9 @@ struct constraint { }; /* Forward declarations of constraint specific callbacks */ +int constraint_clk_add(struct constraint *constraint, void *data); +void constraint_clk_remove(struct constraint *constraint); + int constraint_supply_add(struct constraint *constraint, void *data); void constraint_supply_remove(struct constraint *constraint); diff --git a/include/linux/boot_constraint.h b/include/linux/boot_constraint.h index 1db24d53b622..d798355fd93f 100644 --- a/include/linux/boot_constraint.h +++ b/include/linux/boot_constraint.h @@ -16,12 +16,23 @@ struct device; /** * enum dev_boot_constraint_type - This defines different boot constraint types. * + * @DEV_BOOT_CONSTRAINT_CLK: This represents a clock boot constraint. * @DEV_BOOT_CONSTRAINT_SUPPLY: This represents a power supply boot constraint. */ enum dev_boot_constraint_type { + DEV_BOOT_CONSTRAINT_CLK, DEV_BOOT_CONSTRAINT_SUPPLY, }; +/** + * struct dev_boot_constraint_clk_info - Clock boot constraint information. + * + * @name: This must match the connection-id of the clock for the device. + */ +struct dev_boot_constraint_clk_info { + const char *name; +}; + /** * struct dev_boot_constraint_supply_info - Power supply boot constraint * information.