diff mbox series

[2/2] linux-yocto/6.6: fix genericarm64 config warning

Message ID 20240813195753.576442-2-bruce.ashfield@gmail.com
State Accepted, archived
Commit 3809e8255e65c0013bf2012559b825be6c1221d0
Headers show
Series [1/2] linux-yocto/6.6: update to v6.6.45 | expand

Commit Message

Bruce Ashfield Aug. 13, 2024, 7:57 p.m. UTC
From: Bruce Ashfield <bruce.ashfield@gmail.com>

Integrating the following commit(s) to linux-yocto/.:

1/1 [
    Author: Bruce Ashfield
    Email: bruce.ashfield@gmail.com
    Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
    Date: Tue, 13 Aug 2024 15:17:10 -0400

    We are getting the following warning in recent 6.6+ kernels:

        WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:

        [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
        [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
        [INFO]: raw config text:

            config MTD_NAND_FSL_IFC
                    tristate "Freescale IFC NAND controller"
                    depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
                    help
                      Various Freescale chips e.g P1010, include a NAND Flash machine
                      with built-in hardware ECC capabilities.
                      Enabling this option will enable you to use this to control
                      external NAND devices.

            Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
                    FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
            Parent dependencies are:
                 SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
        [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies

    The most significant missing option that is disabling this config value
    is FSL_SOC, which is only defined in arch/powerpc.

    As such, there's no sense keeping this option in the genericarm64 config
    as it is only enabled via arch/powerpc.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---

Jon,

Let me know if these seems ok to you.

Bruce

 meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jon Mason Aug. 13, 2024, 8:50 p.m. UTC | #1
On Tue, Aug 13, 2024 at 03:57:52PM -0400, bruce.ashfield@gmail.com wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> 
> Integrating the following commit(s) to linux-yocto/.:
> 
> 1/1 [
>     Author: Bruce Ashfield
>     Email: bruce.ashfield@gmail.com
>     Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
>     Date: Tue, 13 Aug 2024 15:17:10 -0400
> 
>     We are getting the following warning in recent 6.6+ kernels:
> 
>         WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:
> 
>         [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
>         [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
>         [INFO]: raw config text:
> 
>             config MTD_NAND_FSL_IFC
>                     tristate "Freescale IFC NAND controller"
>                     depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
>                     help
>                       Various Freescale chips e.g P1010, include a NAND Flash machine
>                       with built-in hardware ECC capabilities.
>                       Enabling this option will enable you to use this to control
>                       external NAND devices.
> 
>             Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
>                     FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
>             Parent dependencies are:
>                  SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
>         [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies
> 
>     The most significant missing option that is disabling this config value
>     is FSL_SOC, which is only defined in arch/powerpc.
> 
>     As such, there's no sense keeping this option in the genericarm64 config
>     as it is only enabled via arch/powerpc.
> 
>     Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ]
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> 
> Jon,
> 
> Let me know if these seems ok to you.

Yes, I just started seeing this in my CI today, but hadn't gotten to looking at it.
A very quick look at the kernel, I see arm64 has ARCH_LAYERSCAPE,
which references MTD_NAND_FSL_IFC.  I think this is the actual cause of the desire
to have this code.  So, we probably want to keep this in the generic
image (as layerscape is what the lx2k/honeycomb platform(s) use).
Is there a reason not to enable FSL_IFC in the config?



FYI, I'm seeing a config fragment warning (which I've also not gotten
around to fixing) with Xen and qemuarm/qemuarm64.

WARNING: linux-yocto-6.10.3+git-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
[INFO]: the following symbols were not found in the active configuration:
     - CONFIG_FB_SYS_FOPS

See https://gitlab.com/jonmason00/meta-arm/-/jobs/7574214060
https://gitlab.com/jonmason00/meta-arm/-/jobs/7574213986

I think this can just be removed, as I don't see it in the kernel
anymore.

Thanks,
Jon

> 
> Bruce
> 
>  meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
>  meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
>  meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> index ae56e8a129..c3b4fc1e9b 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> @@ -15,7 +15,7 @@ python () {
>  }
>  
>  SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
> -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
>  
>  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
>             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> index b0e4ab71ae..1c8cfd7d74 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> @@ -18,7 +18,7 @@ KMETA = "kernel-meta"
>  KCONF_BSP_AUDIT_LEVEL = "2"
>  
>  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
>  
>  PV = "${LINUX_VERSION}+git"
>  
> diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> index 5688a4b109..948f46621b 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> @@ -32,7 +32,7 @@ SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
>  SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
>  SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
>  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
>  
>  # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
>  # get the <version>/base branch, which is pure upstream -stable, and the same
> -- 
> 2.39.2
> 
>
Bruce Ashfield Aug. 13, 2024, 9:02 p.m. UTC | #2
On Tue, Aug 13, 2024 at 4:51 PM Jon Mason <jdmason@kudzu.us> wrote:
>
> On Tue, Aug 13, 2024 at 03:57:52PM -0400, bruce.ashfield@gmail.com wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Integrating the following commit(s) to linux-yocto/.:
> >
> > 1/1 [
> >     Author: Bruce Ashfield
> >     Email: bruce.ashfield@gmail.com
> >     Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
> >     Date: Tue, 13 Aug 2024 15:17:10 -0400
> >
> >     We are getting the following warning in recent 6.6+ kernels:
> >
> >         WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:
> >
> >         [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
> >         [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
> >         [INFO]: raw config text:
> >
> >             config MTD_NAND_FSL_IFC
> >                     tristate "Freescale IFC NAND controller"
> >                     depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
> >                     help
> >                       Various Freescale chips e.g P1010, include a NAND Flash machine
> >                       with built-in hardware ECC capabilities.
> >                       Enabling this option will enable you to use this to control
> >                       external NAND devices.
> >
> >             Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
> >                     FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
> >             Parent dependencies are:
> >                  SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
> >         [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies
> >
> >     The most significant missing option that is disabling this config value
> >     is FSL_SOC, which is only defined in arch/powerpc.
> >
> >     As such, there's no sense keeping this option in the genericarm64 config
> >     as it is only enabled via arch/powerpc.
> >
> >     Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ]
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> >
> > Jon,
> >
> > Let me know if these seems ok to you.
>
> Yes, I just started seeing this in my CI today, but hadn't gotten to looking at it.
> A very quick look at the kernel, I see arm64 has ARCH_LAYERSCAPE,
> which references MTD_NAND_FSL_IFC.  I think this is the actual cause of the desire
> to have this code.  So, we probably want to keep this in the generic
> image (as layerscape is what the lx2k/honeycomb platform(s) use).
> Is there a reason not to enable FSL_IFC in the config?
>

It depends on FSL_SOC .. which is only enabled via arch/powerpc.

>
>
> FYI, I'm seeing a config fragment warning (which I've also not gotten
> around to fixing) with Xen and qemuarm/qemuarm64.
>
> WARNING: linux-yocto-6.10.3+git-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
> [INFO]: the following symbols were not found in the active configuration:
>      - CONFIG_FB_SYS_FOPS
>
> See https://gitlab.com/jonmason00/meta-arm/-/jobs/7574214060
> https://gitlab.com/jonmason00/meta-arm/-/jobs/7574213986
>
> I think this can just be removed, as I don't see it in the kernel
> anymore.

That''s already fixed in the recent bumps that I've been sending
Richard.

https://git.yoctoproject.org/yocto-kernel-cache/commit/?h=yocto-6.10&id=107c15b3ee3f07842384208ea021588d589e51ef

Maybe your meta SRCREVS are different ?

Bruce

>
> Thanks,
> Jon
>
> >
> > Bruce
> >
> >  meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
> >  meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
> >  meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > index ae56e8a129..c3b4fc1e9b 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > @@ -15,7 +15,7 @@ python () {
> >  }
> >
> >  SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
> > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> >
> >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
> >             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > index b0e4ab71ae..1c8cfd7d74 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > @@ -18,7 +18,7 @@ KMETA = "kernel-meta"
> >  KCONF_BSP_AUDIT_LEVEL = "2"
> >
> >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> >
> >  PV = "${LINUX_VERSION}+git"
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > index 5688a4b109..948f46621b 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > @@ -32,7 +32,7 @@ SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> >  SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> >  SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
> >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> >
> >  # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
> >  # get the <version>/base branch, which is pure upstream -stable, and the same
> > --
> > 2.39.2
> >
> >
Bruce Ashfield Aug. 13, 2024, 9:05 p.m. UTC | #3
On Tue, Aug 13, 2024 at 5:02 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Tue, Aug 13, 2024 at 4:51 PM Jon Mason <jdmason@kudzu.us> wrote:
> >
> > On Tue, Aug 13, 2024 at 03:57:52PM -0400, bruce.ashfield@gmail.com wrote:
> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >
> > > Integrating the following commit(s) to linux-yocto/.:
> > >
> > > 1/1 [
> > >     Author: Bruce Ashfield
> > >     Email: bruce.ashfield@gmail.com
> > >     Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
> > >     Date: Tue, 13 Aug 2024 15:17:10 -0400
> > >
> > >     We are getting the following warning in recent 6.6+ kernels:
> > >
> > >         WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:
> > >
> > >         [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
> > >         [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
> > >         [INFO]: raw config text:
> > >
> > >             config MTD_NAND_FSL_IFC
> > >                     tristate "Freescale IFC NAND controller"
> > >                     depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
> > >                     help
> > >                       Various Freescale chips e.g P1010, include a NAND Flash machine
> > >                       with built-in hardware ECC capabilities.
> > >                       Enabling this option will enable you to use this to control
> > >                       external NAND devices.
> > >
> > >             Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
> > >                     FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
> > >             Parent dependencies are:
> > >                  SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
> > >         [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies
> > >
> > >     The most significant missing option that is disabling this config value
> > >     is FSL_SOC, which is only defined in arch/powerpc.
> > >
> > >     As such, there's no sense keeping this option in the genericarm64 config
> > >     as it is only enabled via arch/powerpc.
> > >
> > >     Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ]
> > >
> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ---
> > >
> > > Jon,
> > >
> > > Let me know if these seems ok to you.
> >
> > Yes, I just started seeing this in my CI today, but hadn't gotten to looking at it.
> > A very quick look at the kernel, I see arm64 has ARCH_LAYERSCAPE,
> > which references MTD_NAND_FSL_IFC.  I think this is the actual cause of the desire
> > to have this code.  So, we probably want to keep this in the generic
> > image (as layerscape is what the lx2k/honeycomb platform(s) use).
> > Is there a reason not to enable FSL_IFC in the config?
> >
>
> It depends on FSL_SOC .. which is only enabled via arch/powerpc.

I misread that, yah, FSL_SOC is in the || condition, so isn't the critical part.

if you want to enable the missing dependency, then it should also be something
resolvable that way.

My changes are already pushed,  so you'll need to send an update that
turns it back on and adds the missing dependency.

My only goal was to get the warning removed. I'm exiting the discussion
and will await patches, since I have no opinion on how to solve it with
respect to arch/arm.

Cheers,

Bruce

>
> >
> >
> > FYI, I'm seeing a config fragment warning (which I've also not gotten
> > around to fixing) with Xen and qemuarm/qemuarm64.
> >
> > WARNING: linux-yocto-6.10.3+git-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
> > [INFO]: the following symbols were not found in the active configuration:
> >      - CONFIG_FB_SYS_FOPS
> >
> > See https://gitlab.com/jonmason00/meta-arm/-/jobs/7574214060
> > https://gitlab.com/jonmason00/meta-arm/-/jobs/7574213986
> >
> > I think this can just be removed, as I don't see it in the kernel
> > anymore.
>
> That''s already fixed in the recent bumps that I've been sending
> Richard.
>
> https://git.yoctoproject.org/yocto-kernel-cache/commit/?h=yocto-6.10&id=107c15b3ee3f07842384208ea021588d589e51ef
>
> Maybe your meta SRCREVS are different ?
>
> Bruce
>
> >
> > Thanks,
> > Jon
> >
> > >
> > > Bruce
> > >
> > >  meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
> > >  meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
> > >  meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
> > >  3 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > index ae56e8a129..c3b4fc1e9b 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > @@ -15,7 +15,7 @@ python () {
> > >  }
> > >
> > >  SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
> > >             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > index b0e4ab71ae..1c8cfd7d74 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > @@ -18,7 +18,7 @@ KMETA = "kernel-meta"
> > >  KCONF_BSP_AUDIT_LEVEL = "2"
> > >
> > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  PV = "${LINUX_VERSION}+git"
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > index 5688a4b109..948f46621b 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > @@ -32,7 +32,7 @@ SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > >  SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > >  SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
> > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
> > >  # get the <version>/base branch, which is pure upstream -stable, and the same
> > > --
> > > 2.39.2
> > >
> > >
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
Jon Mason Aug. 13, 2024, 9:39 p.m. UTC | #4
On Tue, Aug 13, 2024 at 05:05:49PM -0400, Bruce Ashfield wrote:
> On Tue, Aug 13, 2024 at 5:02 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >
> > On Tue, Aug 13, 2024 at 4:51 PM Jon Mason <jdmason@kudzu.us> wrote:
> > >
> > > On Tue, Aug 13, 2024 at 03:57:52PM -0400, bruce.ashfield@gmail.com wrote:
> > > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > >
> > > > Integrating the following commit(s) to linux-yocto/.:
> > > >
> > > > 1/1 [
> > > >     Author: Bruce Ashfield
> > > >     Email: bruce.ashfield@gmail.com
> > > >     Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
> > > >     Date: Tue, 13 Aug 2024 15:17:10 -0400
> > > >
> > > >     We are getting the following warning in recent 6.6+ kernels:
> > > >
> > > >         WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:
> > > >
> > > >         [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
> > > >         [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
> > > >         [INFO]: raw config text:
> > > >
> > > >             config MTD_NAND_FSL_IFC
> > > >                     tristate "Freescale IFC NAND controller"
> > > >                     depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
> > > >                     help
> > > >                       Various Freescale chips e.g P1010, include a NAND Flash machine
> > > >                       with built-in hardware ECC capabilities.
> > > >                       Enabling this option will enable you to use this to control
> > > >                       external NAND devices.
> > > >
> > > >             Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
> > > >                     FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
> > > >             Parent dependencies are:
> > > >                  SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
> > > >         [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies
> > > >
> > > >     The most significant missing option that is disabling this config value
> > > >     is FSL_SOC, which is only defined in arch/powerpc.
> > > >
> > > >     As such, there's no sense keeping this option in the genericarm64 config
> > > >     as it is only enabled via arch/powerpc.
> > > >
> > > >     Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > > ]
> > > >
> > > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > > ---
> > > >
> > > > Jon,
> > > >
> > > > Let me know if these seems ok to you.
> > >
> > > Yes, I just started seeing this in my CI today, but hadn't gotten to looking at it.
> > > A very quick look at the kernel, I see arm64 has ARCH_LAYERSCAPE,
> > > which references MTD_NAND_FSL_IFC.  I think this is the actual cause of the desire
> > > to have this code.  So, we probably want to keep this in the generic
> > > image (as layerscape is what the lx2k/honeycomb platform(s) use).
> > > Is there a reason not to enable FSL_IFC in the config?
> > >
> >
> > It depends on FSL_SOC .. which is only enabled via arch/powerpc.
> 
> I misread that, yah, FSL_SOC is in the || condition, so isn't the critical part.
> 
> if you want to enable the missing dependency, then it should also be something
> resolvable that way.
> 
> My changes are already pushed,  so you'll need to send an update that
> turns it back on and adds the missing dependency.
> 
> My only goal was to get the warning removed. I'm exiting the discussion
> and will await patches, since I have no opinion on how to solve it with
> respect to arch/arm.

That's fair.  I'm sure if it's a problem, we'll know about it soon
enough (though I don't expect that it is).

Thanks,
Jon

> 
> Cheers,
> 
> Bruce
> 
> >
> > >
> > >
> > > FYI, I'm seeing a config fragment warning (which I've also not gotten
> > > around to fixing) with Xen and qemuarm/qemuarm64.
> > >
> > > WARNING: linux-yocto-6.10.3+git-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
> > > [INFO]: the following symbols were not found in the active configuration:
> > >      - CONFIG_FB_SYS_FOPS
> > >
> > > See https://gitlab.com/jonmason00/meta-arm/-/jobs/7574214060
> > > https://gitlab.com/jonmason00/meta-arm/-/jobs/7574213986
> > >
> > > I think this can just be removed, as I don't see it in the kernel
> > > anymore.
> >
> > That''s already fixed in the recent bumps that I've been sending
> > Richard.
> >
> > https://git.yoctoproject.org/yocto-kernel-cache/commit/?h=yocto-6.10&id=107c15b3ee3f07842384208ea021588d589e51ef
> >
> > Maybe your meta SRCREVS are different ?
> >
> > Bruce
> >
> > >
> > > Thanks,
> > > Jon
> > >
> > > >
> > > > Bruce
> > > >
> > > >  meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
> > > >  meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
> > > >  meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
> > > >  3 files changed, 3 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > > index ae56e8a129..c3b4fc1e9b 100644
> > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > > @@ -15,7 +15,7 @@ python () {
> > > >  }
> > > >
> > > >  SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
> > > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > > >
> > > >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
> > > >             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
> > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > > index b0e4ab71ae..1c8cfd7d74 100644
> > > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > > @@ -18,7 +18,7 @@ KMETA = "kernel-meta"
> > > >  KCONF_BSP_AUDIT_LEVEL = "2"
> > > >
> > > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > > >
> > > >  PV = "${LINUX_VERSION}+git"
> > > >
> > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > > index 5688a4b109..948f46621b 100644
> > > > --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > > +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > > @@ -32,7 +32,7 @@ SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > >  SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > >  SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
> > > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > > >
> > > >  # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
> > > >  # get the <version>/base branch, which is pure upstream -stable, and the same
> > > > --
> > > > 2.39.2
> > > >
> > > >
> >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
> 
> 
> 
> -- 
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
Jon Mason Aug. 13, 2024, 9:45 p.m. UTC | #5
On Tue, Aug 13, 2024 at 05:02:34PM -0400, Bruce Ashfield wrote:
> On Tue, Aug 13, 2024 at 4:51 PM Jon Mason <jdmason@kudzu.us> wrote:
> >
> > On Tue, Aug 13, 2024 at 03:57:52PM -0400, bruce.ashfield@gmail.com wrote:
> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >
> > > Integrating the following commit(s) to linux-yocto/.:
> > >
> > > 1/1 [
> > >     Author: Bruce Ashfield
> > >     Email: bruce.ashfield@gmail.com
> > >     Subject: genericarm64: drop CONFIG_MTD_NAND_FSL_IFC
> > >     Date: Tue, 13 Aug 2024 15:17:10 -0400
> > >
> > >     We are getting the following warning in recent 6.6+ kernels:
> > >
> > >         WARNING: linux-yocto-6.6.45+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:
> > >
> > >         [NOTE]: 'CONFIG_MTD_NAND_FSL_IFC' last val (y) and .config val (n) do not match
> > >         [INFO]: CONFIG_MTD_NAND_FSL_IFC : n
> > >         [INFO]: raw config text:
> > >
> > >             config MTD_NAND_FSL_IFC
> > >                     tristate "Freescale IFC NAND controller"
> > >                     depends on (FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST) && HAS_IOMEM && FSL_IFC && MTD_RAW_NAND && MTD
> > >                     help
> > >                       Various Freescale chips e.g P1010, include a NAND Flash machine
> > >                       with built-in hardware ECC capabilities.
> > >                       Enabling this option will enable you to use this to control
> > >                       external NAND devices.
> > >
> > >             Config 'MTD_NAND_FSL_IFC' has the following Direct dependencies (MTD_NAND_FSL_IFC=n):
> > >                     FSL_SOC(undefined/n) || ARCH_LAYERSCAPE(=y) || SOC_LS1021A(undefined/n) || COMPILE_TEST(=n) (=y) && HAS_IOMEM(=y) && FSL_IFC(=n) && MTD_RAW_NAND(=y) && MTD(=y)
> > >             Parent dependencies are:
> > >                  SOC_LS1021A [SOC_LS1021A] MTD [y] ARCH_LAYERSCAPE [y] HAS_IOMEM [y] FSL_SOC [FSL_SOC] COMPILE_TEST [n] MTD_RAW_NAND [y] FSL_IFC [n]
> > >         [INFO]: config 'CONFIG_MTD_NAND_FSL_IFC' was set, but it wasn't assignable, check (parent) dependencies
> > >
> > >     The most significant missing option that is disabling this config value
> > >     is FSL_SOC, which is only defined in arch/powerpc.
> > >
> > >     As such, there's no sense keeping this option in the genericarm64 config
> > >     as it is only enabled via arch/powerpc.
> > >
> > >     Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ]
> > >
> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ---
> > >
> > > Jon,
> > >
> > > Let me know if these seems ok to you.
> >
> > Yes, I just started seeing this in my CI today, but hadn't gotten to looking at it.
> > A very quick look at the kernel, I see arm64 has ARCH_LAYERSCAPE,
> > which references MTD_NAND_FSL_IFC.  I think this is the actual cause of the desire
> > to have this code.  So, we probably want to keep this in the generic
> > image (as layerscape is what the lx2k/honeycomb platform(s) use).
> > Is there a reason not to enable FSL_IFC in the config?
> >
> 
> It depends on FSL_SOC .. which is only enabled via arch/powerpc.
> 
> >
> >
> > FYI, I'm seeing a config fragment warning (which I've also not gotten
> > around to fixing) with Xen and qemuarm/qemuarm64.
> >
> > WARNING: linux-yocto-6.10.3+git-r0 do_kernel_configcheck: [kernel config]: This BSP contains fragments with warnings:
> > [INFO]: the following symbols were not found in the active configuration:
> >      - CONFIG_FB_SYS_FOPS
> >
> > See https://gitlab.com/jonmason00/meta-arm/-/jobs/7574214060
> > https://gitlab.com/jonmason00/meta-arm/-/jobs/7574213986
> >
> > I think this can just be removed, as I don't see it in the kernel
> > anymore.
> 
> That''s already fixed in the recent bumps that I've been sending
> Richard.
> 
> https://git.yoctoproject.org/yocto-kernel-cache/commit/?h=yocto-6.10&id=107c15b3ee3f07842384208ea021588d589e51ef
> 
> Maybe your meta SRCREVS are different ?

It's from this morning, but I do expect it lacks your fixes.  Thanks.

Seems like my CI is unhappy today.  Very convenient that Ross is on holiday, almost as if he planned it that way.

> 
> Bruce
> 
> >
> > Thanks,
> > Jon
> >
> > >
> > > Bruce
> > >
> > >  meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb   | 2 +-
> > >  meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +-
> > >  meta/recipes-kernel/linux/linux-yocto_6.6.bb      | 2 +-
> > >  3 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > index ae56e8a129..c3b4fc1e9b 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
> > > @@ -15,7 +15,7 @@ python () {
> > >  }
> > >
> > >  SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
> > >             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > index b0e4ab71ae..1c8cfd7d74 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
> > > @@ -18,7 +18,7 @@ KMETA = "kernel-meta"
> > >  KCONF_BSP_AUDIT_LEVEL = "2"
> > >
> > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  PV = "${LINUX_VERSION}+git"
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > index 5688a4b109..948f46621b 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
> > > @@ -32,7 +32,7 @@ SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > >  SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > >  SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
> > >  SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
> > > -SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
> > > +SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
> > >
> > >  # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
> > >  # get the <version>/base branch, which is pure upstream -stable, and the same
> > > --
> > > 2.39.2
> > >
> > >
> 
> 
> 
> -- 
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
Richard Purdie Aug. 13, 2024, 9:49 p.m. UTC | #6
On Tue, 2024-08-13 at 17:45 -0400, Jon Mason wrote:
> On Tue, Aug 13, 2024 at 05:02:34PM -0400, Bruce Ashfield wrote:
> > 
> > That''s already fixed in the recent bumps that I've been sending
> > Richard.
> > 
> > https://git.yoctoproject.org/yocto-kernel-cache/commit/?h=yocto-6.10&id=107c15b3ee3f07842384208ea021588d589e51ef
> > 
> > Maybe your meta SRCREVS are different ?
> 
> It's from this morning, but I do expect it lacks your fixes.  Thanks.
> 
> Seems like my CI is unhappy today.  Very convenient that Ross is on
> holiday, almost as if he planned it that way.

Just be thankful he didn't send the experimental code he was working on
last minute as he couldn't get it stable enough to share!

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index ae56e8a129..c3b4fc1e9b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -15,7 +15,7 @@  python () {
 }
 
 SRCREV_machine ?= "9a1d7ebfd75c70dcec660e18124a37de469e68b4"
-SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
+SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index b0e4ab71ae..1c8cfd7d74 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -18,7 +18,7 @@  KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
-SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
+SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
 
 PV = "${LINUX_VERSION}+git"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 5688a4b109..948f46621b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -32,7 +32,7 @@  SRCREV_machine:qemux86 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
 SRCREV_machine:qemux86-64 ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
 SRCREV_machine:qemumips64 ?= "97d2336ea9ce4eac6b30a75b26f33b83827d38aa"
 SRCREV_machine ?= "e402da9835bfae267f409a48c3a2cb6e231f9d94"
-SRCREV_meta ?= "e55e4407942bae43ef8ba463b38e48995b023187"
+SRCREV_meta ?= "9901a21dd1f99c833d8e1a58b3fc057e57bda598"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same