diff mbox series

soc: imx8m: Increase the clock enable before reading the register

Message ID 20221028041418.4033261-1-xiaolei.wang@windriver.com
State New
Headers
Series soc: imx8m: Increase the clock enable before reading the register |

Commit Message

xiaolei wang Oct. 28, 2022, 4:14 a.m. UTC 
  When executing kdump to start the second kernel,
since IMX-OCOTP has turned off the clock, the clock
needs to be re-enabled, otherwise the system will hang.

Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
---
 drivers/soc/imx/soc-imx8m.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Shawn Guo Nov. 11, 2022, 2:46 a.m. UTC | #1 
On Fri, Oct 28, 2022 at 12:14:18PM +0800, Xiaolei Wang wrote:
> When executing kdump to start the second kernel,
> since IMX-OCOTP has turned off the clock, the clock
> needs to be re-enabled, otherwise the system will hang.
> 
> Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")

Are you saying this fixes a regression caused by ac34de14ac30?

Shawn

> Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
> ---
>  drivers/soc/imx/soc-imx8m.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
> index cc57a384d74d..28144c699b0c 100644
> --- a/drivers/soc/imx/soc-imx8m.c
> +++ b/drivers/soc/imx/soc-imx8m.c
> @@ -11,6 +11,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/arm-smccc.h>
>  #include <linux/of.h>
> +#include <linux/clk.h>
>  
>  #define REV_B1				0x21
>  
> @@ -56,6 +57,7 @@ static u32 __init imx8mq_soc_revision(void)
>  	void __iomem *ocotp_base;
>  	u32 magic;
>  	u32 rev;
> +	struct clk *clk;
>  
>  	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mq-ocotp");
>  	if (!np)
> @@ -63,6 +65,13 @@ static u32 __init imx8mq_soc_revision(void)
>  
>  	ocotp_base = of_iomap(np, 0);
>  	WARN_ON(!ocotp_base);
> +	clk = of_clk_get_by_name(np, NULL);
> +	if (!clk) {
> +		WARN_ON(!clk);
> +		return 0;
> +	}
> +
> +	clk_prepare_enable(clk);
>  
>  	/*
>  	 * SOC revision on older imx8mq is not available in fuses so query
> @@ -79,6 +88,8 @@ static u32 __init imx8mq_soc_revision(void)
>  	soc_uid <<= 32;
>  	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
>  
> +	clk_disable_unprepare(clk);
> +	clk_put(clk);
>  	iounmap(ocotp_base);
>  	of_node_put(np);
>  
> -- 
> 2.25.1
>
xiaolei wang Nov. 11, 2022, 3:01 a.m. UTC | #2 
On 11/11/2022 10:46 AM, Shawn Guo wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Fri, Oct 28, 2022 at 12:14:18PM +0800, Xiaolei Wang wrote:
>> When executing kdump to start the second kernel,
>> since IMX-OCOTP has turned off the clock, the clock
>> needs to be re-enabled, otherwise the system will hang.
>>
>> Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
> Are you saying this fixes a regression caused by ac34de14ac30?


Yes,

Although there is a problem with commit 7d981405d0fd, it also solves the 
kexec kernel hang, commit 7d981405d0fd is reverted, and the kexec kernel 
hang will also be introduced, so the clock needs to be enabled when the 
kexec kernel starts.


thanks

xiaolei

>
> Shawn
>
>> Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
>> ---
>>   drivers/soc/imx/soc-imx8m.c | 11 +++++++++++
>>   1 file changed, 11 insertions(+)
>>
>> diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
>> index cc57a384d74d..28144c699b0c 100644
>> --- a/drivers/soc/imx/soc-imx8m.c
>> +++ b/drivers/soc/imx/soc-imx8m.c
>> @@ -11,6 +11,7 @@
>>   #include <linux/platform_device.h>
>>   #include <linux/arm-smccc.h>
>>   #include <linux/of.h>
>> +#include <linux/clk.h>
>>
>>   #define REV_B1                               0x21
>>
>> @@ -56,6 +57,7 @@ static u32 __init imx8mq_soc_revision(void)
>>        void __iomem *ocotp_base;
>>        u32 magic;
>>        u32 rev;
>> +     struct clk *clk;
>>
>>        np = of_find_compatible_node(NULL, NULL, "fsl,imx8mq-ocotp");
>>        if (!np)
>> @@ -63,6 +65,13 @@ static u32 __init imx8mq_soc_revision(void)
>>
>>        ocotp_base = of_iomap(np, 0);
>>        WARN_ON(!ocotp_base);
>> +     clk = of_clk_get_by_name(np, NULL);
>> +     if (!clk) {
>> +             WARN_ON(!clk);
>> +             return 0;
>> +     }
>> +
>> +     clk_prepare_enable(clk);
>>
>>        /*
>>         * SOC revision on older imx8mq is not available in fuses so query
>> @@ -79,6 +88,8 @@ static u32 __init imx8mq_soc_revision(void)
>>        soc_uid <<= 32;
>>        soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
>>
>> +     clk_disable_unprepare(clk);
>> +     clk_put(clk);
>>        iounmap(ocotp_base);
>>        of_node_put(np);
>>
>> --
>> 2.25.1
>>
Shawn Guo Nov. 11, 2022, 3:53 a.m. UTC | #3 
On Fri, Nov 11, 2022 at 11:01:15AM +0800, Wang, Xiaolei wrote:
> 
> On 11/11/2022 10:46 AM, Shawn Guo wrote:
> > CAUTION: This email comes from a non Wind River email account!
> > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> > 
> > On Fri, Oct 28, 2022 at 12:14:18PM +0800, Xiaolei Wang wrote:
> > > When executing kdump to start the second kernel,
> > > since IMX-OCOTP has turned off the clock, the clock
> > > needs to be re-enabled, otherwise the system will hang.
> > > 
> > > Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
> > Are you saying this fixes a regression caused by ac34de14ac30?
> 
> 
> Yes,
> 
> Although there is a problem with commit 7d981405d0fd, it also solves the
> kexec kernel hang, commit 7d981405d0fd is reverted, and the kexec kernel
> hang will also be introduced, so the clock needs to be enabled when the
> kexec kernel starts.

Ok.

Lucas,

Any comments here?

Shawn
Lucas Stach Nov. 11, 2022, 9:05 a.m. UTC | #4 
Am Freitag, dem 11.11.2022 um 11:53 +0800 schrieb Shawn Guo:
> On Fri, Nov 11, 2022 at 11:01:15AM +0800, Wang, Xiaolei wrote:
> > 
> > On 11/11/2022 10:46 AM, Shawn Guo wrote:
> > > CAUTION: This email comes from a non Wind River email account!
> > > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> > > 
> > > On Fri, Oct 28, 2022 at 12:14:18PM +0800, Xiaolei Wang wrote:
> > > > When executing kdump to start the second kernel,
> > > > since IMX-OCOTP has turned off the clock, the clock
> > > > needs to be re-enabled, otherwise the system will hang.
> > > > 
> > > > Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
> > > Are you saying this fixes a regression caused by ac34de14ac30?
> > 
> > 
> > Yes,
> > 
> > Although there is a problem with commit 7d981405d0fd, it also solves the
> > kexec kernel hang, commit 7d981405d0fd is reverted, and the kexec kernel
> > hang will also be introduced, so the clock needs to be enabled when the
> > kexec kernel starts.
> 
> Ok.
> 
> Lucas,
> 
> Any comments here?

Yea, the explanation with kdump in the commit message is a tad too
specific I think. The simple fact is: OCOTP register access needs the
OCOTP clock to be running and this code peeks into this register
region, so it needs to ensure the clock is active.

Other than this minor issue with the commit message, the change itself
looks fine:
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

Regards,
Lucas
Shawn Guo Nov. 14, 2022, 8:20 a.m. UTC | #5 
On Fri, Nov 11, 2022 at 10:05:21AM +0100, Lucas Stach wrote:
> Am Freitag, dem 11.11.2022 um 11:53 +0800 schrieb Shawn Guo:
> > On Fri, Nov 11, 2022 at 11:01:15AM +0800, Wang, Xiaolei wrote:
> > > 
> > > On 11/11/2022 10:46 AM, Shawn Guo wrote:
> > > > CAUTION: This email comes from a non Wind River email account!
> > > > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> > > > 
> > > > On Fri, Oct 28, 2022 at 12:14:18PM +0800, Xiaolei Wang wrote:
> > > > > When executing kdump to start the second kernel,
> > > > > since IMX-OCOTP has turned off the clock, the clock
> > > > > needs to be re-enabled, otherwise the system will hang.
> > > > > 
> > > > > Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
> > > > Are you saying this fixes a regression caused by ac34de14ac30?
> > > 
> > > 
> > > Yes,
> > > 
> > > Although there is a problem with commit 7d981405d0fd, it also solves the
> > > kexec kernel hang, commit 7d981405d0fd is reverted, and the kexec kernel
> > > hang will also be introduced, so the clock needs to be enabled when the
> > > kexec kernel starts.
> > 
> > Ok.
> > 
> > Lucas,
> > 
> > Any comments here?
> 
> Yea, the explanation with kdump in the commit message is a tad too
> specific I think. The simple fact is: OCOTP register access needs the
> OCOTP clock to be running and this code peeks into this register
> region, so it needs to ensure the clock is active.
> 
> Other than this minor issue with the commit message, the change itself
> looks fine:
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

Thanks for the review and comment, Lucas!  I reworded the subject and
commit log a bit like below, and applied the patch, thanks!

---8<------
soc: imx8m: Enable OCOTP clock before reading the register

Commit 7d981405d0fd ("soc: imx8m: change to use platform driver") ever
removed the dependency on bootloader for enabling OCOTP clock.  It
helped to fix a kexec kernel hang issue.  But unfortunately it caused
a regression on CAAM driver and got reverted.

This is the second try to enable the OCOTP clock by directly calling
clock API instead of indirectly enabling the clock via nvmem API.

Fixes: ac34de14ac30 ("Revert "soc: imx8m: change to use platform driver"")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
diff mbox series

Patch

diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
index cc57a384d74d..28144c699b0c 100644
--- a/drivers/soc/imx/soc-imx8m.c
+++ b/drivers/soc/imx/soc-imx8m.c
@@ -11,6 +11,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/arm-smccc.h>
 #include <linux/of.h>
+#include <linux/clk.h>
 
 #define REV_B1				0x21
 
@@ -56,6 +57,7 @@  static u32 __init imx8mq_soc_revision(void)
 	void __iomem *ocotp_base;
 	u32 magic;
 	u32 rev;
+	struct clk *clk;
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mq-ocotp");
 	if (!np)
@@ -63,6 +65,13 @@  static u32 __init imx8mq_soc_revision(void)
 
 	ocotp_base = of_iomap(np, 0);
 	WARN_ON(!ocotp_base);
+	clk = of_clk_get_by_name(np, NULL);
+	if (!clk) {
+		WARN_ON(!clk);
+		return 0;
+	}
+
+	clk_prepare_enable(clk);
 
 	/*
 	 * SOC revision on older imx8mq is not available in fuses so query
@@ -79,6 +88,8 @@  static u32 __init imx8mq_soc_revision(void)
 	soc_uid <<= 32;
 	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
 
+	clk_disable_unprepare(clk);
+	clk_put(clk);
 	iounmap(ocotp_base);
 	of_node_put(np);