clk: track the orphan status of clocks and their children (e6500344) · Commits · 戴 / test

While children of orphan clocks are not carried in the orphan-list itself, they're nevertheless orphans in their own right as they also don't have an input-rate available. To ease tracking if a clock is an orphan or has an orphan in its parent path introduce an orphan field into struct clk and update it and the fields in child-clocks when a clock gets added or removed from the orphan-list. Suggested-by:

Stephen Boyd <sboyd@codeaurora.org> Signed-off-by:

Heiko Stuebner <heiko@sntech.de> Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Alex Elder <elder@linaro.org> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: kernel@pengutronix.de Cc: Zhangfei Gao <zhangfei.gao@linaro.org> Cc: Santosh Shilimkar <ssantosh@kernel.org> Cc: Chao Xie <chao.xie@marvell.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Stefan Wahren <stefan.wahren@i2se.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Georgi Djakov <georgi.djakov@linaro.org> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Barry Song <baohua@kernel.org> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Viresh Kumar <viresh.linux@gmail.com> Cc: Gabriel FERNANDEZ <gabriel.fernandez@st.com> Cc: emilio@elopez.com.ar Cc: Peter De Schrijver <pdeschrijver@nvidia.com> Cc: Tero Kristo <t-kristo@ti.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Michal Simek <michal.simek@xilinx.com> [sboyd@codeaurora.org: s/clk/core/ in new function] Signed-off-by:

Stephen Boyd <sboyd@codeaurora.org>

drivers/clk/clk.c

+30 −3

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ struct clk_core {
		struct clk_core *new_parent;
		struct clk_core *new_child;
		unsigned long flags;
		bool orphan;
		unsigned int enable_count;
		unsigned int prepare_count;
		unsigned long min_rate;
		@@ -1091,18 +1092,40 @@ static int clk_fetch_parent_index(struct clk_core *core,
		return -EINVAL;
		}

		/*
		* Update the orphan status of @core and all its children.
		*/
		static void clk_core_update_orphan_status(struct clk_core *core, bool is_orphan)
		{
		struct clk_core *child;

		core->orphan = is_orphan;

		hlist_for_each_entry(child, &core->children, child_node)
		clk_core_update_orphan_status(child, is_orphan);
		}

		static void clk_reparent(struct clk_core core, struct clk_core new_parent)
		{
		bool was_orphan = core->orphan;

		hlist_del(&core->child_node);

		if (new_parent) {
		bool becomes_orphan = new_parent->orphan;

		/* avoid duplicate POST_RATE_CHANGE notifications */
		if (new_parent->new_child == core)
		new_parent->new_child = NULL;

		hlist_add_head(&core->child_node, &new_parent->children);

		if (was_orphan != becomes_orphan)
		clk_core_update_orphan_status(core, becomes_orphan);
		} else {
		hlist_add_head(&core->child_node, &clk_orphan_list);
		if (!was_orphan)
		clk_core_update_orphan_status(core, true);
		}

		core->parent = new_parent;
		@@ -2359,13 +2382,17 @@ static int __clk_init(struct device dev, struct clk clk_user)
		* clocks and re-parent any that are children of the clock currently
		* being clk_init'd.
		*/
		if (core->parent)
		if (core->parent) {
		hlist_add_head(&core->child_node,
		&core->parent->children);
		else if (core->flags & CLK_IS_ROOT)
		core->orphan = core->parent->orphan;
		} else if (core->flags & CLK_IS_ROOT) {
		hlist_add_head(&core->child_node, &clk_root_list);
		else
		core->orphan = false;
		} else {
		hlist_add_head(&core->child_node, &clk_orphan_list);
		core->orphan = true;
		}

		/*
		* Set clk's accuracy. The preferred method is to use

Admin message