drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Subsystems (2)
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
ARM64 CPUidle driver requires the cpu_do_idle function so that it can be used to enter the shallowest idle state, and it is declared in asm/proc-fns.h.
The current ARM64 CPUidle driver does not include asm/proc-fns.h explicitly and it has so far relied on implicit inclusion from other header files.
Owing to some header dependencies reshuffling this currently triggers build failures when CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state" drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]
cpu_do_idle();
^
This patch adds the explicit inclusion of the asm/proc-fns.h header file to fix the build breakage and stop relying on implicit asm/proc-fns.h inclusion.
---
v2 changes:
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit log
drivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpuidle/cpuidle-arm64.c +1 -0
@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h"
Signature · 1 line
2.2.1
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 21 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.
Quoted 6 lines
Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:
Catalin will pick this up for -rc2, I suspect.
Will
Quoted 23 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit logdrivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +1
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h" Signature · 1 line
2.2.1
Catalin Marinas
maintainerPATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 29 lines · Will Deacon
Quoted 21 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Quoted 6 lines
Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
Quoted 19 lines
Quoted 19 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit logdrivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +1
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h"
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:
Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am, thanks!
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit logdrivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +1
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h"
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
In reply to Catalin MarinasQuoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:
Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if asm/proc-fns.h shouldn't be directly included in asm/cpuidle.h, otherwise each time cpuidle.h is included somewhere we have to include proc-fns.h also.
It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put proc-fns.h inclusion directly in asm/cpuidle.h and cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in the cpuidle.h directly, no ?
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit logdrivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +1
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h"
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 41 lines · Daniel Lezcano
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if
asm/proc-fns.hshouldn't be directly included inasm/cpuidle.h, otherwise each timecpuidle.his included somewhere we have to includeproc-fns.halso.
Quoted 5 lines
It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put
proc-fns.hinclusion directly inasm/cpuidle.hand cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in thecpuidle.hdirectly, no ?
This patch is a build fix, and I'd rather get it in asap. We can move the inclusion and merge the resulting clean-up patch in your series later. I will put together the patch now, if Catalin has the pull request ready to be sent I do not see the point in delaying it though.
Lorenzo
Quoted 29 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html
- Rebased against 4.0-rc1 and rewrote commit logdrivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +1
-0@@ -19,6 +19,7 @@#include <linux/of.h> #include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h" Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 48 lines · Lorenzo Pieralisi
Quoted 41 lines · Daniel Lezcano
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if
asm/proc-fns.hshouldn't be directly included inasm/cpuidle.h, otherwise each timecpuidle.his included somewhere we have to includeproc-fns.halso.Quoted 5 lines
It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put
proc-fns.hinclusion directly inasm/cpuidle.hand cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in thecpuidle.hdirectly, no ?
Quoted 4 lines
This patch is a build fix, and I'd rather get it in asap. We can move the inclusion and merge the resulting clean-up patch in your series later. I will put together the patch now, if Catalin has the pull request ready to be sent I do not see the point in delaying it though.
I was just suggesting to put the proc-fns.h inclusion in cpuidle.h directly. That fixes the build also.
Quoted 29 lines
Quoted 29 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
- Picked up
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325523.html- Rebased against 4.0-rc1 and rewrote commit log
drivers/cpuidle/cpuidle-arm64.c | 1 + 1 file changed, 1 insertion(+)drivers/cpuidle/cpuidle-arm64.c +0
-0@@ -19,6 +19,7 @@#include <linux/of.h> Quoted 5 lines
Quoted 5 lines
drivers/cpuidle/cpuidle-arm64.c line 25
Quoted 5 lines
drivers/cpuidle/cpuidle-arm64.c +1
-0#include <asm/cpuidle.h> +#include <asm/proc-fns.h> #include "dt_idle_states.h" --
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCsFollow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Catalin Marinas
maintainerPATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 49 lines · Daniel Lezcano
Quoted 48 lines · Lorenzo Pieralisi
Quoted 46 lines · Daniel Lezcano
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if
asm/proc-fns.hshouldn't be directly included inasm/cpuidle.h, otherwise each timecpuidle.his included somewhere we have to includeproc-fns.halso.It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put
proc-fns.hinclusion directly inasm/cpuidle.hand cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in thecpuidle.hdirectly, no ?
Quoted 7 lines
Quoted 4 lines
This patch is a build fix, and I'd rather get it in asap. We can move the inclusion and merge the resulting clean-up patch in your series later. I will put together the patch now, if Catalin has the pull request ready to be sent I do not see the point in delaying it though.
I was just suggesting to put the
proc-fns.hinclusion incpuidle.hdirectly. That fixes the build also.
This would do as well, especially since you plan to clean up arch/arm as well (or just move the cpu_do_idle() prototype in asm/cpuidle.h; we moved cpu_suspend() there already).
Signature · 1 line
Catalin
PATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 55 lines · Catalin Marinas
Quoted 54 lines · Daniel Lezcano
Quoted 52 lines · Lorenzo Pieralisi
Quoted 41 lines · Daniel Lezcano
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if
asm/proc-fns.hshouldn't be directly included inasm/cpuidle.h, otherwise each timecpuidle.his included somewhere we have to includeproc-fns.halso.Quoted 5 lines
It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put
proc-fns.hinclusion directly inasm/cpuidle.hand cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in thecpuidle.hdirectly, no ?This patch is a build fix, and I'd rather get it in asap. We can move the inclusion and merge the resulting clean-up patch in your series later. I will put together the patch now, if Catalin has the pull request ready to be sent I do not see the point in delaying it though.
Quoted 6 lines
Quoted 2 lines
I was just suggesting to put the
proc-fns.hinclusion incpuidle.hdirectly. That fixes the build also.This would do as well, especially since you plan to clean up
arch/armas well (or just move thecpu_do_idle()prototype inasm/cpuidle.h; we movedcpu_suspend()there already).
What I wanted to say is that the clean-up will be merged the coming cycle anyway, not now, so I wanted to avoid delaying the pull request for something that could have been done later.
Reworked patch below (I kept the tags to avoid even more churn for a one-liner).
Thanks,
Lorenzo
-- >8 --
Subject: [PATCH] ARM64: cpuidle: add asm/proc-fns.h inclusion
ARM64 CPUidle driver requires the cpu_do_idle function so that it can be used to enter the shallowest idle state, and it is declared in asm/proc-fns.h.
The current ARM64 CPUidle driver does not include asm/proc-fns.h explicitly and it has so far relied on implicit inclusion from other header files.
Owing to some header dependencies reshuffling this currently triggers build failures when CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state" drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]
cpu_do_idle();
^
This patch adds the explicit inclusion of the asm/proc-fns.h header file in the arm64 asm/cpuidle.h header file, so that the build breakage is fixed and the required header inclusion is added to the appropriate arch back-end CPUidle header, already included by the CPUidle arm64 driver, where CPUidle arch related function declarations belong.
--- arch/arm64/include/asm/cpuidle.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/include/asm/cpuidle.h +2 -0
@@ -1,6 +1,8 @@#ifndef __ASM_CPUIDLE_H#define __ASM_CPUIDLE_H +#include <asm/proc-fns.h> +#ifdef CONFIG_CPU_IDLE extern int cpu_init_idle (unsigned int cpu);extern int cpu_suspend (unsigned long arg);
Signature · 1 line
1.9.1
Catalin Marinas
maintainerPATCH v2 1/1 drivers: cpuidle: cpuidle-arm64: include asm/proc-fns.h explicitly
Quoted 59 lines · Lorenzo Pieralisi
Quoted 58 lines · Catalin Marinas
Quoted 56 lines · Daniel Lezcano
Quoted 48 lines · Lorenzo Pieralisi
Quoted 41 lines · Daniel Lezcano
Quoted 30 lines · Catalin Marinas
Quoted 29 lines · Will Deacon
Quoted 27 lines · Lorenzo Pieralisi
ARM64 CPUidle driver requires the
cpu_do_idlefunction so that it can be used to enter the shallowest idle state, and it is declared inasm/proc-fns.h.The current ARM64 CPUidle driver does not include
asm/proc-fns.hexplicitly and it has so far relied on implicit inclusion from other header files.Owing to some header dependencies reshuffling this currently triggers build failures when
CONFIG_ARM64_64K_PAGES=y:
drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of function "cpu_do_idle" [-Werror=implicit-function-declaration]cpu_do_idle(); ^This patch adds the explicit inclusion of the
asm/proc-fns.hheader file to fix the build breakage and stop relying on implicitasm/proc-fns.hinclusion.Signed-off-by Laura Abbott <[email protected]>[lp: rewrote commit log]Signed-off-by Lorenzo Pieralisi <[email protected]>Tested-by Mark Rutland <[email protected]>---
v2 changes:Quoted 5 lines
Quoted 3 lines
Acked-by Will Deacon <[email protected]>Catalin will pick this up for -rc2, I suspect.
I can merge this as long as Daniel or Rafael are fine with it.
I am wondering if
asm/proc-fns.hshouldn't be directly included inasm/cpuidle.h, otherwise each timecpuidle.his included somewhere we have to includeproc-fns.halso.Quoted 5 lines
It is not a problem for ARM64 because there is not a big number of cpuidle drivers but for ARM32 it is not the case. I have a patchset which put
proc-fns.hinclusion directly inasm/cpuidle.hand cleanup the drivers. For the sake of consistency between ARM/ARM64 may be it would make sense to include in thecpuidle.hdirectly, no ?Quoted 4 lines
This patch is a build fix, and I'd rather get it in asap. We can move the inclusion and merge the resulting clean-up patch in your series later. I will put together the patch now, if Catalin has the pull request ready to be sent I do not see the point in delaying it though.
I was just suggesting to put the
proc-fns.hinclusion incpuidle.hdirectly. That fixes the build also.
Quoted 7 lines
Quoted 3 lines
This would do as well, especially since you plan to clean up
arch/armas well (or just move thecpu_do_idle()prototype inasm/cpuidle.h; we movedcpu_suspend()there already).What I wanted to say is that the clean-up will be merged the coming cycle anyway, not now, so I wanted to avoid delaying the pull request for something that could have been done later.
Agree, but since the change is small, I'll get your reworked patch which doesn't touch cpuidle-arm64.c
Thanks.
Signature · 1 line
Catalin