Skip to contentSkip to conversation

Patch "clk: at91: fix clk-generated parenting" has been added to the 4.9-stable tree

PATCH [email protected] 3 participants 4 messages Apr 9, 2018 – Apr 10, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

clk: at91: fix clk-generated parenting

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-at91-fix-clk-generated-parenting.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Mon Apr 9 17:09:24 CEST 2018

From: Alexandre Belloni <[email protected]>
Date: Fri, 12 May 2017 16:25:30 +0200
Subject: clk: at91: fix clk-generated parenting

From: Alexandre Belloni <[email protected]>

[ Upstream commit 8e56133e5c7b7a7a97f6a92d92f664d5ecd30745 ]

clk_generated_startup is called after clk_hw_register. So the first call to get_parent will not have the correct value (i.e. 0) and because this is cached, it may never be updated.

Fixes df70aeef6083 ("clk: at91: add generated clock driver")
---
 drivers/clk/at91/clk-generated.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/at91/clk-generated.c +1 -2
@@ -260,13 +260,12 @@ at91_clk_register_generated(struct regma
 	gck->lock = lock;
 	gck->range = *range;
 
+	clk_generated_startup(gck);
 	hw = &gck->hw;
 	ret = clk_hw_register(NULL, &gck->hw);
 	if (ret) {
 		kfree(gck);
 		hw = ERR_PTR(ret);
-	} else
-		clk_generated_startup(gck);
 
 	return hw;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/clk-at91-fix-clk-generated-parenting.patch queue-4.9/rtc-interface-validate-alarm-time-before-handling-rollover.patch queue-4.9/rtc-m41t80-fix-sqw-dividers-override-when-setting-a-date.patch queue-4.9/rtc-snvs-fix-an-incorrect-check-of-return-value.patch queue-4.9/rtc-opal-handle-disabled-tpo-in-opal_get_tpo_time.patch

#1 lore raw
Quoted 8 lines · On 10 April 2018 at 01:27, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

clk: at91: fix clk-generated parenting

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 7 lines

The filename of the patch is:
clk-at91-fix-clk-generated-parenting.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

This patch broke ARM builds at kernelci
https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.93-278-g1614c07609f0/

Regards,
Amit Pundir

Quoted 50 lines

From foo@baz Mon Apr 9 17:09:24 CEST 2018
From: Alexandre Belloni <[email protected]>
Date: Fri, 12 May 2017 16:25:30 +0200
Subject: clk: at91: fix clk-generated parenting

From: Alexandre Belloni <[email protected]>

[ Upstream commit 8e56133e5c7b7a7a97f6a92d92f664d5ecd30745 ]

clk_generated_startup is called after clk_hw_register. So the first call to get_parent will not have the correct value (i.e. 0) and because this is cached, it may never be updated.

Fixes df70aeef6083 ("clk: at91: add generated clock driver")
---
 drivers/clk/at91/clk-generated.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/at91/clk-generated.c +1 -2
@@ -260,13 +260,12 @@ at91_clk_register_generated(struct regma
        gck->lock = lock;
        gck->range = *range;
 
+       clk_generated_startup(gck);
        hw = &gck->hw;
        ret = clk_hw_register(NULL, &gck->hw);
        if (ret) {
                kfree(gck);
                hw = ERR_PTR(ret);
-       } else
-               clk_generated_startup(gck);
 
        return hw;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/clk-at91-fix-clk-generated-parenting.patch queue-4.9/rtc-interface-validate-alarm-time-before-handling-rollover.patch queue-4.9/rtc-m41t80-fix-sqw-dividers-override-when-setting-a-date.patch queue-4.9/rtc-snvs-fix-an-incorrect-check-of-return-value.patch queue-4.9/rtc-opal-handle-disabled-tpo-in-opal_get_tpo_time.patch

#2 lore raw
Quoted 13 lines · Amit Pundir
Quoted 12 lines · On 10 April 2018 at 01:27, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

clk: at91: fix clk-generated parenting

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-at91-fix-clk-generated-parenting.patch
and it can be found in the queue-4.9 subdirectory.

Quoted 7 lines
Quoted 3 lines

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

This patch broke ARM builds at kernelci
https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.93-278-g1614c07609f0/

I guess this also need 4a5f06a01cfd1f7a9141bdb760bf5b68cca7f224

Signature · 3 lines
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author maintainer
#3 lore raw
Quoted 18 lines · Alexandre Belloni
Quoted 17 lines · Amit Pundir
Quoted 15 lines · On 10 April 2018 at 01:27, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

clk: at91: fix clk-generated parenting

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-at91-fix-clk-generated-parenting.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 5 lines
Quoted 3 lines

This patch broke ARM builds at kernelci
https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.93-278-g1614c07609f0/

I guess this also need 4a5f06a01cfd1f7a9141bdb760bf5b68cca7f224

thanks, now added.

greg k-h