[V4,05/12] boot_constraint: Add support for clk constraints

Message ID fb9fb79a1486bc2ed62cfb2257db44b1498ad66e.1509284255.git.viresh.kumar@linaro.org
State New
Headers show
Series
  • Untitled series #5557
Related show

Commit Message

Viresh Kumar Oct. 29, 2017, 1:48 p.m.
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 <rnayak@codeaurora.org>

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

---
 drivers/boot_constraints/Makefile |  2 +-
 drivers/boot_constraints/clk.c    | 70 +++++++++++++++++++++++++++++++++++++++
 drivers/boot_constraints/core.c   |  4 +++
 drivers/boot_constraints/core.h   |  3 ++
 include/linux/boot_constraint.h   |  5 +++
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 drivers/boot_constraints/clk.c

-- 
2.15.0.rc1.236.g92ea95045093

Comments

Greg KH Dec. 13, 2017, 9:48 a.m. | #1
On Sun, Oct 29, 2017 at 07:18:53PM +0530, Viresh Kumar wrote:
> 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 <rnayak@codeaurora.org>

> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

> ---

>  drivers/boot_constraints/Makefile |  2 +-

>  drivers/boot_constraints/clk.c    | 70 +++++++++++++++++++++++++++++++++++++++

>  drivers/boot_constraints/core.c   |  4 +++

>  drivers/boot_constraints/core.h   |  3 ++

>  include/linux/boot_constraint.h   |  5 +++

>  5 files changed, 83 insertions(+), 1 deletion(-)

>  create mode 100644 drivers/boot_constraints/clk.c

> 

> diff --git a/drivers/boot_constraints/Makefile b/drivers/boot_constraints/Makefile

> index a45616f0c3b0..3424379fd1e4 100644

> --- a/drivers/boot_constraints/Makefile

> +++ b/drivers/boot_constraints/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_constraints/clk.c b/drivers/boot_constraints/clk.c

> new file mode 100644

> index 000000000000..b5b1d63c3e76

> --- /dev/null

> +++ b/drivers/boot_constraints/clk.c

> @@ -0,0 +1,70 @@

> +/*

> + * Copyright (C) 2017 Linaro.

> + * Viresh Kumar <viresh.kumar@linaro.org>

> + *

> + * This file is released under the GPLv2.

> + */

> +

> +#define pr_fmt(fmt) "Clock Boot Constraints: " fmt


You don't use this :(

Patch

diff --git a/drivers/boot_constraints/Makefile b/drivers/boot_constraints/Makefile
index a45616f0c3b0..3424379fd1e4 100644
--- a/drivers/boot_constraints/Makefile
+++ b/drivers/boot_constraints/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_constraints/clk.c b/drivers/boot_constraints/clk.c
new file mode 100644
index 000000000000..b5b1d63c3e76
--- /dev/null
+++ b/drivers/boot_constraints/clk.c
@@ -0,0 +1,70 @@ 
+/*
+ * Copyright (C) 2017 Linaro.
+ * Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#define pr_fmt(fmt) "Clock Boot Constraints: " fmt
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+
+#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_constraints/core.c b/drivers/boot_constraints/core.c
index b9c024a3bdf5..9213e56e8078 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_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_constraints/core.h b/drivers/boot_constraints/core.h
index 73b9d2d22a12..4f28ac2ef691 100644
--- a/drivers/boot_constraints/core.h
+++ b/drivers/boot_constraints/core.h
@@ -30,6 +30,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 fc8ec0ee82f3..a74b261a4ee4 100644
--- a/include/linux/boot_constraint.h
+++ b/include/linux/boot_constraint.h
@@ -15,9 +15,14 @@ 
 struct device;
 
 enum dev_boot_constraint_type {
+	DEV_BOOT_CONSTRAINT_CLK,
 	DEV_BOOT_CONSTRAINT_SUPPLY,
 };
 
+struct dev_boot_constraint_clk_info {
+	const char *name;
+};
+
 struct dev_boot_constraint_supply_info {
 	const char *name;
 	unsigned int u_volt_min;