| Message ID | 20231129111142.3322667-1-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 078e07570359b77655d7e54a05153873f1d20648 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ethernet: renesas: rcar_gen4_ptp: Depend on PTP_1588_CLOCK | expand |
On Wed, Nov 29, 2023, at 12:11, Niklas Söderlund wrote: > When breaking out the Gen4 gPTP support to its own module the dependency > on the PTP_1588_CLOCK framework was left as optional and only stated for > the driver using the module. This leads to issues when doing > COMPILE_TEST of RENESAS_GEN4_PTP separately and PTP_1588_CLOCK is built > as a module and the other as a built-in. Add an explicit depend on > PTP_1588_CLOCK. > > While at it remove the optional support for PTP_1588_CLOCK from > RENESAS_ETHER_SWITCH as the driver unconditionally calls the Gen4 gPTP > module and thus also requires the PTP_1588_CLOCK framework. > > Reported-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 8c1c66235e03 ("net: ethernet: renesas: rcar_gen4_ptp: Break out > to module") > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Ideally someone should rework the driver (and the ravb one) to actually leave out all the ptp related code when PTP is disabled, but this patch avoids both the link failure and the possible logic issues for the moment. Arnd
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 29 Nov 2023 12:11:42 +0100 you wrote: > When breaking out the Gen4 gPTP support to its own module the dependency > on the PTP_1588_CLOCK framework was left as optional and only stated for > the driver using the module. This leads to issues when doing > COMPILE_TEST of RENESAS_GEN4_PTP separately and PTP_1588_CLOCK is built > as a module and the other as a built-in. Add an explicit depend on > PTP_1588_CLOCK. > > [...] Here is the summary with links: - [net-next] net: ethernet: renesas: rcar_gen4_ptp: Depend on PTP_1588_CLOCK https://git.kernel.org/netdev/net-next/c/078e07570359 You are awesome, thank you!
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig index 733cbb6eb3ed..d6136fe5c206 100644 --- a/drivers/net/ethernet/renesas/Kconfig +++ b/drivers/net/ethernet/renesas/Kconfig @@ -40,7 +40,7 @@ config RAVB config RENESAS_ETHER_SWITCH tristate "Renesas Ethernet Switch support" depends on ARCH_RENESAS || COMPILE_TEST - depends on PTP_1588_CLOCK_OPTIONAL + depends on PTP_1588_CLOCK select CRC32 select MII select PHYLINK @@ -50,6 +50,7 @@ config RENESAS_ETHER_SWITCH config RENESAS_GEN4_PTP tristate "Renesas R-Car Gen4 gPTP support" if COMPILE_TEST + depends on PTP_1588_CLOCK select CRC32 select MII select PHYLIB
When breaking out the Gen4 gPTP support to its own module the dependency on the PTP_1588_CLOCK framework was left as optional and only stated for the driver using the module. This leads to issues when doing COMPILE_TEST of RENESAS_GEN4_PTP separately and PTP_1588_CLOCK is built as a module and the other as a built-in. Add an explicit depend on PTP_1588_CLOCK. While at it remove the optional support for PTP_1588_CLOCK from RENESAS_ETHER_SWITCH as the driver unconditionally calls the Gen4 gPTP module and thus also requires the PTP_1588_CLOCK framework. Reported-by: Arnd Bergmann <arnd@arndb.de> Fixes: 8c1c66235e03 ("net: ethernet: renesas: rcar_gen4_ptp: Break out to module") Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/net/ethernet/renesas/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)