Re: [PATCH 5.10 072/106] net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET under ARCH_BCM2835

Greg Kroah-Hartman
2022-12-13T14:22:12Z

On Tue, Dec 13, 2022 at 03:24:50PM +0800, YueHaibing wrote:
> On 2022/12/12 21:10, Greg Kroah-Hartman wrote:
>
> > From: YueHaibing <yuehaibing@huawei.com>
> >
> > [ Upstream commit 421f8663b3a775c32f724f793264097c60028f2e ]
> >
> > commit 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig") fixes the build
> > that contain 99addbe31f55 ("net: broadcom: Select BROADCOM_PHY for BCMGENET")
> > and enable BCMGENET=y but PTP_1588_CLOCK_OPTIONAL=m, which otherwise
> > leads to a link failure. However this may trigger a runtime failure.
> >
> > Fix the original issue by propagating the PTP_1588_CLOCK_OPTIONAL dependency
> > of BROADCOM_PHY down to BCMGENET.
> >
> > Fixes: 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig")
> > Fixes: 99addbe31f55 ("net: broadcom: Select BROADCOM_PHY for BCMGENET")
> > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > Link: https://lore.kernel.org/r/20221125115003.30308-1-yuehaibing@huawei.com
> > Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> > Signed-off-by: Sasha Levin <sashal@kernel.org>
> > ---
> > drivers/net/ethernet/broadcom/Kconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
> > index 7b79528d6eed..06aaeaadf2e9 100644
> > --- a/drivers/net/ethernet/broadcom/Kconfig
> > +++ b/drivers/net/ethernet/broadcom/Kconfig
> > @@ -63,6 +63,7 @@ config BCM63XX_ENET
> > config BCMGENET
> > tristate "Broadcom GENET internal MAC support"
> > depends on HAS_IOMEM
> > + depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
>
> This commit is not needed by 5.10,  see
>
> commit 7be134eb691f6a54b267dbc321530ce0221a76b1
> Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Date:   Fri Nov 25 15:51:06 2022 +0100
>
>     Revert "net: broadcom: Fix BCMGENET Kconfig"
>
>     This reverts commit fbb4e8e6dc7b38b3007354700f03c8ad2d9a2118 which is
>     commit 8d820bc9d12b8beebca836cceaf2bbe68216c2f8 upstream.
>
>     It causes runtime failures as reported by Naresh and Arnd writes:
>
>             Greg, please just revert fbb4e8e6dc7b ("net: broadcom: Fix BCMGENET Kconfig")
>             in stable/linux-5.10.y: it depends on e5f31552674e ("ethernet: fix
>             PTP_1588_CLOCK dependencies"), which we probably don't want backported
>             from 5.15 to 5.10.

Now dropped, thanks.

greg k-h