Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200518084021.64cbf411@canb.auug.org.au>
In-Reply-To: <20200518084021.64cbf411@canb.auug.org.au>
From:   Richard Weinberger <richard.weinberger@gmail.com>
Date:   Mon, 18 May 2020 01:02:54 +0200
Message-ID: <CAFLxGvy-MytQLhrju0cBaC5rz-80XA29R4EU_eh9LC670h2H5w@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the mtd-fixes tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Boris Brezillon <boris.brezillon@collabora.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        Richard Weinberger <richard@nod.at>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, May 18, 2020 at 12:41 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the mtd-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /home/sfr/next/next/drivers/mtd/nand/spi/core.c: In function 'spinand_init':
> /home/sfr/next/next/drivers/mtd/nand/spi/core.c:1093:26: error: 'struct nand_device' has no member named 'ecc'
>  1093 |  mtd->ecc_strength = nand->ecc.ctx.conf.strength;
>       |                          ^~
> /home/sfr/next/next/drivers/mtd/nand/spi/core.c:1094:27: error: 'struct nand_device' has no member named 'ecc'
>  1094 |  mtd->ecc_step_size = nand->ecc.ctx.conf.step_size;
>       |                           ^~
>
> Caused by commit
>
>   d5baa0ec83de ("mtd: spinand: Propagate ECC information to the MTD structure")
>
> "This fix depends on recent changes and should not be backported as-is." ?

Urgh, yes.
This patch slipped in.

Anyway, Miquel, the ready-to-backport diff would be this?

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 248c4d7a0cf4..e2c382ffc5b6 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -1090,8 +1090,8 @@ static int spinand_init(struct spinand_device *spinand)
        mtd->oobavail = ret;

        /* Propagate ECC information to mtd_info */
-       mtd->ecc_strength = nand->ecc.ctx.conf.strength;
-       mtd->ecc_step_size = nand->ecc.ctx.conf.step_size;
+       mtd->ecc_strength = nand->eccreq.strength;
+       mtd->ecc_step_size = nand->eccreq.step_size;

        return 0;

-- 
Thanks,
//richard