clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER

Commit Message

Nathan Chancellor July 1, 2020, 8:11 p.m. UTC

When building arm32 allmodconfig:

ld.lld: error: undefined symbol: ap_cp_unique_name
>>> referenced by ap-cpu-clk.c
>>>               clk/mvebu/ap-cpu-clk.o:(ap_cpu_clock_probe) in archive drivers/built-in.a

ap_cp_unique_name is only compiled into the kernel image when
CONFIG_ARMADA_AP_CP_HELPER is selected (as it is not user selectable).
However, CONFIG_ARMADA_AP_CPU_CLK does not select it.

This has been a problem since the driver was added to the kernel but it
was not built before commit c318ea261749 ("cpufreq: ap806: fix cpufreq
driver needs ap cpu clk") so it was never noticed.

Fixes: f756e362d938 ("clk: mvebu: add CPU clock driver for Armada 7K/8K")
Signed-off-by: Nathan Chancellor <[e-mail]>
---

I do not know who should actually take this patch since the problematic
patch is on Viresh's cpufreq/arm/linux-next but the problem originated
from a patch in the clk tree in 5.4. I assume all that would be needed
is a clk maintainer's ack? Please let me know if I did something wrong.

Cheers,
Nathan

 drivers/clk/mvebu/Kconfig | 1 +
 1 file changed, 1 insertion(+)


base-commit: 0363635faa1da1560d2a84e2229c3f3ab108304f

Comments

Viresh Kumar July 2, 2020, 2:44 a.m. UTC | #1

On 01-07-20, 13:11, Nathan Chancellor wrote:
> When building arm32 allmodconfig:
> 
> ld.lld: error: undefined symbol: ap_cp_unique_name
> >>> referenced by ap-cpu-clk.c
> >>>               clk/mvebu/ap-cpu-clk.o:(ap_cpu_clock_probe) in archive drivers/built-in.a
> 
> ap_cp_unique_name is only compiled into the kernel image when
> CONFIG_ARMADA_AP_CP_HELPER is selected (as it is not user selectable).
> However, CONFIG_ARMADA_AP_CPU_CLK does not select it.
> 
> This has been a problem since the driver was added to the kernel but it
> was not built before commit c318ea261749 ("cpufreq: ap806: fix cpufreq
> driver needs ap cpu clk") so it was never noticed.
> 
> Fixes: f756e362d938 ("clk: mvebu: add CPU clock driver for Armada 7K/8K")
> Signed-off-by: Nathan Chancellor <[e-mail]>
> ---
> 
> I do not know who should actually take this patch since the problematic
> patch is on Viresh's cpufreq/arm/linux-next

That patch just enabled the config option and I have picked it up for
5.9.

> but the problem originated
> from a patch in the clk tree in 5.4. I assume all that would be needed
> is a clk maintainer's ack? Please let me know if I did something wrong.

This patch should go through clk tree and get pushed for 5.8 if
possible (which makes sense as well).

Patch

diff --git a/drivers/clk/mvebu/Kconfig b/drivers/clk/mvebu/Kconfig
index ded07b0bd0d5..557d6213783c 100644
--- a/drivers/clk/mvebu/Kconfig
+++ b/drivers/clk/mvebu/Kconfig
@@ -42,6 +42,7 @@  config ARMADA_AP806_SYSCON
 
 config ARMADA_AP_CPU_CLK
 	bool
+	select ARMADA_AP_CP_HELPER
 
 config ARMADA_CP110_SYSCON
 	bool