From patchwork Fri Feb 23 10:23:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 129350 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp436933lja; Fri, 23 Feb 2018 02:26:38 -0800 (PST) X-Google-Smtp-Source: AH8x224MyXMuwqRs2eYLtCipjLvVYHc77OCCK/8ERzmHX+L94bFmku67OtrQFNMUJsJaj6QGSIDN X-Received: by 10.98.251.5 with SMTP id x5mr1317815pfm.18.1519381598572; Fri, 23 Feb 2018 02:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519381598; cv=none; d=google.com; s=arc-20160816; b=yb+uUP0Df1eYjdpWtzLvYUzsvGyw3W4BjxGqvjkqTA8JYFtRMe0JufhEcIcs0LP0L7 zTjHwkYBoFSv0eswYVtfDOqQWor9Rxy3cXKf/bqzO053ciDmUPbuSXRahRUlKrGURTCv JB8W3U73BsFNUCTfinAapOnHFXdFk3+7bnlI4KQ8vwRrhyeP4McYaVk7O+DG8s7+oj0e AyE8yMgSJ8OgdCPNA5G0Ter6YfvuwU2DBK0n/QoHMPCgv/2Kah6u7CmJCM8CwMl7+x+Q L6g/StMyfaV+4XEwZrfLrvxVVZQD/xoV/iZqKD6nKY35WQ1mvTsvGwkYYVICip9UoWXo tAmQ== 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=G2f8VbzrMvNh40O8+d08UjmT09kaXNhp3e6FeRb5VQY=; b=K9M/ZNvw0OM2yMZcCWY8d0Lq9gKmHPMHhgbxidia2jdBh/3ifzsu+f5v6pdxLWJhv8 n7xp8NoiYL4Z1MlUj4/XQCiJl8VrwX9EhLVz+M5xOvvitgeO4ZmsXIc3/bXn1NlizLB6 rgjq9qNLs4CFYQ1dp2DlSrN0h3/c1+4pWW5WrYZ1WhIuOCJ6LTN3VplBWXj5TdixWLms 37hxG4lmui/BO9SeqJ6VLTa8ScRCj1H1/T2vqv0tUMzi1bUPjMTdqyU159tssWFH4edg b2oFD9Bl5lO+Yxxp63HCcCfUoq8XedU1+9n6B08APP0fYLqi7UnJO0jV7hssgqtdEYht o2gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ieTgY4Fm; 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 a186si1359376pgc.36.2018.02.23.02.26.38; Fri, 23 Feb 2018 02:26:38 -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=ieTgY4Fm; 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 S1751758AbeBWK0e (ORCPT + 28 others); Fri, 23 Feb 2018 05:26:34 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34613 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530AbeBWKYT (ORCPT ); Fri, 23 Feb 2018 05:24:19 -0500 Received: by mail-pf0-f196.google.com with SMTP id k2so3347621pfi.1 for ; Fri, 23 Feb 2018 02:24:18 -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=G2f8VbzrMvNh40O8+d08UjmT09kaXNhp3e6FeRb5VQY=; b=ieTgY4Fmzd+a8q+lu4n/jC5yd5Cl5PiUfoIPP4qK/Bq49UFOZrvFI/aFBHGSbXXpG6 YG3d7UF8RhnHg4q7rCaISiN6O0WbiLyNE7/4mBLMzgGsuAa0P5znQh+TCuAYLlR63D2E MDd/2ETh2gCPUVGm2xL3MBz/oOOGWtTnCnRbE= 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=G2f8VbzrMvNh40O8+d08UjmT09kaXNhp3e6FeRb5VQY=; b=R5esuNCDilhukKRpZ7MGJNcw1ceoIdhoywvQRhdjYJmneSv43KbGcwQQO24Ihppujm 3YO/VSJtV+TLJXiCzsEP53nGd77Vjw5IQqUzW3F8bqm1Ibi9o75PZDGAtG34XMm5wly8 fwq+CVrpL6Yq8UBJoAaiixSeVl4MtLPDqqHVjgvfs5iXZ8BRfYawpQRv64AQVXOQFZN2 rFsOV8F5A+nUgri8wgai7uUMEyFvCEsR0TP3w/1lMgYPqsAN+/0IhotW/PzhmOIGdI/4 IfyIsTaiH1YXibKmYCGyuWGGaRJTPZrENFHkxfM9Ka6WYs1gGxC+k3WPzHgQv+3exNNc 4RIg== X-Gm-Message-State: APf1xPCxaPAossE2EepwhW84pNGNEPYnDtJ1sQy/ENNWc0JAwvpdaMvb eWnAGE0hOAysizJNHIEgRWSb9w== X-Received: by 10.98.100.131 with SMTP id y125mr1275293pfb.117.1519381458312; Fri, 23 Feb 2018 02:24:18 -0800 (PST) Received: from localhost ([122.167.232.138]) by smtp.gmail.com with ESMTPSA id m22sm4335405pfg.188.2018.02.23.02.24.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 02:24:17 -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 05/13] boot_constraint: Add support for clk constraints Date: Fri, 23 Feb 2018 15:53:44 +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 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/bootconstraint/Makefile | 2 +- drivers/bootconstraint/clk.c | 67 +++++++++++++++++++++++++++++++++++++++++ drivers/bootconstraint/core.c | 4 +++ drivers/bootconstraint/core.h | 3 ++ include/linux/boot_constraint.h | 11 +++++++ 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 drivers/bootconstraint/clk.c -- 2.15.0.194.g9af6a3dea062 diff --git a/drivers/bootconstraint/Makefile b/drivers/bootconstraint/Makefile index a45616f0c3b0..3424379fd1e4 100644 --- a/drivers/bootconstraint/Makefile +++ b/drivers/bootconstraint/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/bootconstraint/clk.c b/drivers/bootconstraint/clk.c new file mode 100644 index 000000000000..90262fe9057c --- /dev/null +++ b/drivers/bootconstraint/clk.c @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 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/bootconstraint/core.c b/drivers/bootconstraint/core.c index 2973f8dd9094..a73744c5d599 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_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/bootconstraint/core.h b/drivers/bootconstraint/core.h index 44c219716be5..09a6176541d7 100644 --- a/drivers/bootconstraint/core.h +++ b/drivers/bootconstraint/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 736fe09a8589..4685ff55fff8 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.