mfd: rz-mtu3: link time dependencies
Subsystems (4)
PATCH 1/1 mfd: rz-mtu3: link time dependencies
From: Arnd Bergmann <[email protected]>
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld: drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'
arm-linux-gnueabi-ld: drivers/counter/rz-mtu3-cnt.o: in function `rz_mtu3_cascade_counts_enable_get':
rz-mtu3-cnt.c:(.text+0xbec): undefined reference to `rz_mtu3_shared_reg_read'
It seems better not to add the extra complexity here but instead just use a normal hard dependency, so remove the #else portion in the header along with the "|| COMPILE_TEST". This could also be fixed by having slightly more elaborate Kconfig dependencies or using the cursed 'IS_REACHABLE()' helper, but in practice it's already possible to compile-test all these drivers by enabling the mtd portion.
--- drivers/counter/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- include/linux/mfd/rz-mtu3.h | 66 ------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-)
drivers/counter/Kconfig +1 -1
@@ -92,7 +92,7 @@ config MICROCHIP_TCB_CAPTURE config RZ_MTU3_CNT tristate "Renesas RZ/G2L MTU3a counter driver" - depends on RZ_MTU3 || COMPILE_TEST + depends on RZ_MTU3 help Enable support for MTU3a counter driver found on Renesas RZ/G2L alike SoCs. This IP supports both 16-bit and 32-bit phase counting mode
drivers/pwm/Kconfig +1 -1
@@ -505,7 +505,7 @@ config PWM_ROCKCHIP config PWM_RZ_MTU3 tristate "Renesas RZ/G2L MTU3a PWM Timer support" - depends on RZ_MTU3 || COMPILE_TEST + depends on RZ_MTU3 depends on HAS_IOMEM help This driver exposes the MTU3a PWM Timer controller found in Renesas
include/linux/mfd/rz-mtu3.h +0 -66
77 lines not on this page · raw message
Signature · 1 line
2.39.2
Hi Arnd,
Thanks for the patch. It is inline with[1]
[1] https://patchwork.ozlabs.org/project/linux-pwm/patch/[email protected]/#3150120
Quoted 30 lines
-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Wednesday, July 19, 2023 10:02 AM
To: William Breathitt Gray <[email protected]>; Thierry Reding <[email protected]>; Lee Jones <[email protected]>; Uwe Kleine-König <[email protected]>; Biju Das <[email protected]>
Cc: Arnd Bergmann <[email protected]>; Peter Robinson <[email protected]>; [email protected]; linux- [email protected]; [email protected]
Subject: [PATCH] mfd: rz-mtu3: link time dependenciesFrom: Arnd Bergmann <[email protected]>
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld:
drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'arm-linux-gnueabi-ld:
drivers/counter/rz-mtu3-cnt.o: in function `rz_mtu3_cascade_counts_enable_get':
rz-mtu3-cnt.c:(.text+0xbec): undefined reference to `rz_mtu3_shared_reg_read'
Quoted 6 lines
It seems better not to add the extra complexity here but instead just use a normal hard dependency, so remove the #else portion in the header along with the "||
COMPILE_TEST". This could also be fixed by having slightly more elaborateKconfigdependencies or using the cursed 'IS_REACHABLE()' helper, but in practice it's already possible to compile-test all these drivers by enabling the mtd portion.
Typo "mtd"->"mfd"
Otherwise looks good to me.
Cheers,
Biju
Quoted 117 lines
Fixes 254d3a727421c ("pwm: Add Renesas RZ/G2L MTU3a PWM driver")Fixes 0be8907359df4 ("counter: Add Renesas RZ/G2L MTU3a counterdriver")
Fixes 654c293e1687b ("mfd: Add Renesas RZ/G2L MTU3a core driver")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/counter/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- include/linux/mfd/rz-mtu3.h | 66 ------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-)drivers/counter/Kconfig index renamed from drivers/counter/Kconfig +0
-0
62962ae84b77d..497bc05dca4df100644drivers/counter/Kconfig +1
-1@@ -92,7 +92,7 @@ config MICROCHIP_TCB_CAPTURE config RZ_MTU3_CNT tristate "Renesas RZ/G2L MTU3a counter driver" - depends on RZ_MTU3 || COMPILE_TEST + depends on RZ_MTU3 help Enable support for MTU3a counter driver found on Renesas RZ/G2Lalike
SoCs. This IP supports both 16-bit and 32-bit phase counting
mode diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index6210babb0741a..8ebcddf91f7b7100644drivers/pwm/Kconfig +1
-1@@ -505,7 +505,7 @@ config PWM_ROCKCHIP config PWM_RZ_MTU3 tristate "Renesas RZ/G2L MTU3a PWM Timer support" - depends on RZ_MTU3 || COMPILE_TEST + depends on RZ_MTU3 depends on HAS_IOMEM help This driver exposes the MTU3a PWM Timer controller found inRenesas diff --git
a/include/linux/mfd/rz-mtu3.hb/include/linux/mfd/rz-mtu3.hindexc5173bc062701..8421d49500bf4100644include/linux/mfd/rz-mtu3.h +0
-1@@ -151,7 +151,6 @@ struct rz_mtu3 {void *priv_data; }; -#if IS_ENABLED (CONFIG_RZ_MTU3 )static inline bool rz_mtu3_request_channel (struct rz_mtu3_channel *ch) {mutex_lock (&ch->lock);@@ -188,70 +187,5 @@ void rz_mtu3_32bit_ch_write(struct rz_mtu3_channel *ch, u16 off, u32 val); void rz_mtu3_shared_reg_write(struct
rz_mtu3_channel*ch, u16 off, u16 val); void rz_mtu3_shared_reg_update_bit(structrz_mtu3_channel*ch, u16 off,include/linux/mfd/rz-mtu3.h +0
-20u16 pos, u8 val); -#else -static inline bool rz_mtu3_request_channel (struct rz_mtu3_channel *ch) -{ -return false; -} - -static inline void rz_mtu3_release_channel (struct rz_mtu3_channel *ch) -{ -} - -static inline bool rz_mtu3_is_enabled(struct rz_mtu3_channel *ch) -{ -return false; -} - -static inline void rz_mtu3_disable(struct rz_mtu3_channel *ch) -{ -} - -static inline int rz_mtu3_enable(struct rz_mtu3_channel *ch) -{ -return 0 ; -} - -static inline u8 rz_mtu3_8bit_ch_read(struct rz_mtu3_channel *ch, u16off) -{
include/linux/mfd/rz-mtu3.h +0
-4-return 0 ; -} - -static inline u16 rz_mtu3_16bit_ch_read(struct rz_mtu3_channel *ch, u16off) -{
include/linux/mfd/rz-mtu3.h +0
-4-return 0 ; -} - -static inline u32 rz_mtu3_32bit_ch_read(struct rz_mtu3_channel *ch, u16off) -{
include/linux/mfd/rz-mtu3.h +0
-4-return 0 ; -} - -static inline u16 rz_mtu3_shared_reg_read(struct rz_mtu3_channel *ch,u16 off) -{
include/linux/mfd/rz-mtu3.h +0
-4-return 0 ; -} - -static inline void rz_mtu3_8bit_ch_write(struct rz_mtu3_channel *ch,u16 off, u8 val) -{ -}
include/linux/mfd/rz-mtu3.h +0
-2- -static inline void rz_mtu3_16bit_ch_write(struct rz_mtu3_channel *ch,u16 off, u16 val) -{ -}
include/linux/mfd/rz-mtu3.h +0
-2- -static inline void rz_mtu3_32bit_ch_write(struct rz_mtu3_channel *ch,u16 off, u32 val) -{ -}
include/linux/mfd/rz-mtu3.h +0
-2- -static inline void rz_mtu3_shared_reg_write(struct rz_mtu3_channel *ch,u16 off, u16 val) -{ -}
include/linux/mfd/rz-mtu3.h +0
-2- -static inline void rz_mtu3_shared_reg_update_bit(struct rz_mtu3_channel*ch,
include/linux/mfd/rz-mtu3.h +0
-5- u16 off, u16 pos, u8 val) -{ -} -#endif #endif /* __MFD_RZ_MTU3_H__ */ --2.39.2
Quoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld:
drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'arm-linux-gnueabi-ld:
drivers/counter/rz-mtu3-cnt.o: in function `rz_mtu3_cascade_counts_enable_get':
rz-mtu3-cnt.c:(.text+0xbec): undefined reference to `rz_mtu3_shared_reg_read'It seems better not to add the extra complexity here but instead just use a normal hard dependency, so remove the #else portion in the header along with the "||
COMPILE_TEST". This could also be fixed by having slightly more elaborateKconfigdependencies or using the cursed 'IS_REACHABLE()' helper, but in practice it's already possible to compile-test all these drivers by enabling the mtd portion.Fixes 254d3a727421c ("pwm: Add Renesas RZ/G2L MTU3a PWM driver")Fixes 0be8907359df4 ("counter: Add Renesas RZ/G2L MTU3a counter driver")Fixes 654c293e1687b ("mfd: Add Renesas RZ/G2L MTU3a core driver")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 5 lines
--- drivers/counter/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- include/linux/mfd/rz-mtu3.h | 66 ------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-)
Assuming that Lee will pick this up:
Lee Jones
maintainerQuoted 32 lines · Thierry Reding
Quoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld:
drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'arm-linux-gnueabi-ld:
drivers/counter/rz-mtu3-cnt.o: in function `rz_mtu3_cascade_counts_enable_get':
rz-mtu3-cnt.c:(.text+0xbec): undefined reference to `rz_mtu3_shared_reg_read'It seems better not to add the extra complexity here but instead just use a normal hard dependency, so remove the #else portion in the header along with the "||
COMPILE_TEST". This could also be fixed by having slightly more elaborateKconfigdependencies or using the cursed 'IS_REACHABLE()' helper, but in practice it's already possible to compile-test all these drivers by enabling the mtd portion.Fixes 254d3a727421c ("pwm: Add Renesas RZ/G2L MTU3a PWM driver")Fixes 0be8907359df4 ("counter: Add Renesas RZ/G2L MTU3a counter driver")Fixes 654c293e1687b ("mfd: Add Renesas RZ/G2L MTU3a core driver")Signed-off-by Arnd Bergmann <[email protected]>Quoted 5 lines
--- drivers/counter/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- include/linux/mfd/rz-mtu3.h | 66 ------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-)
Quoted 3 lines
Assuming that Lee will pick this up:
Acked-by Thierry Reding <[email protected]>
Happy to. Can you do without a pull-request?
Signature · 1 line
Lee Jones [李琼斯]
Quoted 34 lines · Lee Jones
Quoted 32 lines · Thierry Reding
Quoted 30 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld:
drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'arm-linux-gnueabi-ld:
drivers/counter/rz-mtu3-cnt.o: in function `rz_mtu3_cascade_counts_enable_get':
rz-mtu3-cnt.c:(.text+0xbec): undefined reference to `rz_mtu3_shared_reg_read'It seems better not to add the extra complexity here but instead just use a normal hard dependency, so remove the #else portion in the header along with the "||
COMPILE_TEST". This could also be fixed by having slightly more elaborateKconfigdependencies or using the cursed 'IS_REACHABLE()' helper, but in practice it's already possible to compile-test all these drivers by enabling the mtd portion.Fixes 254d3a727421c ("pwm: Add Renesas RZ/G2L MTU3a PWM driver")Fixes 0be8907359df4 ("counter: Add Renesas RZ/G2L MTU3a counter driver")Fixes 654c293e1687b ("mfd: Add Renesas RZ/G2L MTU3a core driver")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/counter/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- include/linux/mfd/rz-mtu3.h | 66 ------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-)
Quoted 5 lines
Quoted 3 lines
Assuming that Lee will pick this up:
Acked-by Thierry Reding <[email protected]>Happy to. Can you do without a pull-request?
Yeah, I don't think a PR will be necessary.
Thierry
Re: (subset) [PATCH] mfd: rz-mtu3: link time dependencies
In reply to Arnd BergmannQuoted 10 lines · Arnd Bergmann
The new set of drivers for RZ/G2L MTU3a tries to enable compile-testing the individual client drivers even when the MFD portion is disabled but gets it wrong, causing a link failure when the core is in a loadable module but the other drivers are built-in:
x86_64-linux-ld:
drivers/pwm/pwm-rz-mtu3.o: in function `rz_mtu3_pwm_apply':
pwm-rz-mtu3.c:(.text+0x4bf): undefined reference to `rz_mtu3_8bit_ch_write'
x86_64-linux-ld: pwm-rz-mtu3.c:(.text+0x509): undefined reference to `rz_mtu3_disable'[...]
Applied, thanks!
[1/1] mfd: rz-mtu3: link time dependencies
commit: 36a676ed76ae1f8dedbb093e1db1662458e00b6a
--
Lee Jones [李琼斯]