Revert "mtd: nand: Kill the chip->scan_bbt() hook" ...

This reverts commit 95ce697.

Merge branch 'for-next/mtd'

Merge branch 'for-next/imx'

mtd: core: Fix erase area alignment for non power of 2 erasesize ...

On Thu, Jan 10, 2019 at 09:32:07AM +0100, Sascha Hauer wrote:
> On Wed, Jan 09, 2019 at 12:28:14PM +0100, Ladislav Michl wrote:
> > Devices as AT45DB161 DataFlash uses non power of two page size (528)
> > while present alignment algorithm relies on erasesize being power
> > of 2.
> > Fix that by introducing helper functions rounding to any multiply.
> > Note that logic is sligthly changed to be consistent as ending
> > address is moved forward to include also last byte meant to be
> > erased while previous implementation moved it backward.
> >
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> >  drivers/mtd/core.c     | 28 ++++++++++++++++++++++------
> >  include/linux/kernel.h |  5 +++++
> >  2 files changed, 27 insertions(+), 6 deletions(-)
>
> Applied, thanks

Hi Sascha,

I was searching for paper bag, but was unable to find anything thick
enouh to cover behind :-/ This version is buggy and I noticed right
now when testing on another board. Corrected version follows, which
is also 192 bytes shorter for my ARM target. It seems next branch
at https://git.pengutronix.de/ is not yet updated, so perhaps my fault
won't affect anyone.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: core: Fix erase area alignment for non power of 2 erasesize ...

Devices as AT45DB161 DataFlash uses non power of two page size (528)
while present alignment algorithm relies on erasesize being power
of 2.
Fix that by introducing helper functions rounding to any multiply.
Note that logic is sligthly changed to be consistent as ending
address is moved forward to include also last byte meant to be
erased while previous implementation moved it backward.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: unbreak BCH8 support ...

We now tell the NAND layer that we have subpages with 512 bytes each.
This means the calculate_ecc / correct hooks are also called for each
subpage which means we cannot iterate over subpages in the calculate_ecc
callback.

Implement this correctly by removing the loop over subpages in the
calculate_ecc callback and by implementing a read_page callback.

With this the bch8_hw and bch8_hw_romcode were tested on AM335x, OMAP4
and AM3517. Number of bitflips is correctly reported as tested with the
nand_bitflip tool.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

With fix from Teresa:

Using BCH rom code mode we start calculating with GPMC_BCH_RESULTx_1.
Fix offset for correct error correction.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: nand_base: Fix compile warning if CONFIG_MTD_WRITE is not enabled ...

drivers/mtd/nand/nand_base.c:337:12: warning: 'nand_default_block_markbad'
defined but not used [-Wunused-function]

Add __maybe_unused again to silence warning when CONFIG_MTD_WRITE is not enabled.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: detect OOB size for Toshiba 24nm raw SLC ...

Linux commit 60c673824561.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: Kill cellinfo ...

The only information used from cellinfo field is whenever flash is SLC
or MLC, therefore eliminate it completely. This patch is based on Linux
commit 7db906b79f69.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: Kill the chip->scan_bbt() hook ...

Linux commit e80eba758151 adapted for Barebox:

  None of the existing drivers are overloading the ->scan_bbt()
  method, let's get rid of it and replace calls to ->scan_bbt()
  by nand_create_bbt() ones.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: scan for next free bbt block if writing bbt fails ...

Linux commit 10ffd570f117 adapted for Barebox:

  If erasing or writing the BBT fails, we should mark the current BBT
  block as bad and use the BBT descriptor to scan for the next available
  unused block in the BBT. We should only return a failure if there isn't
  any space left.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: Move BBT block selection logic out of write_bbt() ...

Linux commit c3baf278d3bf adapted for Barebox:

  This clarifies the write_bbt() function by removing the write label
  and simplifying the error/exit path.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: unify/fix error handling in nand_scan_bbt() ...

Linux commit 83c59542d0af adapted for Barebox:

  Don't leak this->bbt, and return early if check_create() fails. It helps
  to have a single error path to avoid these problems.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: make nand_scan_bbt() static ...

Linux commit 17799359e7b adapted for Barebox:

  This implementation detail is no longer needed outside of nand_bbt.c.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: handle error case for nand_create_badblock_pattern() ...

Linux commit abb9cf78e80a adapted for Barebox.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES ...

Linux commit 5961ad2cb4dd adapted for Barebox:

  Now that the last user of NAND_BBT_SCANALLPAGES has been removed, let's
  kill this peculiar BBT feature flag.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: simplify nand_bch_init() usage ...

Linux commit a8c65d504e0b modified for Barebox:

  nand_bch_init() requires several arguments which could directly be deduced
  from the mtd device. Get rid of those useless parameters.

  nand_bch_init() is also requiring the caller to provide a proper eccbytes
  value, while this value could be deduced from the ecc.size and
  ecc.strength value. Fallback to eccbytes calculation when it is set to 0.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: atmel_nand: Add per board ECC setup ...

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: Request strength instead of bytes for soft BCH ...

Linux commits e0377cdebaf3 and 438320dd34a4 combined and adapted
for Barebox:

  Previously, we requested that drivers pass ecc.size and ecc.bytes when
  using NAND_ECC_SOFT_BCH. However, a driver is likely to only know the ECC
  strength required for its NAND, so each driver would need to perform a
  strength-to-bytes calculation.

  Avoid duplicating this calculation in each driver by asking drivers to
  pass ecc.size and ecc.strength so that the strength-to-bytes calculation
  need only be implemented once.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: remove NAND_BBT_SCANEMPTY ...

Relevant part of Linux commit dad2256269cb:

  NAND_BBT_SCANEMPTY is a strange, badly-supported option with omap as its
  single remaining user.

  NAND_BBT_SCANEMPTY was likely used by accident in omap2[1]. And anyway,
  omap2 doesn't scan the chip for bad blocks (courtesy of
  NAND_SKIP_BBTSCAN), and so its use of this option is irrelevant.

  This patch drops the NAND_BBT_SCANEMPTY option.

  [1] http://lists.infradead.org/pipermail/linux-mtd/2012-July/042902.html

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: hide in-memory BBT implementation details ...

Linux commit b32843b772db adapted for Barebox:

  nand_base.c shouldn't have to know the implementation details of
  nand_bbt's in-memory BBT. Specifically, nand_base shouldn't perform the
  bit masking and shifting to isolate a BBT entry.

  Instead, just move some of the BBT code into a new nand_markbad_bbt()
  interface. This interface allows external users (i.e., nand_base) to
  mark a single block as bad in the BBT. Then nand_bbt will take care of
  modifying the in-memory BBT and updating the flash-based BBT (if
  applicable).

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: remove multiplied-by-2 block logic ...

Linux commit b4d20d601f1e adapted for Barebox

  This patch removes any points where the block number is
  doubled/halved/otherwise-shifted, instead representing the block
  number in its most natural form: as the actual block number.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: refactor chip->block_markbad interface ...

Linux commit 5a0edb251ae9 adapted for Barebox:

  The chip->block_markbad pointer should really only be responsible for
  writing a bad block marker for new bad blocks. It should not take care
  of BBT-related functionality, nor should it handle bookkeeping of bad
  block stats.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: set eccbytes correctly ...

The total number of ecc bytes per page must be provided to the
nand core. This patch fixes this for bch8_hw and bch8_hw_romcode.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: fix bch8_hw_romcode ecc layout ...

The ecc layout we provide to the nand core is broken since
00f119a293. Before this commit ecc bytes/size were per page
and now they are per subpage. The offset for the first ecc
byte was calculated as oob_end - num_ecc_bytes which must
now become oob_end - num_ecc_bytes * ecc_steps.

Fixes: 00f119a293 ("mtd: omap gpmc: fix ecc bytes/size")

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: remove unused function argument ...

__omap_calculate_ecc doesn't use the provided buffer argument, so remove
it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: Disable subpage reads in hardware ecc mode ...

Once the driver has started in software ECC mode the NAND core will set
the NAND_SUBPAGE_READ flag. We have to clear it explicitly when we
change to another mode afterwards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: Fix hamming correct return values ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: omap: Use dev_dbg when a struct device * is available ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/mtd'