Skip to contentSkip to conversation

clk: Always notify whole subtree when reparenting

PATCH New Soren Brinkmann 2 participants 5 messages Apr 16, 2013 – May 7, 2013 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: Always notify whole subtree when reparenting

A clock's notifier count only reflects notifiers which are registered directly for that clock. A reparent operation though affects the whole subtree because of a potential rate change.
When issuing the pre rate change notifications only the notifier count for the clock to be changed is considered and notifiers for subclocks may never be called. Resulting in clocks in the subtree which have registered notifiers, may receive a POST_- or ABORT_RATE_CHANGE notification, without a PRE_RATE_CHANGE_NOTIFICATION. Therefore always traverse the whole subtree when issueing pre rate change notifications during a reparent operation.

---
This should probably be considered an RFC. There may be smarter ways to resolve this issue. E.g. forward notifier counts upstream the way it is done with enable counts.

S?ren

 drivers/clk/clk.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/clk.c +1 -2
index 20ce67f..1179cb5 100644
@@ -1481,8 +1481,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
 	}
 
 	/* propagate PRE_RATE_CHANGE notifications */
-	if (clk->notifier_count)
-		ret = __clk_speculate_rates(clk, p_rate);
+	ret = __clk_speculate_rates(clk, p_rate);
 
 	/* abort if a driver objects */
 	if (ret & NOTIFY_STOP_MASK)
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH 1/1 clk: Always notify whole subtree when reparenting

Quoting Soren Brinkmann (2013-04-16 10:06:50)

Quoted 11 lines

A clock's notifier count only reflects notifiers which are registered directly for that clock. A reparent operation though affects the whole subtree because of a potential rate change.
When issuing the pre rate change notifications only the notifier count for the clock to be changed is considered and notifiers for subclocks may never be called. Resulting in clocks in the subtree which have registered notifiers, may receive a POST_- or ABORT_RATE_CHANGE notification, without a PRE_RATE_CHANGE_NOTIFICATION. Therefore always traverse the whole subtree when issueing pre rate change notifications during a reparent operation.

Quoted 6 lines

---
This should probably be considered an RFC. There may be smarter ways to resolve this issue. E.g. forward notifier counts upstream the way it is done with enable counts.

Hi Soren,

Thanks for the fix. Some of the core code has changed enough lately that it is worth going through and consolidating/cleaning up. For instance another nice optimization that is related might be something like:

drivers/clk/clk.c +3 -0
index 20ce67f..15e8b41 100644
@@ -1028,6 +1028,9 @@ static int __clk_speculate_rates(struct clk *clk, unsigned long parent_rate)
 	else
 		new_rate = parent_rate;
 
+	if (new_rate == clk->rate)
+		return ret;
+
 	/* abort rate change if a driver returns NOTIFY_BAD or NOTIFY_STOP */
 	if (clk->notifier_count)
 		ret = __clk_notify(clk, PRE_RATE_CHANGE, clk->rate, new_rate);

However it remains to be seen whether any drivers rely on PRE_RATE_CHANGE notifiers even if the clock rate stays the same.

I don't think I'll take your patch for 3.10 since no one has reported a bug with it yet, but I'll roll it into a larger cleanup series after the merge window.

Thanks,
Mike

Quoted 22 lines

S?ren

 drivers/clk/clk.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/clk.c +1 -2
index 20ce67f..1179cb5 100644
@@ -1481,8 +1481,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
        }
 
        /* propagate PRE_RATE_CHANGE notifications */
-       if (clk->notifier_count)
-               ret = __clk_speculate_rates(clk, p_rate);
+       ret = __clk_speculate_rates(clk, p_rate);
 
        /* abort if a driver objects */
        if (ret & NOTIFY_STOP_MASK)
Signature · 1 line
1.8.2.1
#2 lore raw

Hi Mike,

Quoted 43 lines · Mike Turquette

Quoting Soren Brinkmann (2013-04-16 10:06:50)

Quoted 11 lines

A clock's notifier count only reflects notifiers which are registered directly for that clock. A reparent operation though affects the whole subtree because of a potential rate change.
When issuing the pre rate change notifications only the notifier count for the clock to be changed is considered and notifiers for subclocks may never be called. Resulting in clocks in the subtree which have registered notifiers, may receive a POST_- or ABORT_RATE_CHANGE notification, without a PRE_RATE_CHANGE_NOTIFICATION. Therefore always traverse the whole subtree when issueing pre rate change notifications during a reparent operation.

Quoted 6 lines

---
This should probably be considered an RFC. There may be smarter ways to resolve this issue. E.g. forward notifier counts upstream the way it is done with enable counts.

Hi Soren,

Thanks for the fix. Some of the core code has changed enough lately that it is worth going through and consolidating/cleaning up. For instance another nice optimization that is related might be something like:

drivers/clk/clk.c +3 -0
index 20ce67f..15e8b41 100644
@@ -1028,6 +1028,9 @@ static int __clk_speculate_rates(struct clk *clk, unsigned long parent_rate)
 	else
 		new_rate = parent_rate;
 
+	if (new_rate == clk->rate)
+		return ret;
+
 	/* abort rate change if a driver returns NOTIFY_BAD or NOTIFY_STOP */
 	if (clk->notifier_count)
 		ret = __clk_notify(clk, PRE_RATE_CHANGE, clk->rate, new_rate);
Quoted 2 lines

However it remains to be seen whether any drivers rely on PRE_RATE_CHANGE notifiers even if the clock rate stays the same.

Even if it changes the pre-rate change notifier is not issued.

Quoted 3 lines

I don't think I'll take your patch for 3.10 since no one has reported a bug with it yet, but I'll roll it into a larger cleanup series after the merge window.

That's fine. I'm still revising Zynq's clock code and w/o this patch my UART breaks since I don't receive a pre-rate-change notification when its input frequency changes due to reparenting of clocks further up in the hierarchy.

S?ren

#3 lore raw

PATCH 1/1 clk: Always notify whole subtree when reparenting

In reply to Soren Brinkmann

Quoting Soren Brinkmann (2013-04-16 10:06:50)

Quoted 11 lines

A clock's notifier count only reflects notifiers which are registered directly for that clock. A reparent operation though affects the whole subtree because of a potential rate change.
When issuing the pre rate change notifications only the notifier count for the clock to be changed is considered and notifiers for subclocks may never be called. Resulting in clocks in the subtree which have registered notifiers, may receive a POST_- or ABORT_RATE_CHANGE notification, without a PRE_RATE_CHANGE_NOTIFICATION. Therefore always traverse the whole subtree when issueing pre rate change notifications during a reparent operation.

Quoted 6 lines

---
This should probably be considered an RFC. There may be smarter ways to resolve this issue. E.g. forward notifier counts upstream the way it is done with enable counts.

I've taken this patch for 3.11.

Thanks,
Mike

Quoted 22 lines

S?ren

 drivers/clk/clk.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/clk.c +1 -2
index 20ce67f..1179cb5 100644
@@ -1481,8 +1481,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
        }
 
        /* propagate PRE_RATE_CHANGE notifications */
-       if (clk->notifier_count)
-               ret = __clk_speculate_rates(clk, p_rate);
+       ret = __clk_speculate_rates(clk, p_rate);
 
        /* abort if a driver objects */
        if (ret & NOTIFY_STOP_MASK)
Signature · 1 line
1.8.2.1
#4 lore raw
Quoted 12 lines · Mike Turquette

Quoting Soren Brinkmann (2013-04-16 10:06:50)

Quoted 11 lines

A clock's notifier count only reflects notifiers which are registered directly for that clock. A reparent operation though affects the whole subtree because of a potential rate change.
When issuing the pre rate change notifications only the notifier count for the clock to be changed is considered and notifiers for subclocks may never be called. Resulting in clocks in the subtree which have registered notifiers, may receive a POST_- or ABORT_RATE_CHANGE notification, without a PRE_RATE_CHANGE_NOTIFICATION. Therefore always traverse the whole subtree when issueing pre rate change notifications during a reparent operation.

Quoted 8 lines
Quoted 6 lines

---
This should probably be considered an RFC. There may be smarter ways to resolve this issue. E.g. forward notifier counts upstream the way it is done with enable counts.

I've taken this patch for 3.11.

thank you.

S?ren