From patchwork Wed Jan 10 03:47:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 124008 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4790375qgn; Tue, 9 Jan 2018 19:51:08 -0800 (PST) X-Google-Smtp-Source: ACJfBot9oyWAe6lIOqLDDAzk1JDDbAwea7uiO3NaShjEk5mBAcGYTN57Pe0sVuls3uF3bQPPvU3t X-Received: by 10.101.69.13 with SMTP id n13mr13728896pgq.91.1515556268691; Tue, 09 Jan 2018 19:51:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515556268; cv=none; d=google.com; s=arc-20160816; b=ctcyU6CWAwmhR4HewR9RPVc9UALW81vznv9TuZ7KiBw7njHWZ00qKRqKrVsulOC8mL uVca2UK4UASyIysorl05mJu4Kkyj4IYmnUP5fy+4gr6b2Qyro+oPMFW45QJX0S4+ojZn 6HKqKQDVmfKQ/uM2MUyZAoewrNrYemjrow5yqJE58jjTHbc125PwiWpphed4ZyWk4Ffb S0xiuF5xA+6yjJ1sKx1x2hSYGG+POFpfkHvHRA6r3hUKoFuSnbhF2FgcesE9nDQrnKS1 lqPtjXnzIeu0ADfrman0ZBIRCqmS8WF9jl6nglR/GlbzrMWLId5vmXGqv7/UvJxLisoP xPIg== 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=hq7LNru86umq3Ohb8ktl/vs66yJLPSY7u5fKbxtkzjb4DFBpBQoe1ajnA1mDxKLsrK 94x6Cqm40DE/kqU6fE6jwSZ/mnFC5ii6DvYsUco1UUufkc0CCbZKer0xlr9HdqztQ8D+ eRqurJXBA57sZQ3xZRbHp5do+Qe2mKmRjyWcYHbeUaE6qli0wY5V70jjMAmt8X7SzNfW BYmVLO14KZ7cXJUoU02x7PBdodnS5EieO0iRIxW2EKjVXiM1bIrKuKN3HUYGptFtFfk4 SSNIBUYTn40dxRGGlDbKIBCbb+EFxZfeBn25p/NI6b/ji1RkW5kGWTWPk9/UdS5/TKAd X9TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iyz/0Sxt; 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 68si11034442pff.213.2018.01.09.19.51.08; Tue, 09 Jan 2018 19:51:08 -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=iyz/0Sxt; 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 S1756486AbeAJDvG (ORCPT + 28 others); Tue, 9 Jan 2018 22:51:06 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:45065 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965185AbeAJDsG (ORCPT ); Tue, 9 Jan 2018 22:48:06 -0500 Received: by mail-pg0-f67.google.com with SMTP id c194so8835139pga.12 for ; Tue, 09 Jan 2018 19:48:06 -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=iyz/0Sxt+/4VHMJKlh9mzBjWSxrDMDSS/rlhHi2NeDHj05lD0VM9zOf3kGDiVcCu+o 0YDeJ8lDpWGY/wDtnvT3H1kfdthv3KszimIJ/4kJKTqO3pWbND3q8Cw3m2x3mf3GWmoI BpJoJCyhaUKrQ9aJa3buq+f3Y0hxpYPR9ynaw= 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=FPTum7mfDvK/bQ1Rx8UcrLUHktgzdnlcyxvf/SLYajG717WYIqU/mO9SMOjWCbdGN3 t4qAglD5TFnjVOPuMcWTJi5sWHwvEbBTTf3+fdBCOdc2GiEN+O3bS4kxo+pVzf4QWM+k RHSSoJC7umOI9L8NzvuFgbhk9YBXznPDSRvwbgctA/HOPuKRXFdesyLUmbx119hrNh5p KCprlt77yPfAjAkyapkFXcAuQXhs8Z+rYI2lOTkfBQaoF8jTHaEUJ9oNhSkm8jXj3MG1 YlTqZ7rPMYNvy3lOy8lJm/ppcuQeV+J3Yf2qdit0ZRHzsCPAHp8Z48TFH789cDvNQ3Zl qQlA== X-Gm-Message-State: AKGB3mJis3kC7lQ1DIxFwHcwLkF75DIUMGyVXZ0Y6ZSXnqsk9/tkEOKl pU7qWsCpglEvi8s4TOYsONY7NQ== X-Received: by 10.98.67.151 with SMTP id l23mr15765807pfi.194.1515556086012; Tue, 09 Jan 2018 19:48:06 -0800 (PST) Received: from localhost ([122.172.19.39]) by smtp.gmail.com with ESMTPSA id a22sm36343410pfc.47.2018.01.09.19.48.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 19:48:05 -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 05/13] boot_constraint: Add support for clk constraints Date: Wed, 10 Jan 2018 09:17:34 +0530 Message-Id: <282c37b14c0f6102b6748e26314455c64d5fe46b.1515554879.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.