2022-02-09 09:15:50

by Krzysztof Kozlowski

Subject: [PATCH] ARM: socfpga: fix missing RESET_CONTROLLER

The SocFPGA machine since commit b3ca9888f35f ("reset: socfpga: add an
early reset driver for SoCFPGA") uses reset controller, so it should
select RESET_CONTROLLER explicitly. Selecting ARCH_HAS_RESET_CONTROLLER
is not enough because it affects only default choice still allowing a
non-buildable configuration:

/usr/bin/arm-linux-gnueabi-ld: arch/arm/mach-socfpga/socfpga.o: in function `socfpga_init_irq':
arch/arm/mach-socfpga/socfpga.c:56: undefined reference to `socfpga_reset_init'

Reported-by: kernel test robot <[email protected]>
Cc: <[email protected]>
Fixes: b3ca9888f35f ("reset: socfpga: add an early reset driver for SoCFPGA")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/mach-socfpga/Kconfig | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 43ddec677c0b..594edf9bbea4 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -2,6 +2,7 @@
menuconfig ARCH_INTEL_SOCFPGA
bool "Altera SOCFPGA family"
depends on ARCH_MULTI_V7
+ select ARCH_HAS_RESET_CONTROLLER
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
select ARM_GIC
@@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA
select PL310_ERRATA_727915
select PL310_ERRATA_753970 if PL310
select PL310_ERRATA_769419
+ select RESET_CONTROLLER

if ARCH_INTEL_SOCFPGA
config SOCFPGA_SUSPEND
--
2.32.0

2022-02-09 12:07:51

by Dinh Nguyen

Subject: Re: [PATCH] ARM: socfpga: fix missing RESET_CONTROLLER

On 2/7/22 02:44, Krzysztof Kozlowski wrote:
> The SocFPGA machine since commit b3ca9888f35f ("reset: socfpga: add an
> early reset driver for SoCFPGA") uses reset controller, so it should
> select RESET_CONTROLLER explicitly. Selecting ARCH_HAS_RESET_CONTROLLER
> is not enough because it affects only default choice still allowing a
> non-buildable configuration:
>
> /usr/bin/arm-linux-gnueabi-ld: arch/arm/mach-socfpga/socfpga.o: in function `socfpga_init_irq':
> arch/arm/mach-socfpga/socfpga.c:56: undefined reference to `socfpga_reset_init'
>
> Reported-by: kernel test robot <[email protected]>
> Cc: <[email protected]>
> Fixes: b3ca9888f35f ("reset: socfpga: add an early reset driver for SoCFPGA")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/mach-socfpga/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
> index 43ddec677c0b..594edf9bbea4 100644
> --- a/arch/arm/mach-socfpga/Kconfig
> +++ b/arch/arm/mach-socfpga/Kconfig
> @@ -2,6 +2,7 @@
> menuconfig ARCH_INTEL_SOCFPGA
> bool "Altera SOCFPGA family"
> depends on ARCH_MULTI_V7
> + select ARCH_HAS_RESET_CONTROLLER
> select ARCH_SUPPORTS_BIG_ENDIAN
> select ARM_AMBA
> select ARM_GIC
> @@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA
> select PL310_ERRATA_727915
> select PL310_ERRATA_753970 if PL310
> select PL310_ERRATA_769419
> + select RESET_CONTROLLER
>
> if ARCH_INTEL_SOCFPGA
> config SOCFPGA_SUSPEND

Acked-By: Dinh Nguyen <[email protected]>