On Thu, 24 Jan 2019 13:48:06 +0100 Stefan Roese <sr@xxxxxxx> wrote: > Add support for GigaDevice GD5F1GQ4UExxG SPI NAND chip. ^ Looks like this U could be an x, as it only encodes the voltage and should not imply functional changes. The function and macro names should be updated accordingly. Looks good otherwise: Reviewed-by: Boris Brezillon <bbrezillon@xxxxxxxxxx> > > Signed-off-by: Stefan Roese <sr@xxxxxxx> > Cc: Chuanhong Guo <gch981213@xxxxxxxxx> > Cc: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx> > Cc: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> > Cc: Boris Brezillon <bbrezillon@xxxxxxxxxx> > --- > v2: > - Name of NAND device changed to better reflect the real part > - OOB layout changed to only reserve 1 byte for BBT > - Use ECC caps 8bits/512bytes instead of 8bits/2048bytes > - Enhanced ecc_get_status() function to determine and report > a more fine grained bit error status > > drivers/mtd/nand/spi/gigadevice.c | 83 +++++++++++++++++++++++++++++++ > 1 file changed, 83 insertions(+) > > diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c > index e4141c20947a..0b49d8264bef 100644 > --- a/drivers/mtd/nand/spi/gigadevice.c > +++ b/drivers/mtd/nand/spi/gigadevice.c > @@ -12,6 +12,8 @@ > #define GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS (1 << 4) > #define GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS (3 << 4) > > +#define GD5FXGQ4UEXXG_REG_STATUS2 0xf0 > + > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > @@ -81,11 +83,83 @@ static int gd5fxgq4xa_ecc_get_status(struct spinand_device *spinand, > return -EINVAL; > } > > +static int gd5fxgq4uexxg_ooblayout_ecc(struct mtd_info *mtd, int section, > + struct mtd_oob_region *region) > +{ > + if (section) > + return -ERANGE; > + > + region->offset = 64; > + region->length = 64; > + > + return 0; > +} > + > +static int gd5fxgq4uexxg_ooblayout_free(struct mtd_info *mtd, int section, > + struct mtd_oob_region *region) > +{ > + if (section) > + return -ERANGE; > + > + /* Reserve 1 bytes for the BBM. */ > + region->offset = 1; > + region->length = 63; > + > + return 0; > +} > + > +static int gd5fxgq4uexxg_ecc_get_status(struct spinand_device *spinand, > + u8 status) > +{ > + u8 status2; > + struct spi_mem_op op = SPINAND_GET_FEATURE_OP(GD5FXGQ4UEXXG_REG_STATUS2, > + &status2); > + int ret; > + > + switch (status & STATUS_ECC_MASK) { > + case STATUS_ECC_NO_BITFLIPS: > + return 0; > + > + case GD5FXGQ4XA_STATUS_ECC_1_7_BITFLIPS: > + /* > + * Read status2 register to determine a more fine grained > + * bit error status > + */ > + ret = spi_mem_exec_op(spinand->spimem, &op); > + if (ret) > + return ret; > + > + /* > + * 4 ... 7 bits are flipped (1..4 can't be detected, so > + * report the maximum of 4 in this case > + */ > + /* bits sorted this way (3...0): ECCS1,ECCS0,ECCSE1,ECCSE0 */ > + return ((status & STATUS_ECC_MASK) >> 2) | > + ((status2 & STATUS_ECC_MASK) >> 4); > + > + case GD5FXGQ4XA_STATUS_ECC_8_BITFLIPS: > + return 8; > + > + case STATUS_ECC_UNCOR_ERROR: > + return -EBADMSG; > + > + default: > + break; > + } > + > + return -EINVAL; > +} > + > static const struct mtd_ooblayout_ops gd5fxgq4xa_ooblayout = { > .ecc = gd5fxgq4xa_ooblayout_ecc, > .free = gd5fxgq4xa_ooblayout_free, > }; > > +static const struct mtd_ooblayout_ops gd5fxgq4uexxg_ooblayout = { > + .ecc = gd5fxgq4uexxg_ooblayout_ecc, > + .free = gd5fxgq4uexxg_ooblayout_free, > +}; > + > static const struct spinand_info gigadevice_spinand_table[] = { > SPINAND_INFO("GD5F1GQ4xA", 0xF1, > NAND_MEMORG(1, 2048, 64, 64, 1024, 1, 1, 1), > @@ -114,6 +188,15 @@ static const struct spinand_info gigadevice_spinand_table[] = { > 0, > SPINAND_ECCINFO(&gd5fxgq4xa_ooblayout, > gd5fxgq4xa_ecc_get_status)), > + SPINAND_INFO("GD5F1GQ4UExxG", 0xd1, > + NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1), > + NAND_ECCREQ(8, 512), > + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > + &write_cache_variants, > + &update_cache_variants), > + 0, > + SPINAND_ECCINFO(&gd5fxgq4uexxg_ooblayout, > + gd5fxgq4uexxg_ecc_get_status)), > }; > > static int gigadevice_spinand_detect(struct spinand_device *spinand) ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/