arm64: dts: Hi3660: Remove 'CPU_NAP' idle state

Message ID 1515472362-19979-1-git-send-email-leo.yan@linaro.org
State Accepted
Commit 928c4a5ce8684d2c8a37543b3361cfc12d83b167
Headers show
Series
  • arm64: dts: Hi3660: Remove 'CPU_NAP' idle state
Related show

Commit Message

Leo Yan Jan. 9, 2018, 4:32 a.m.
Thanks a lot for Vincent Guittot careful work to find bug for 'CPU_NAP'
idle state.  At early time, the CPU CA73 CPU_NAP idle state has been
supported on Hikey960.  Later we found the system has the hang issue
and for resolving this issue Hisilicon released new MCU firmware, but
unfortunately the new MCU firmware has side effect and results in the
CA73 CPU cannot really enter CPU_NAP state and roll back to WFI state.

After discussion we cannot see the possibility to enable CA73 CPU_NAP
state anymore on Hikey960, based on this conclusion we should remove
this state from DT binding.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Kevin Wang <jean.wangtao@linaro.org>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>

---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 32 ++++---------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Vincent Guittot Jan. 10, 2018, 8:38 a.m. | #1
On 9 January 2018 at 05:32, Leo Yan <leo.yan@linaro.org> wrote:
> Thanks a lot for Vincent Guittot careful work to find bug for 'CPU_NAP'

> idle state.  At early time, the CPU CA73 CPU_NAP idle state has been

> supported on Hikey960.  Later we found the system has the hang issue

> and for resolving this issue Hisilicon released new MCU firmware, but

> unfortunately the new MCU firmware has side effect and results in the

> CA73 CPU cannot really enter CPU_NAP state and roll back to WFI state.

>

> After discussion we cannot see the possibility to enable CA73 CPU_NAP

> state anymore on Hikey960, based on this conclusion we should remove

> this state from DT binding.

>

> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>

> Cc: Kevin Wang <jean.wangtao@linaro.org>

> Cc: Vincent Guittot <vincent.guittot@linaro.org>

> Signed-off-by: Leo Yan <leo.yan@linaro.org>


Tested-by: Vincent Guittot <vincent.guittot@linaro.org>


> ---

>  arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 32 ++++---------------------------

>  1 file changed, 4 insertions(+), 28 deletions(-)

>

> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> index ab0b95b..8fddf0d 100644

> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> @@ -96,11 +96,7 @@

>                         reg = <0x0 0x100>;

>                         enable-method = "psci";

>                         next-level-cache = <&A73_L2>;

> -                       cpu-idle-states = <

> -                                       &CPU_NAP

> -                                       &CPU_SLEEP

> -                                       &CLUSTER_SLEEP_1

> -                       >;

> +                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>                 };

>

>                 cpu5: cpu@101 {

> @@ -109,11 +105,7 @@

>                         reg = <0x0 0x101>;

>                         enable-method = "psci";

>                         next-level-cache = <&A73_L2>;

> -                       cpu-idle-states = <

> -                                       &CPU_NAP

> -                                       &CPU_SLEEP

> -                                       &CLUSTER_SLEEP_1

> -                       >;

> +                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>                 };

>

>                 cpu6: cpu@102 {

> @@ -122,11 +114,7 @@

>                         reg = <0x0 0x102>;

>                         enable-method = "psci";

>                         next-level-cache = <&A73_L2>;

> -                       cpu-idle-states = <

> -                                       &CPU_NAP

> -                                       &CPU_SLEEP

> -                                       &CLUSTER_SLEEP_1

> -                       >;

> +                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>                 };

>

>                 cpu7: cpu@103 {

> @@ -135,24 +123,12 @@

>                         reg = <0x0 0x103>;

>                         enable-method = "psci";

>                         next-level-cache = <&A73_L2>;

> -                       cpu-idle-states = <

> -                                       &CPU_NAP

> -                                       &CPU_SLEEP

> -                                       &CLUSTER_SLEEP_1

> -                       >;

> +                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>                 };

>

>                 idle-states {

>                         entry-method = "psci";

>

> -                       CPU_NAP: cpu-nap {

> -                               compatible = "arm,idle-state";

> -                               arm,psci-suspend-param = <0x0000001>;

> -                               entry-latency-us = <7>;

> -                               exit-latency-us = <2>;

> -                               min-residency-us = <15>;

> -                       };

> -

>                         CPU_SLEEP: cpu-sleep {

>                                 compatible = "arm,idle-state";

>                                 local-timer-stop;

> --

> 2.7.4

>

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leo Yan Feb. 28, 2018, 5:08 a.m. | #2
Hi Wei,

On Tue, Jan 09, 2018 at 12:32:42PM +0800, Leo Yan wrote:
> Thanks a lot for Vincent Guittot careful work to find bug for 'CPU_NAP'

> idle state.  At early time, the CPU CA73 CPU_NAP idle state has been

> supported on Hikey960.  Later we found the system has the hang issue

> and for resolving this issue Hisilicon released new MCU firmware, but

> unfortunately the new MCU firmware has side effect and results in the

> CA73 CPU cannot really enter CPU_NAP state and roll back to WFI state.

> 

> After discussion we cannot see the possibility to enable CA73 CPU_NAP

> state anymore on Hikey960, based on this conclusion we should remove

> this state from DT binding.

> 

> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>

> Cc: Kevin Wang <jean.wangtao@linaro.org>

> Cc: Vincent Guittot <vincent.guittot@linaro.org>

> Signed-off-by: Leo Yan <leo.yan@linaro.org>


Could you help to pick up this patch? Thanks!

> ---

>  arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 32 ++++---------------------------

>  1 file changed, 4 insertions(+), 28 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> index ab0b95b..8fddf0d 100644

> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

> @@ -96,11 +96,7 @@

>  			reg = <0x0 0x100>;

>  			enable-method = "psci";

>  			next-level-cache = <&A73_L2>;

> -			cpu-idle-states = <

> -					&CPU_NAP

> -					&CPU_SLEEP

> -					&CLUSTER_SLEEP_1

> -			>;

> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>  		};

>  

>  		cpu5: cpu@101 {

> @@ -109,11 +105,7 @@

>  			reg = <0x0 0x101>;

>  			enable-method = "psci";

>  			next-level-cache = <&A73_L2>;

> -			cpu-idle-states = <

> -					&CPU_NAP

> -					&CPU_SLEEP

> -					&CLUSTER_SLEEP_1

> -			>;

> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>  		};

>  

>  		cpu6: cpu@102 {

> @@ -122,11 +114,7 @@

>  			reg = <0x0 0x102>;

>  			enable-method = "psci";

>  			next-level-cache = <&A73_L2>;

> -			cpu-idle-states = <

> -					&CPU_NAP

> -					&CPU_SLEEP

> -					&CLUSTER_SLEEP_1

> -			>;

> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>  		};

>  

>  		cpu7: cpu@103 {

> @@ -135,24 +123,12 @@

>  			reg = <0x0 0x103>;

>  			enable-method = "psci";

>  			next-level-cache = <&A73_L2>;

> -			cpu-idle-states = <

> -					&CPU_NAP

> -					&CPU_SLEEP

> -					&CLUSTER_SLEEP_1

> -			>;

> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>  		};

>  

>  		idle-states {

>  			entry-method = "psci";

>  

> -			CPU_NAP: cpu-nap {

> -				compatible = "arm,idle-state";

> -				arm,psci-suspend-param = <0x0000001>;

> -				entry-latency-us = <7>;

> -				exit-latency-us = <2>;

> -				min-residency-us = <15>;

> -			};

> -

>  			CPU_SLEEP: cpu-sleep {

>  				compatible = "arm,idle-state";

>  				local-timer-stop;

> -- 

> 2.7.4

> 

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wei Xu March 2, 2018, 3:57 p.m. | #3
Hi Leo,

On 2018/2/28 5:08, Leo Yan wrote:
> Hi Wei,

> 

> On Tue, Jan 09, 2018 at 12:32:42PM +0800, Leo Yan wrote:

>> Thanks a lot for Vincent Guittot careful work to find bug for 'CPU_NAP'

>> idle state.  At early time, the CPU CA73 CPU_NAP idle state has been

>> supported on Hikey960.  Later we found the system has the hang issue

>> and for resolving this issue Hisilicon released new MCU firmware, but

>> unfortunately the new MCU firmware has side effect and results in the

>> CA73 CPU cannot really enter CPU_NAP state and roll back to WFI state.

>>

>> After discussion we cannot see the possibility to enable CA73 CPU_NAP

>> state anymore on Hikey960, based on this conclusion we should remove

>> this state from DT binding.

>>

>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>

>> Cc: Kevin Wang <jean.wangtao@linaro.org>

>> Cc: Vincent Guittot <vincent.guittot@linaro.org>

>> Signed-off-by: Leo Yan <leo.yan@linaro.org>

> 

> Could you help to pick up this patch? Thanks!


Applied into hisilicon dt tree.
Thanks!

Best Regards,
Wei

> 

>> ---

>>  arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 32 ++++---------------------------

>>  1 file changed, 4 insertions(+), 28 deletions(-)

>>

>> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

>> index ab0b95b..8fddf0d 100644

>> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

>> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi

>> @@ -96,11 +96,7 @@

>>  			reg = <0x0 0x100>;

>>  			enable-method = "psci";

>>  			next-level-cache = <&A73_L2>;

>> -			cpu-idle-states = <

>> -					&CPU_NAP

>> -					&CPU_SLEEP

>> -					&CLUSTER_SLEEP_1

>> -			>;

>> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>>  		};

>>  

>>  		cpu5: cpu@101 {

>> @@ -109,11 +105,7 @@

>>  			reg = <0x0 0x101>;

>>  			enable-method = "psci";

>>  			next-level-cache = <&A73_L2>;

>> -			cpu-idle-states = <

>> -					&CPU_NAP

>> -					&CPU_SLEEP

>> -					&CLUSTER_SLEEP_1

>> -			>;

>> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>>  		};

>>  

>>  		cpu6: cpu@102 {

>> @@ -122,11 +114,7 @@

>>  			reg = <0x0 0x102>;

>>  			enable-method = "psci";

>>  			next-level-cache = <&A73_L2>;

>> -			cpu-idle-states = <

>> -					&CPU_NAP

>> -					&CPU_SLEEP

>> -					&CLUSTER_SLEEP_1

>> -			>;

>> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>>  		};

>>  

>>  		cpu7: cpu@103 {

>> @@ -135,24 +123,12 @@

>>  			reg = <0x0 0x103>;

>>  			enable-method = "psci";

>>  			next-level-cache = <&A73_L2>;

>> -			cpu-idle-states = <

>> -					&CPU_NAP

>> -					&CPU_SLEEP

>> -					&CLUSTER_SLEEP_1

>> -			>;

>> +			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;

>>  		};

>>  

>>  		idle-states {

>>  			entry-method = "psci";

>>  

>> -			CPU_NAP: cpu-nap {

>> -				compatible = "arm,idle-state";

>> -				arm,psci-suspend-param = <0x0000001>;

>> -				entry-latency-us = <7>;

>> -				exit-latency-us = <2>;

>> -				min-residency-us = <15>;

>> -			};

>> -

>>  			CPU_SLEEP: cpu-sleep {

>>  				compatible = "arm,idle-state";

>>  				local-timer-stop;

>> -- 

>> 2.7.4

>>

> 

> .

> 


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index ab0b95b..8fddf0d 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -96,11 +96,7 @@ 
 			reg = <0x0 0x100>;
 			enable-method = "psci";
 			next-level-cache = <&A73_L2>;
-			cpu-idle-states = <
-					&CPU_NAP
-					&CPU_SLEEP
-					&CLUSTER_SLEEP_1
-			>;
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
 		};
 
 		cpu5: cpu@101 {
@@ -109,11 +105,7 @@ 
 			reg = <0x0 0x101>;
 			enable-method = "psci";
 			next-level-cache = <&A73_L2>;
-			cpu-idle-states = <
-					&CPU_NAP
-					&CPU_SLEEP
-					&CLUSTER_SLEEP_1
-			>;
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
 		};
 
 		cpu6: cpu@102 {
@@ -122,11 +114,7 @@ 
 			reg = <0x0 0x102>;
 			enable-method = "psci";
 			next-level-cache = <&A73_L2>;
-			cpu-idle-states = <
-					&CPU_NAP
-					&CPU_SLEEP
-					&CLUSTER_SLEEP_1
-			>;
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
 		};
 
 		cpu7: cpu@103 {
@@ -135,24 +123,12 @@ 
 			reg = <0x0 0x103>;
 			enable-method = "psci";
 			next-level-cache = <&A73_L2>;
-			cpu-idle-states = <
-					&CPU_NAP
-					&CPU_SLEEP
-					&CLUSTER_SLEEP_1
-			>;
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
 		};
 
 		idle-states {
 			entry-method = "psci";
 
-			CPU_NAP: cpu-nap {
-				compatible = "arm,idle-state";
-				arm,psci-suspend-param = <0x0000001>;
-				entry-latency-us = <7>;
-				exit-latency-us = <2>;
-				min-residency-us = <15>;
-			};
-
 			CPU_SLEEP: cpu-sleep {
 				compatible = "arm,idle-state";
 				local-timer-stop;