diff mbox series

mfd: rz-mtu3: link time dependencies

Message ID 20230719090430.1925182-1-arnd@kernel.org
State Handled Elsewhere
Headers show
Series mfd: rz-mtu3: link time dependencies | expand

Commit Message

Arnd Bergmann July 19, 2023, 9:02 a.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

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.

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 <arnd@arndb.de>
---
 drivers/counter/Kconfig     |  2 +-
 drivers/pwm/Kconfig         |  2 +-
 include/linux/mfd/rz-mtu3.h | 66 -------------------------------------
 3 files changed, 2 insertions(+), 68 deletions(-)

Comments

Biju Das July 19, 2023, 9:11 a.m. UTC | #1 
Hi Arnd,

Thanks for the patch. It is inline with[1]

[1] https://patchwork.ozlabs.org/project/linux-pwm/patch/ac8d6190-06ae-b538-1293-07efedbfe94e@gmail.com/#3150120

> -----Original Message-----
> From: Arnd Bergmann <arnd@kernel.org>
> Sent: Wednesday, July 19, 2023 10:02 AM
> To: William Breathitt Gray <william.gray@linaro.org>; Thierry Reding
> <thierry.reding@gmail.com>; Lee Jones <lee@kernel.org>; Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de>; Biju Das <biju.das.jz@bp.renesas.com>
> Cc: Arnd Bergmann <arnd@arndb.de>; Peter Robinson
> <pbrobinson@gmail.com>; linux-iio@vger.kernel.org; linux-
> kernel@vger.kernel.org; linux-pwm@vger.kernel.org
> Subject: [PATCH] mfd: rz-mtu3: link time dependencies
> 
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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.

Typo "mtd"->"mfd"

Otherwise looks good to me.

Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>

Cheers,
Biju

> 
> 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 <arnd@arndb.de>
> ---
>  drivers/counter/Kconfig     |  2 +-
>  drivers/pwm/Kconfig         |  2 +-
>  include/linux/mfd/rz-mtu3.h | 66 -------------------------------------
>  3 files changed, 2 insertions(+), 68 deletions(-)
> 
> diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index
> 62962ae84b77d..497bc05dca4df 100644
> --- a/drivers/counter/Kconfig
> +++ b/drivers/counter/Kconfig
> @@ -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 diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index
> 6210babb0741a..8ebcddf91f7b7 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -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 diff --git a/include/linux/mfd/rz-mtu3.h b/include/linux/mfd/rz-
> mtu3.h index c5173bc062701..8421d49500bf4 100644
> --- a/include/linux/mfd/rz-mtu3.h
> +++ b/include/linux/mfd/rz-mtu3.h
> @@ -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(struct rz_mtu3_channel *ch, u16 off,
>  				   u16 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, u16
> off) -{
> -	return 0;
> -}
> -
> -static inline u16 rz_mtu3_16bit_ch_read(struct rz_mtu3_channel *ch, u16
> off) -{
> -	return 0;
> -}
> -
> -static inline u32 rz_mtu3_32bit_ch_read(struct rz_mtu3_channel *ch, u16
> off) -{
> -	return 0;
> -}
> -
> -static inline u16 rz_mtu3_shared_reg_read(struct rz_mtu3_channel *ch,
> u16 off) -{
> -	return 0;
> -}
> -
> -static inline void rz_mtu3_8bit_ch_write(struct rz_mtu3_channel *ch,
> u16 off, u8 val) -{ -}
> -
> -static inline void rz_mtu3_16bit_ch_write(struct rz_mtu3_channel *ch,
> u16 off, u16 val) -{ -}
> -
> -static inline void rz_mtu3_32bit_ch_write(struct rz_mtu3_channel *ch,
> u16 off, u32 val) -{ -}
> -
> -static inline void rz_mtu3_shared_reg_write(struct rz_mtu3_channel *ch,
> u16 off, u16 val) -{ -}
> -
> -static inline void rz_mtu3_shared_reg_update_bit(struct rz_mtu3_channel
> *ch,
> -						 u16 off, u16 pos, u8 val)
> -{
> -}
> -#endif
> 
>  #endif /* __MFD_RZ_MTU3_H__ */
> --
> 2.39.2
Thierry Reding July 20, 2023, 3 p.m. UTC | #2 
On Wed, Jul 19, 2023 at 11:02:23AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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.
> 
> 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 <arnd@arndb.de>
> ---
>  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:

Acked-by: Thierry Reding <thierry.reding@gmail.com>
Lee Jones July 21, 2023, 8 a.m. UTC | #3 
On Thu, 20 Jul 2023, Thierry Reding wrote:

> On Wed, Jul 19, 2023 at 11:02:23AM +0200, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > 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.
> > 
> > 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 <arnd@arndb.de>
> > ---
> >  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:
> 
> Acked-by: Thierry Reding <thierry.reding@gmail.com>

Happy to.  Can you do without a pull-request?
Thierry Reding July 21, 2023, 12:20 p.m. UTC | #4 
On Fri, Jul 21, 2023 at 09:00:55AM +0100, Lee Jones wrote:
> On Thu, 20 Jul 2023, Thierry Reding wrote:
> 
> > On Wed, Jul 19, 2023 at 11:02:23AM +0200, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <arnd@arndb.de>
> > > 
> > > 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.
> > > 
> > > 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 <arnd@arndb.de>
> > > ---
> > >  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:
> > 
> > Acked-by: Thierry Reding <thierry.reding@gmail.com>
> 
> Happy to.  Can you do without a pull-request?

Yeah, I don't think a PR will be necessary.

Thierry
Lee Jones July 28, 2023, 10:57 a.m. UTC | #5 
On Wed, 19 Jul 2023 11:02:23 +0200, Arnd Bergmann wrote:
> 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 [李琼斯]
diff mbox series

Patch

diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
index 62962ae84b77d..497bc05dca4df 100644
--- a/drivers/counter/Kconfig
+++ b/drivers/counter/Kconfig
@@ -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
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 6210babb0741a..8ebcddf91f7b7 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -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
diff --git a/include/linux/mfd/rz-mtu3.h b/include/linux/mfd/rz-mtu3.h
index c5173bc062701..8421d49500bf4 100644
--- a/include/linux/mfd/rz-mtu3.h
+++ b/include/linux/mfd/rz-mtu3.h
@@ -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(struct rz_mtu3_channel *ch, u16 off,
 				   u16 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, u16 off)
-{
-	return 0;
-}
-
-static inline u16 rz_mtu3_16bit_ch_read(struct rz_mtu3_channel *ch, u16 off)
-{
-	return 0;
-}
-
-static inline u32 rz_mtu3_32bit_ch_read(struct rz_mtu3_channel *ch, u16 off)
-{
-	return 0;
-}
-
-static inline u16 rz_mtu3_shared_reg_read(struct rz_mtu3_channel *ch, u16 off)
-{
-	return 0;
-}
-
-static inline void rz_mtu3_8bit_ch_write(struct rz_mtu3_channel *ch, u16 off, u8 val)
-{
-}
-
-static inline void rz_mtu3_16bit_ch_write(struct rz_mtu3_channel *ch, u16 off, u16 val)
-{
-}
-
-static inline void rz_mtu3_32bit_ch_write(struct rz_mtu3_channel *ch, u16 off, u32 val)
-{
-}
-
-static inline void rz_mtu3_shared_reg_write(struct rz_mtu3_channel *ch, u16 off, u16 val)
-{
-}
-
-static inline void rz_mtu3_shared_reg_update_bit(struct rz_mtu3_channel *ch,
-						 u16 off, u16 pos, u8 val)
-{
-}
-#endif
 
 #endif /* __MFD_RZ_MTU3_H__ */