Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Naresh Kamboju]

On Wed, 23 Nov 2022 at 14:50, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> This is the start of the stable review cycle for the 5.10.156 release.
> There are 149 patches in this series, all will be posted as a response
> to this one.  If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri, 25 Nov 2022 08:45:20 +0000.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
>         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.156-rc1.gz
> or in the git tree and branch at:
>         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h


With stable rc 5.10.156-rc1 Raspberry Pi 4 Model B failed to boot due to
following warnings / errors [1]. The NFS mount failed and failed to boot.

I have to bisect this problem.


Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>


[    0.000000] Linux version 5.10.156-rc1 (tuxmake@tuxmake)
(aarch64-linux-gnu-gcc (Debian 11.3.0-6) 11.3.0, GNU ld (GNU Binutils
for Debian) 2.39) #1 SMP PREEMPT @1669194931
[    0.000000] Machine model: Raspberry Pi 4 Model B
---
[    3.253965] mmc0: new high speed SDIO card at address 0001
[    7.229502] bcmgenet fd580000.ethernet eth0: Link is Up -
1Gbps/Full - flow control off
[    7.237710] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
[    7.253259] Sending DHCP requests ......
[   81.086546] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[42e6766b]
[   89.106504] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[42e6766b]
[   98.657252]  timed out!
[   98.683997] bcmgenet fd580000.ethernet eth0: Link is Down
[   98.691276] IP-Config: Retrying forever (NFS root)...
[   98.698404] bcmgenet fd580000.ethernet: configuring instance for
external RGMII (RX delay)
[   98.707190] bcmgenet fd580000.ethernet eth0: Link is Down
[  102.813504] bcmgenet fd580000.ethernet eth0: Link is Up -
1Gbps/Full - flow control off
[  102.821680] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
[  102.841257] Sending DHCP requests ....
[  119.840915] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[34e6766b]
[  127.860148] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[34e6766b]
[  132.513252] .. timed out!

[1] https://lkft.validation.linaro.org/scheduler/job/5880584#L392

--
Linaro LKFT
https://lkft.linaro.org

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Naresh Kamboju]

On Wed, 23 Nov 2022 at 19:30, Naresh Kamboju <naresh.kamboju@linaro.org> wrote:
>
> On Wed, 23 Nov 2022 at 14:50, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > This is the start of the stable review cycle for the 5.10.156 release.
> > There are 149 patches in this series, all will be posted as a response
> > to this one.  If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri, 25 Nov 2022 08:45:20 +0000.
> > Anything received after that time might be too late.
> >
> > The whole patch series can be found in one patch at:
> >         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.156-rc1.gz
> > or in the git tree and branch at:
> >         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
> > and the diffstat can be found below.
> >
> > thanks,
> >
> > greg k-h
>
>
> With stable rc 5.10.156-rc1 Raspberry Pi 4 Model B failed to boot due to
> following warnings / errors [1]. The NFS mount failed and failed to boot.
>
> I have to bisect this problem.

Daniel bisected this reported problem and found the first bad commit,

YueHaibing <yuehaibing@huawei.com>
    net: broadcom: Fix BCMGENET Kconfig


> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
>
>
> [    0.000000] Linux version 5.10.156-rc1 (tuxmake@tuxmake)
> (aarch64-linux-gnu-gcc (Debian 11.3.0-6) 11.3.0, GNU ld (GNU Binutils
> for Debian) 2.39) #1 SMP PREEMPT @1669194931
> [    0.000000] Machine model: Raspberry Pi 4 Model B
> ---
> [    3.253965] mmc0: new high speed SDIO card at address 0001
> [    7.229502] bcmgenet fd580000.ethernet eth0: Link is Up -
> 1Gbps/Full - flow control off
> [    7.237710] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
> [    7.253259] Sending DHCP requests ......
> [   81.086546] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[42e6766b]
> [   89.106504] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[42e6766b]
> [   98.657252]  timed out!
> [   98.683997] bcmgenet fd580000.ethernet eth0: Link is Down
> [   98.691276] IP-Config: Retrying forever (NFS root)...
> [   98.698404] bcmgenet fd580000.ethernet: configuring instance for
> external RGMII (RX delay)
> [   98.707190] bcmgenet fd580000.ethernet eth0: Link is Down
> [  102.813504] bcmgenet fd580000.ethernet eth0: Link is Up -
> 1Gbps/Full - flow control off
> [  102.821680] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
> [  102.841257] Sending DHCP requests ....
> [  119.840915] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[34e6766b]
> [  127.860148] DHCP/BOOTP: Reply not for us on eth0, op[2] xid[34e6766b]
> [  132.513252] .. timed out!
>
> [1] https://lkft.validation.linaro.org/scheduler/job/5880584#L392
>
> --
> Linaro LKFT
> https://lkft.linaro.org

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Greg Kroah-Hartman]

On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
> On Wed, 23 Nov 2022 at 19:30, Naresh Kamboju <naresh.kamboju@linaro.org> wrote:
> >
> > On Wed, 23 Nov 2022 at 14:50, Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > This is the start of the stable review cycle for the 5.10.156 release.
> > > There are 149 patches in this series, all will be posted as a response
> > > to this one.  If anyone has any issues with these being applied, please
> > > let me know.
> > >
> > > Responses should be made by Fri, 25 Nov 2022 08:45:20 +0000.
> > > Anything received after that time might be too late.
> > >
> > > The whole patch series can be found in one patch at:
> > >         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.156-rc1.gz
> > > or in the git tree and branch at:
> > >         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
> > > and the diffstat can be found below.
> > >
> > > thanks,
> > >
> > > greg k-h
> >
> >
> > With stable rc 5.10.156-rc1 Raspberry Pi 4 Model B failed to boot due to
> > following warnings / errors [1]. The NFS mount failed and failed to boot.
> >
> > I have to bisect this problem.
> 
> Daniel bisected this reported problem and found the first bad commit,
> 
> YueHaibing <yuehaibing@huawei.com>
>     net: broadcom: Fix BCMGENET Kconfig

But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
this -rc release.

What config options are being set because of this that cause the
problem?  Should it just be reverted for 5.10.y, and not the other
branches?  Or for everywhere including Linus's tree?

thanks,

greg k-h

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Naresh Kamboju]

On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
> > On Wed, 23 Nov 2022 at 19:30, Naresh Kamboju <naresh.kamboju@linaro.org> wrote:
> > >
> > > On Wed, 23 Nov 2022 at 14:50, Greg Kroah-Hartman
> > > <gregkh@linuxfoundation.org> wrote:
> > > >
> > > > This is the start of the stable review cycle for the 5.10.156 release.
> > > > There are 149 patches in this series, all will be posted as a response
> > > > to this one.  If anyone has any issues with these being applied, please
> > > > let me know.
> > > >
> > > > Responses should be made by Fri, 25 Nov 2022 08:45:20 +0000.
> > > > Anything received after that time might be too late.
> > > >
> > > > The whole patch series can be found in one patch at:
> > > >         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.156-rc1.gz
> > > > or in the git tree and branch at:
> > > >         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
> > > > and the diffstat can be found below.
> > > >
> > > > thanks,
> > > >
> > > > greg k-h
> > >
> > >
> > > With stable rc 5.10.156-rc1 Raspberry Pi 4 Model B failed to boot due to
> > > following warnings / errors [1]. The NFS mount failed and failed to boot.
> > >
> > > I have to bisect this problem.
> >
> > Daniel bisected this reported problem and found the first bad commit,
> >
> > YueHaibing <yuehaibing@huawei.com>
> >     net: broadcom: Fix BCMGENET Kconfig
>
> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
> this -rc release.

It started from 5.10.155 and this is only seen on 5.10 and other
branches 5.15, 6.0 and mainline are looking good.

>
> What config options are being set because of this that cause the
> problem?

LKFT is built with arm64 defconfig + distro configs as described below.

>   Should it just be reverted for 5.10.y, and not the other
> branches?  Or for everywhere including Linus's tree?

Reverting for 5.10 works for Rpi-4 to boot.

Due to the problematic commit
      # CONFIG_BROADCOM_PHY is not set
and Raspberry Pi 4 boot failed only on 5.10.155 and later.

--

diff -Narub good-config bad-config
--- good-config 2022-11-09 14:19:58.000000000 +0530
+++ bad-config 2022-11-16 15:50:36.000000000 +0530
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.154-rc2 Kernel Configuration
+# Linux/arm64 5.10.155 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Debian 11.3.0-6) 11.3.0"
 CONFIG_CC_IS_GCC=y
@@ -2611,7 +2611,7 @@
 # CONFIG_ADIN_PHY is not set
 CONFIG_AQUANTIA_PHY=y
 # CONFIG_AX88796B_PHY is not set
-CONFIG_BROADCOM_PHY=y
+# CONFIG_BROADCOM_PHY is not set
 # CONFIG_BCM54140_PHY is not set
 CONFIG_BCM7XXX_PHY=y
 # CONFIG_BCM84881_PHY is not set

---

# To install tuxmake on your system globally:
# sudo pip3 install -U tuxmake
#
# See https://docs.tuxmake.org/ for complete documentation.
# Original tuxmake command with fragments listed below.
# tuxmake --runtime podman --target-arch arm64 --toolchain gcc-11
--kconfig defconfig --kconfig-add
https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/lkft.config
--kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/lkft-crypto.config
--kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/distro-overrides.config
--kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/systemd.config
--kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/virtio.config
--kconfig-add CONFIG_ARM64_MODULE_PLTS=y --kconfig-add
CONFIG_SYN_COOKIES=y --kconfig-add CONFIG_SCHEDSTATS=y
CROSS_COMPILE_COMPAT=arm-linux-gnueabihf-

Bad config link,
https://builds.tuxbuild.com/2HcnnvEDD3gSr1zmS5DHzqPG2cJ/config

>
> thanks,
>
> greg k-h

- Naresh

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[YueHaibing]

On 2022/11/25 16:05, Naresh Kamboju wrote:
> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>>
>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
>>> On Wed, 23 Nov 2022 at 19:30, Naresh Kamboju <naresh.kamboju@linaro.org> wrote:
>>>>
>>>> On Wed, 23 Nov 2022 at 14:50, Greg Kroah-Hartman
>>>> <gregkh@linuxfoundation.org> wrote:
>>>>>
>>>>> This is the start of the stable review cycle for the 5.10.156 release.
>>>>> There are 149 patches in this series, all will be posted as a response
>>>>> to this one.  If anyone has any issues with these being applied, please
>>>>> let me know.
>>>>>
>>>>> Responses should be made by Fri, 25 Nov 2022 08:45:20 +0000.
>>>>> Anything received after that time might be too late.
>>>>>
>>>>> The whole patch series can be found in one patch at:
>>>>>         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.156-rc1.gz
>>>>> or in the git tree and branch at:
>>>>>         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
>>>>> and the diffstat can be found below.
>>>>>
>>>>> thanks,
>>>>>
>>>>> greg k-h
>>>>
>>>>
>>>> With stable rc 5.10.156-rc1 Raspberry Pi 4 Model B failed to boot due to
>>>> following warnings / errors [1]. The NFS mount failed and failed to boot.
>>>>
>>>> I have to bisect this problem.
>>>
>>> Daniel bisected this reported problem and found the first bad commit,
>>>
>>> YueHaibing <yuehaibing@huawei.com>
>>>     net: broadcom: Fix BCMGENET Kconfig
>>
>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
>> this -rc release.
> 
> It started from 5.10.155 and this is only seen on 5.10 and other
> branches 5.15, 6.0 and mainline are looking good.
> 
>>
>> What config options are being set because of this that cause the
>> problem?
> 
> LKFT is built with arm64 defconfig + distro configs as described below.
> 
>>   Should it just be reverted for 5.10.y, and not the other
>> branches?  Or for everywhere including Linus's tree?
> 
> Reverting for 5.10 works for Rpi-4 to boot.
> 
> Due to the problematic commit
>       # CONFIG_BROADCOM_PHY is not set
> and Raspberry Pi 4 boot failed only on 5.10.155 and later.

BROADCOM_PHY is needed by ARCH_BCM2835,  but BROADCOM_PHY depends on PTP_1588_CLOCK_OPTIONAL now
see commit 39db6be781cd ("net: phy: broadcom: Add PTP support for some Broadcom PHYs.")

config BROADCOM_PHY
        tristate "Broadcom 54XX PHYs"
        select BCM_NET_PHYLIB
        select BCM_NET_PHYPTP if NETWORK_PHY_TIMESTAMPING
        depends on PTP_1588_CLOCK_OPTIONAL

Your config don't enable PTP_1588_CLOCK_OPTIONAL, maybe PTP_1588_CLOCK_OPTIONAL should be enabled
or BROADCOM_PHY does not depends on PTP_1588_CLOCK_OPTIONAL?

> 
> --
> 
> diff -Narub good-config bad-config
> --- good-config 2022-11-09 14:19:58.000000000 +0530
> +++ bad-config 2022-11-16 15:50:36.000000000 +0530
> @@ -1,6 +1,6 @@
>  #
>  # Automatically generated file; DO NOT EDIT.
> -# Linux/arm64 5.10.154-rc2 Kernel Configuration
> +# Linux/arm64 5.10.155 Kernel Configuration
>  #
>  CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Debian 11.3.0-6) 11.3.0"
>  CONFIG_CC_IS_GCC=y
> @@ -2611,7 +2611,7 @@
>  # CONFIG_ADIN_PHY is not set
>  CONFIG_AQUANTIA_PHY=y
>  # CONFIG_AX88796B_PHY is not set
> -CONFIG_BROADCOM_PHY=y
> +# CONFIG_BROADCOM_PHY is not set
>  # CONFIG_BCM54140_PHY is not set
>  CONFIG_BCM7XXX_PHY=y
>  # CONFIG_BCM84881_PHY is not set
> 
> ---
> 
> # To install tuxmake on your system globally:
> # sudo pip3 install -U tuxmake
> #
> # See https://docs.tuxmake.org/ for complete documentation.
> # Original tuxmake command with fragments listed below.
> # tuxmake --runtime podman --target-arch arm64 --toolchain gcc-11
> --kconfig defconfig --kconfig-add
> https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/lkft.config
> --kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/lkft-crypto.config
> --kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/distro-overrides.config
> --kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/systemd.config
> --kconfig-add https://raw.githubusercontent.com/Linaro/meta-lkft/kirkstone/meta/recipes-kernel/linux/files/virtio.config
> --kconfig-add CONFIG_ARM64_MODULE_PLTS=y --kconfig-add
> CONFIG_SYN_COOKIES=y --kconfig-add CONFIG_SCHEDSTATS=y
> CROSS_COMPILE_COMPAT=arm-linux-gnueabihf-
> 
> Bad config link,
> https://builds.tuxbuild.com/2HcnnvEDD3gSr1zmS5DHzqPG2cJ/config
> 
>>
>> thanks,
>>
>> greg k-h
> 
> - Naresh
> .
> 

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Arnd Bergmann]

On Fri, Nov 25, 2022, at 09:05, Naresh Kamboju wrote:
> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
>> >
>> > Daniel bisected this reported problem and found the first bad commit,
>> >
>> > YueHaibing <yuehaibing@huawei.com>
>> >     net: broadcom: Fix BCMGENET Kconfig
>>
>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
>> this -rc release.
>
> It started from 5.10.155 and this is only seen on 5.10 and other
> branches 5.15, 6.0 and mainline are looking good.

I think the original patch is wrong and should be fixed upstream.
The backported patch in question is a one-line Kconfig change doing

diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index f4e1ca68d831..55dfdb34e37b 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -77,7 +77,7 @@ config BCMGENET
        select BCM7XXX_PHY
        select MDIO_BCM_UNIMAC
        select DIMLIB
-       select BROADCOM_PHY if ARCH_BCM2835
+       select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
        help
          This driver supports the built-in Ethernet MACs found in the
          Broadcom BCM7xxx Set Top Box family chipset.

which fixes the build on kernels 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.

The patch unfortunately solves it by replacing it with a runtime
failure by no longer linking in the PHY driver (as found by Naresh).

I think the correct fix would be to propagate the dependency down
to BCMGENET:

diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index f4e1ca68d831..f4ca0c6c0f51 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -71,6 +71,7 @@ config BCM63XX_ENET
 config BCMGENET
 	tristate "Broadcom GENET internal MAC support"
 	depends on HAS_IOMEM
+	depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
 	select MII
 	select PHYLIB
 	select FIXED_PHY

With this change, the broken config is no longer possible, instead
forcing BCMGENET to be =m when building for ARCH_BCM2835 with
PTP_1588_CLOCK=m.

     Arnd

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[YueHaibing]

On 2022/11/25 18:02, Arnd Bergmann wrote:
> On Fri, Nov 25, 2022, at 09:05, Naresh Kamboju wrote:
>> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
>>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
>>>>
>>>> Daniel bisected this reported problem and found the first bad commit,
>>>>
>>>> YueHaibing <yuehaibing@huawei.com>
>>>>     net: broadcom: Fix BCMGENET Kconfig
>>>
>>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
>>> this -rc release.
>>
>> It started from 5.10.155 and this is only seen on 5.10 and other
>> branches 5.15, 6.0 and mainline are looking good.
> 
> I think the original patch is wrong and should be fixed upstream.
> The backported patch in question is a one-line Kconfig change doing

It seems lts 5.10 do not contain commit e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies"),
there is not PTP_1588_CLOCK_OPTIONAL option.

> 
> diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
> index f4e1ca68d831..55dfdb34e37b 100644
> --- a/drivers/net/ethernet/broadcom/Kconfig
> +++ b/drivers/net/ethernet/broadcom/Kconfig
> @@ -77,7 +77,7 @@ config BCMGENET
>         select BCM7XXX_PHY
>         select MDIO_BCM_UNIMAC
>         select DIMLIB
> -       select BROADCOM_PHY if ARCH_BCM2835
> +       select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
>         help
>           This driver supports the built-in Ethernet MACs found in the
>           Broadcom BCM7xxx Set Top Box family chipset.
> 
> which fixes the build on kernels 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.
> 
> The patch unfortunately solves it by replacing it with a runtime
> failure by no longer linking in the PHY driver (as found by Naresh).
> 
> I think the correct fix would be to propagate the dependency down
> to BCMGENET:
> 
> diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
> index f4e1ca68d831..f4ca0c6c0f51 100644
> --- a/drivers/net/ethernet/broadcom/Kconfig
> +++ b/drivers/net/ethernet/broadcom/Kconfig
> @@ -71,6 +71,7 @@ config BCM63XX_ENET
>  config BCMGENET
>  	tristate "Broadcom GENET internal MAC support"
>  	depends on HAS_IOMEM
> +	depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
>  	select MII
>  	select PHYLIB
>  	select FIXED_PHY
> 
> With this change, the broken config is no longer possible, instead
> forcing BCMGENET to be =m when building for ARCH_BCM2835 with
> PTP_1588_CLOCK=m.
> 
>      Arnd
> .
> 

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Arnd Bergmann]

On Fri, Nov 25, 2022, at 11:25, YueHaibing wrote:
> On 2022/11/25 18:02, Arnd Bergmann wrote:
>> On Fri, Nov 25, 2022, at 09:05, Naresh Kamboju wrote:
>>> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
>>>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
>>>>>
>>>>> Daniel bisected this reported problem and found the first bad commit,
>>>>>
>>>>> YueHaibing <yuehaibing@huawei.com>
>>>>>     net: broadcom: Fix BCMGENET Kconfig
>>>>
>>>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
>>>> this -rc release.
>>>
>>> It started from 5.10.155 and this is only seen on 5.10 and other
>>> branches 5.15, 6.0 and mainline are looking good.
>> 
>> I think the original patch is wrong and should be fixed upstream.
>> The backported patch in question is a one-line Kconfig change doing
>
> It seems lts 5.10 do not contain commit e5f31552674e ("ethernet: fix 
> PTP_1588_CLOCK dependencies"),
> there is not PTP_1588_CLOCK_OPTIONAL option.

Ok, so there is a second problem then.

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.

YueHaibing, do you agree with my suggestion for improving the
upstream 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig")
commit? Can you send a follow-up fix, or should I?

      Arnd

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[YueHaibing]

On 2022/11/25 18:32, Arnd Bergmann wrote:
> On Fri, Nov 25, 2022, at 11:25, YueHaibing wrote:
>> On 2022/11/25 18:02, Arnd Bergmann wrote:
>>> On Fri, Nov 25, 2022, at 09:05, Naresh Kamboju wrote:
>>>> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
>>>>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
>>>>>>
>>>>>> Daniel bisected this reported problem and found the first bad commit,
>>>>>>
>>>>>> YueHaibing <yuehaibing@huawei.com>
>>>>>>     net: broadcom: Fix BCMGENET Kconfig
>>>>>
>>>>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
>>>>> this -rc release.
>>>>
>>>> It started from 5.10.155 and this is only seen on 5.10 and other
>>>> branches 5.15, 6.0 and mainline are looking good.
>>>
>>> I think the original patch is wrong and should be fixed upstream.
>>> The backported patch in question is a one-line Kconfig change doing
>>
>> It seems lts 5.10 do not contain commit e5f31552674e ("ethernet: fix 
>> PTP_1588_CLOCK dependencies"),
>> there is not PTP_1588_CLOCK_OPTIONAL option.
> 
> Ok, so there is a second problem then.
> 
> 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.
> 
> YueHaibing, do you agree with my suggestion for improving the
> upstream 8d820bc9d12b ("net: broadcom: Fix BCMGENET Kconfig")
> commit? Can you send a follow-up fix, or should I?

Ok, I will take care this.

> 
>       Arnd
> .
> 

Re: [PATCH 5.10 000/149] 5.10.156-rc1 review

[Greg Kroah-Hartman]

On Fri, Nov 25, 2022 at 11:32:49AM +0100, Arnd Bergmann wrote:
> On Fri, Nov 25, 2022, at 11:25, YueHaibing wrote:
> > On 2022/11/25 18:02, Arnd Bergmann wrote:
> >> On Fri, Nov 25, 2022, at 09:05, Naresh Kamboju wrote:
> >>> On Fri, 25 Nov 2022 at 12:57, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> >>>> On Thu, Nov 24, 2022 at 09:17:36PM +0530, Naresh Kamboju wrote:
> >>>>>
> >>>>> Daniel bisected this reported problem and found the first bad commit,
> >>>>>
> >>>>> YueHaibing <yuehaibing@huawei.com>
> >>>>>     net: broadcom: Fix BCMGENET Kconfig
> >>>>
> >>>> But that is in 5.10.155, 5.15.79, 6.0.9, and 6.1-rc5.  It is not new to
> >>>> this -rc release.
> >>>
> >>> It started from 5.10.155 and this is only seen on 5.10 and other
> >>> branches 5.15, 6.0 and mainline are looking good.
> >> 
> >> I think the original patch is wrong and should be fixed upstream.
> >> The backported patch in question is a one-line Kconfig change doing
> >
> > It seems lts 5.10 do not contain commit e5f31552674e ("ethernet: fix 
> > PTP_1588_CLOCK dependencies"),
> > there is not PTP_1588_CLOCK_OPTIONAL option.
> 
> Ok, so there is a second problem then.
> 
> 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 reverted, thanks.

greg k-h