| Message ID | 1512366470-16772-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 4 Dec 2017 14:47:50 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > struct nand_buffers is malloc'ed in nand_scan_tail() just for > containing three pointers. Move the pointers into nand_chip > and delete struct nand_buffers. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Another possibility is to keep struct nand_buffers, > but embed it in struct nand_chip. > > struct nand_chip { > ... > > struct nand_buffers buffers; > > ... > }; > > I will follow Boris's opinion, anyway. Nope, I think it's fine to just drop the nand_buffers struct, but I'd prefer to have ecc related buffers placed in nand_ecc_ctrl: struct nand_ecc_ctrl { ... u8 *code_buf; u8 *calc_buf; ... }; or struct nand_ecc_ctrl { ... struct { u8 *code; u8 *calc; } bufs; ... }; And ideally, databuf should be placed next to pagebuf in the nand_chip struct, since those fields are tightly linked. > > > drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- > drivers/mtd/nand/cafe_nand.c | 15 ++---- > drivers/mtd/nand/denali.c | 2 +- > drivers/mtd/nand/fsmc_nand.c | 4 +- > drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 4 +- > drivers/mtd/nand/nand_base.c | 91 +++++++++++++++------------------- > drivers/mtd/nand/nand_bbt.c | 2 +- > drivers/mtd/nand/omap2.c | 10 ++-- > drivers/mtd/nand/sunxi_nand.c | 6 +-- > include/linux/mtd/rawnand.h | 23 +++------ > 10 files changed, 64 insertions(+), 95 deletions(-) > > diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c > index e0eb51d..6c9f7ec 100644 > --- a/drivers/mtd/nand/brcmnand/brcmnand.c > +++ b/drivers/mtd/nand/brcmnand/brcmnand.c > @@ -1681,7 +1681,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, > int ret; > > if (!buf) { > - buf = chip->buffers->databuf; > + buf = chip->databuf; > /* Invalidate page cache */ > chip->pagebuf = -1; > } > diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c > index bc558c4..1e54196 100644 > --- a/drivers/mtd/nand/cafe_nand.c > +++ b/drivers/mtd/nand/cafe_nand.c > @@ -613,7 +613,6 @@ static int cafe_nand_probe(struct pci_dev *pdev, > uint32_t ctrl; > int err = 0; > int old_dma; > - struct nand_buffers *nbuf; > > /* Very old versions shared the same PCI ident for all three > functions on the chip. Verify the class too... */ > @@ -732,14 +731,12 @@ static int cafe_nand_probe(struct pci_dev *pdev, > goto out_irq; > > cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, > - 2112 + sizeof(struct nand_buffers) + > - mtd->writesize + mtd->oobsize, > + 2112 + mtd->writesize + mtd->oobsize, > &cafe->dmaaddr, GFP_KERNEL); Not directly related to this patch, but cafe_nand is the last user of NAND_OWN_BUFFERS, and after looking at the code, I think it's actually not needed, because the driver uses its own bounce buffer to do DMA transfers. That'd be great if we could get rid of this flag completely and let the core allocate the buffers for everyone. Could you have a look? > if (!cafe->dmabuf) { > err = -ENOMEM; > goto out_irq; > } > - cafe->nand.buffers = nbuf = (void *)cafe->dmabuf + 2112; > > /* Set up DMA address */ > cafe_writel(cafe, cafe->dmaaddr & 0xffffffff, NAND_DMA_ADDR0); > @@ -753,9 +750,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, > cafe_readl(cafe, NAND_DMA_ADDR0), cafe->dmabuf); > > /* this driver does not need the @ecccalc and @ecccode */ > - nbuf->ecccalc = NULL; > - nbuf->ecccode = NULL; > - nbuf->databuf = (uint8_t *)(nbuf + 1); > + cafe->nand.databuf = (void *)cafe->dmabuf + 2112; > > /* Restore the DMA flag */ > usedma = old_dma; > @@ -802,8 +797,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, > > out_free_dma: > dma_free_coherent(&cafe->pdev->dev, > - 2112 + sizeof(struct nand_buffers) + > - mtd->writesize + mtd->oobsize, > + 2112 + mtd->writesize + mtd->oobsize, > cafe->dmabuf, cafe->dmaaddr); > out_irq: > /* Disable NAND IRQ in global IRQ mask register */ > @@ -830,8 +824,7 @@ static void cafe_nand_remove(struct pci_dev *pdev) > free_rs(cafe->rs); > pci_iounmap(pdev, cafe->mmio); > dma_free_coherent(&cafe->pdev->dev, > - 2112 + sizeof(struct nand_buffers) + > - mtd->writesize + mtd->oobsize, > + 2112 + mtd->writesize + mtd->oobsize, > cafe->dmabuf, cafe->dmaaddr); > kfree(cafe); > } > diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c > index 2fc964b..e1f8c6f 100644 > --- a/drivers/mtd/nand/denali.c > +++ b/drivers/mtd/nand/denali.c > @@ -328,7 +328,7 @@ static int denali_check_erased_page(struct mtd_info *mtd, > unsigned long uncor_ecc_flags, > unsigned int max_bitflips) > { > - uint8_t *ecc_code = chip->buffers->ecccode; > + uint8_t *ecc_code = chip->ecccode; > int ecc_steps = chip->ecc.steps; > int ecc_size = chip->ecc.size; > int ecc_bytes = chip->ecc.bytes; > diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c > index eac15d9..147ca3d 100644 > --- a/drivers/mtd/nand/fsmc_nand.c > +++ b/drivers/mtd/nand/fsmc_nand.c > @@ -684,8 +684,8 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > uint8_t *p = buf; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > - uint8_t *ecc_code = chip->buffers->ecccode; > + uint8_t *ecc_calc = chip->ecccalc; > + uint8_t *ecc_code = chip->ecccode; > int off, len, group = 0; > /* > * ecc_oob is intentionally taken as uint16_t. In 16bit devices, we > diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > index 50f8d4a..3312945 100644 > --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > @@ -1712,7 +1712,7 @@ static int mx23_check_transcription_stamp(struct gpmi_nand_data *this) > unsigned int search_area_size_in_strides; > unsigned int stride; > unsigned int page; > - uint8_t *buffer = chip->buffers->databuf; > + uint8_t *buffer = chip->databuf; > int saved_chip_number; > int found_an_ncb_fingerprint = false; > > @@ -1771,7 +1771,7 @@ static int mx23_write_transcription_stamp(struct gpmi_nand_data *this) > unsigned int block; > unsigned int stride; > unsigned int page; > - uint8_t *buffer = chip->buffers->databuf; > + uint8_t *buffer = chip->databuf; > int saved_chip_number; > int status; > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index 6135d00..1f8297c 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -1456,8 +1456,8 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > uint8_t *p = buf; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > - uint8_t *ecc_code = chip->buffers->ecccode; > + uint8_t *ecc_calc = chip->ecccalc; > + uint8_t *ecc_code = chip->ecccode; > unsigned int max_bitflips = 0; > > chip->ecc.read_page_raw(mtd, chip, buf, 1, page); > @@ -1529,7 +1529,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, > > /* Calculate ECC */ > for (i = 0; i < eccfrag_len ; i += chip->ecc.bytes, p += chip->ecc.size) > - chip->ecc.calculate(mtd, p, &chip->buffers->ecccalc[i]); > + chip->ecc.calculate(mtd, p, &chip->ecccalc[i]); > > /* > * The performance is faster if we position offsets according to > @@ -1563,7 +1563,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, > chip->read_buf(mtd, &chip->oob_poi[aligned_pos], aligned_len); > } > > - ret = mtd_ooblayout_get_eccbytes(mtd, chip->buffers->ecccode, > + ret = mtd_ooblayout_get_eccbytes(mtd, chip->ecccode, > chip->oob_poi, index, eccfrag_len); > if (ret) > return ret; > @@ -1572,16 +1572,16 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, > for (i = 0; i < eccfrag_len ; i += chip->ecc.bytes, p += chip->ecc.size) { > int stat; > > - stat = chip->ecc.correct(mtd, p, > - &chip->buffers->ecccode[i], &chip->buffers->ecccalc[i]); > + stat = chip->ecc.correct(mtd, p, &chip->ecccode[i], > + &chip->ecccalc[i]); > if (stat == -EBADMSG && > (chip->ecc.options & NAND_ECC_GENERIC_ERASED_CHECK)) { > /* check for empty pages with bitflips */ > stat = nand_check_erased_ecc_chunk(p, chip->ecc.size, > - &chip->buffers->ecccode[i], > - chip->ecc.bytes, > - NULL, 0, > - chip->ecc.strength); > + &chip->ecccode[i], > + chip->ecc.bytes, > + NULL, 0, > + chip->ecc.strength); > } > > if (stat < 0) { > @@ -1611,8 +1611,8 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > uint8_t *p = buf; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > - uint8_t *ecc_code = chip->buffers->ecccode; > + uint8_t *ecc_calc = chip->ecccalc; > + uint8_t *ecc_code = chip->ecccode; > unsigned int max_bitflips = 0; > > for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { > @@ -1674,8 +1674,8 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > uint8_t *p = buf; > - uint8_t *ecc_code = chip->buffers->ecccode; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > + uint8_t *ecc_code = chip->ecccode; > + uint8_t *ecc_calc = chip->ecccalc; > unsigned int max_bitflips = 0; > > /* Read the OOB area first */ > @@ -1894,7 +1894,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, > > /* Is the current page in the buffer? */ > if (realpage != chip->pagebuf || oob) { > - bufpoi = use_bufpoi ? chip->buffers->databuf : buf; > + bufpoi = use_bufpoi ? chip->databuf : buf; > > if (use_bufpoi && aligned) > pr_debug("%s: using read bounce buffer for buf@%p\n", > @@ -1938,7 +1938,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, > /* Invalidate page cache */ > chip->pagebuf = -1; > } > - memcpy(buf, chip->buffers->databuf + col, bytes); > + memcpy(buf, chip->databuf + col, bytes); > } > > if (unlikely(oob)) { > @@ -1979,7 +1979,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, > buf += bytes; > max_bitflips = max_t(unsigned int, max_bitflips, ret); > } else { > - memcpy(buf, chip->buffers->databuf + col, bytes); > + memcpy(buf, chip->databuf + col, bytes); > buf += bytes; > max_bitflips = max_t(unsigned int, max_bitflips, > chip->pagebuf_bitflips); > @@ -2403,7 +2403,7 @@ static int nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, > int i, eccsize = chip->ecc.size, ret; > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > + uint8_t *ecc_calc = chip->ecccalc; > const uint8_t *p = buf; > > /* Software ECC calculation */ > @@ -2433,7 +2433,7 @@ static int nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, > int i, eccsize = chip->ecc.size, ret; > int eccbytes = chip->ecc.bytes; > int eccsteps = chip->ecc.steps; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > + uint8_t *ecc_calc = chip->ecccalc; > const uint8_t *p = buf; > > for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { > @@ -2469,7 +2469,7 @@ static int nand_write_subpage_hwecc(struct mtd_info *mtd, > int oob_required, int page) > { > uint8_t *oob_buf = chip->oob_poi; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > + uint8_t *ecc_calc = chip->ecccalc; > int ecc_size = chip->ecc.size; > int ecc_bytes = chip->ecc.bytes; > int ecc_steps = chip->ecc.steps; > @@ -2503,7 +2503,7 @@ static int nand_write_subpage_hwecc(struct mtd_info *mtd, > > /* copy calculated ECC for whole page to chip->buffer->oob */ > /* this include masked-value(0xFF) for unwritten subpages */ > - ecc_calc = chip->buffers->ecccalc; > + ecc_calc = chip->ecccalc; > ret = mtd_ooblayout_set_eccbytes(mtd, ecc_calc, chip->oob_poi, 0, > chip->ecc.total); > if (ret) > @@ -2737,9 +2737,9 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, > if (part_pagewr) > bytes = min_t(int, bytes - column, writelen); > chip->pagebuf = -1; > - memset(chip->buffers->databuf, 0xff, mtd->writesize); > - memcpy(&chip->buffers->databuf[column], buf, bytes); > - wbuf = chip->buffers->databuf; > + memset(chip->databuf, 0xff, mtd->writesize); > + memcpy(&chip->databuf[column], buf, bytes); > + wbuf = chip->databuf; > } > > if (unlikely(oob)) { > @@ -4632,7 +4632,6 @@ int nand_scan_tail(struct mtd_info *mtd) > { > struct nand_chip *chip = mtd_to_nand(mtd); > struct nand_ecc_ctrl *ecc = &chip->ecc; > - struct nand_buffers *nbuf = NULL; > int ret, i; > > /* New bad blocks should be marked in OOB, flash-based BBT, or both */ > @@ -4647,31 +4646,23 @@ int nand_scan_tail(struct mtd_info *mtd) > } > > if (!(chip->options & NAND_OWN_BUFFERS)) { > - nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); > - if (!nbuf) > + chip->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); > + if (!chip->ecccalc) > return -ENOMEM; > > - nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); > - if (!nbuf->ecccalc) { > + chip->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); > + if (!chip->ecccode) { > ret = -ENOMEM; > goto err_free_nbuf; > } Hm, again not directly related to this patch, but I wonder if we couldn't allocate those buffers only when they are really needed. For example, most NAND controllers do the ECC calculation/correct in HW and simply don't need those buffers. Regards, Boris > > - nbuf->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); > - if (!nbuf->ecccode) { > - ret = -ENOMEM; > - goto err_free_nbuf; > - } > - > - nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize, > + chip->databuf = kmalloc(mtd->writesize + mtd->oobsize, > GFP_KERNEL); > - if (!nbuf->databuf) { > + if (!chip->databuf) { > ret = -ENOMEM; > goto err_free_nbuf; > } > - > - chip->buffers = nbuf; > - } else if (!chip->buffers) { > + } else if (!chip->databuf) { > return -ENOMEM; > } > > @@ -4688,7 +4679,7 @@ int nand_scan_tail(struct mtd_info *mtd) > goto err_free_nbuf; > > /* Set the internal oob buffer location, just after the page data */ > - chip->oob_poi = chip->buffers->databuf + mtd->writesize; > + chip->oob_poi = chip->databuf + mtd->writesize; > > /* > * If no default placement scheme is given, select an appropriate one. > @@ -4975,12 +4966,9 @@ int nand_scan_tail(struct mtd_info *mtd) > nand_manufacturer_cleanup(chip); > > err_free_nbuf: > - if (nbuf) { > - kfree(nbuf->databuf); > - kfree(nbuf->ecccode); > - kfree(nbuf->ecccalc); > - kfree(nbuf); > - } > + kfree(chip->databuf); > + kfree(chip->ecccode); > + kfree(chip->ecccalc); > > return ret; > } > @@ -5032,11 +5020,10 @@ void nand_cleanup(struct nand_chip *chip) > > /* Free bad block table memory */ > kfree(chip->bbt); > - if (!(chip->options & NAND_OWN_BUFFERS) && chip->buffers) { > - kfree(chip->buffers->databuf); > - kfree(chip->buffers->ecccode); > - kfree(chip->buffers->ecccalc); > - kfree(chip->buffers); > + if (!(chip->options & NAND_OWN_BUFFERS)) { > + kfree(chip->databuf); > + kfree(chip->ecccode); > + kfree(chip->ecccalc); > } > > /* Free bad block descriptor memory */ > diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c > index 2915b67..53acc4a 100644 > --- a/drivers/mtd/nand/nand_bbt.c > +++ b/drivers/mtd/nand/nand_bbt.c > @@ -898,7 +898,7 @@ static inline int nand_memory_bbt(struct mtd_info *mtd, struct nand_bbt_descr *b > { > struct nand_chip *this = mtd_to_nand(mtd); > > - return create_bbt(mtd, this->buffers->databuf, bd, -1); > + return create_bbt(mtd, this->databuf, bd, -1); > } > > /** > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index dad438c..7870cb1 100644 > --- a/drivers/mtd/nand/omap2.c > +++ b/drivers/mtd/nand/omap2.c > @@ -1530,7 +1530,7 @@ static int omap_write_page_bch(struct mtd_info *mtd, struct nand_chip *chip, > const uint8_t *buf, int oob_required, int page) > { > int ret; > - uint8_t *ecc_calc = chip->buffers->ecccalc; > + uint8_t *ecc_calc = chip->ecccalc; > > /* Enable GPMC ecc engine */ > chip->ecc.hwctl(mtd, NAND_ECC_WRITE); > @@ -1568,7 +1568,7 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, > u32 data_len, const u8 *buf, > int oob_required, int page) > { > - u8 *ecc_calc = chip->buffers->ecccalc; > + u8 *ecc_calc = chip->ecccalc; > int ecc_size = chip->ecc.size; > int ecc_bytes = chip->ecc.bytes; > int ecc_steps = chip->ecc.steps; > @@ -1605,7 +1605,7 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, > > /* copy calculated ECC for whole page to chip->buffer->oob */ > /* this include masked-value(0xFF) for unwritten subpages */ > - ecc_calc = chip->buffers->ecccalc; > + ecc_calc = chip->ecccalc; > ret = mtd_ooblayout_set_eccbytes(mtd, ecc_calc, chip->oob_poi, 0, > chip->ecc.total); > if (ret) > @@ -1635,8 +1635,8 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, > static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip, > uint8_t *buf, int oob_required, int page) > { > - uint8_t *ecc_calc = chip->buffers->ecccalc; > - uint8_t *ecc_code = chip->buffers->ecccode; > + uint8_t *ecc_calc = chip->ecccalc; > + uint8_t *ecc_code = chip->ecccode; > int stat, ret; > unsigned int max_bitflips = 0; > > diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c > index 82244be..a487be5 100644 > --- a/drivers/mtd/nand/sunxi_nand.c > +++ b/drivers/mtd/nand/sunxi_nand.c > @@ -1544,7 +1544,7 @@ static int sunxi_nfc_hw_common_ecc_read_oob(struct mtd_info *mtd, > > chip->pagebuf = -1; > > - return chip->ecc.read_page(mtd, chip, chip->buffers->databuf, 1, page); > + return chip->ecc.read_page(mtd, chip, chip->databuf, 1, page); > } > > static int sunxi_nfc_hw_common_ecc_write_oob(struct mtd_info *mtd, > @@ -1557,8 +1557,8 @@ static int sunxi_nfc_hw_common_ecc_write_oob(struct mtd_info *mtd, > > chip->pagebuf = -1; > > - memset(chip->buffers->databuf, 0xff, mtd->writesize); > - ret = chip->ecc.write_page(mtd, chip, chip->buffers->databuf, 1, page); > + memset(chip->databuf, 0xff, mtd->writesize); > + ret = chip->ecc.write_page(mtd, chip, chip->databuf, 1, page); > if (ret) > return ret; > > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index 749bb08..75bf28d 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -608,21 +608,6 @@ static inline int nand_standard_page_accessors(struct nand_ecc_ctrl *ecc) > } > > /** > - * struct nand_buffers - buffer structure for read/write > - * @ecccalc: buffer pointer for calculated ECC, size is oobsize. > - * @ecccode: buffer pointer for ECC read from flash, size is oobsize. > - * @databuf: buffer pointer for data, size is (page size + oobsize). > - * > - * Do not change the order of buffers. databuf and oobrbuf must be in > - * consecutive order. > - */ > -struct nand_buffers { > - uint8_t *ecccalc; > - uint8_t *ecccode; > - uint8_t *databuf; > -}; > - > -/** > * struct nand_sdr_timings - SDR NAND chip timings > * > * This struct defines the timing requirements of a SDR NAND chip. > @@ -790,7 +775,9 @@ struct nand_manufacturer_ops { > * @setup_read_retry: [FLASHSPECIFIC] flash (vendor) specific function for > * setting the read-retry mode. Mostly needed for MLC NAND. > * @ecc: [BOARDSPECIFIC] ECC control structure > - * @buffers: buffer structure for read/write > + * @ecccalc: buffer pointer for calculated ECC, size is oobsize. > + * @ecccode: buffer pointer for ECC read from flash, size is oobsize. > + * @databuf: buffer pointer for data, size is (page size + oobsize). > * @buf_align: minimum buffer alignment required by a platform > * @hwcontrol: platform-specific hardware control structure > * @erase: [REPLACEABLE] erase function > @@ -938,7 +925,9 @@ struct nand_chip { > struct nand_hw_control *controller; > > struct nand_ecc_ctrl ecc; > - struct nand_buffers *buffers; > + u8 *ecccalc; > + u8 *ecccode; > + u8 *databuf; > unsigned long buf_align; > struct nand_hw_control hwcontrol; >
Hi Boris, 2017-12-04 18:10 GMT+09:00 Boris Brezillon <boris.brezillon@free-electrons.com>: >> } >> >> if (!(chip->options & NAND_OWN_BUFFERS)) { >> - nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); >> - if (!nbuf) >> + chip->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); >> + if (!chip->ecccalc) >> return -ENOMEM; >> >> - nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); >> - if (!nbuf->ecccalc) { >> + chip->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); >> + if (!chip->ecccode) { >> ret = -ENOMEM; >> goto err_free_nbuf; >> } > > Hm, again not directly related to this patch, but I wonder if we > couldn't allocate those buffers only when they are really needed. For > example, most NAND controllers do the ECC calculation/correct in HW and > simply don't need those buffers. The only idea I came up with is to add a new flag, but I am not sure if you are happy with it because we are removing NAND_OWN_BUFFERS.
On Tue, 5 Dec 2017 19:02:26 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Hi Boris, > > 2017-12-04 18:10 GMT+09:00 Boris Brezillon > <boris.brezillon@free-electrons.com>: > > >> } > >> > >> if (!(chip->options & NAND_OWN_BUFFERS)) { > >> - nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); > >> - if (!nbuf) > >> + chip->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); > >> + if (!chip->ecccalc) > >> return -ENOMEM; > >> > >> - nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); > >> - if (!nbuf->ecccalc) { > >> + chip->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); > >> + if (!chip->ecccode) { > >> ret = -ENOMEM; > >> goto err_free_nbuf; > >> } > > > > Hm, again not directly related to this patch, but I wonder if we > > couldn't allocate those buffers only when they are really needed. > > For example, most NAND controllers do the ECC calculation/correct > > in HW and simply don't need those buffers. > > > The only idea I came up with is to add a new flag, > but I am not sure if you are happy with it > because we are removing NAND_OWN_BUFFERS. All drivers using ->calc/code_buf are providing a ->correct() and/or ->calculate() method, so I thought we could make the allocation dependent on the presence of one of these hooks [1]. The only exception is the denali driver, but I think we can patch it to not use the ->code_buf buffer [2]. [1]http://code.bulix.org/2ks7yp-236649 [2]http://code.bulix.org/sxqx7o-236650
2017-12-05 19:28 GMT+09:00 Boris Brezillon <boris.brezillon@free-electrons.com>: > On Tue, 5 Dec 2017 19:02:26 +0900 > Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > >> Hi Boris, >> >> 2017-12-04 18:10 GMT+09:00 Boris Brezillon >> <boris.brezillon@free-electrons.com>: >> >> >> } >> >> >> >> if (!(chip->options & NAND_OWN_BUFFERS)) { >> >> - nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); >> >> - if (!nbuf) >> >> + chip->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); >> >> + if (!chip->ecccalc) >> >> return -ENOMEM; >> >> >> >> - nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); >> >> - if (!nbuf->ecccalc) { >> >> + chip->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); >> >> + if (!chip->ecccode) { >> >> ret = -ENOMEM; >> >> goto err_free_nbuf; >> >> } >> > >> > Hm, again not directly related to this patch, but I wonder if we >> > couldn't allocate those buffers only when they are really needed. >> > For example, most NAND controllers do the ECC calculation/correct >> > in HW and simply don't need those buffers. >> >> >> The only idea I came up with is to add a new flag, >> but I am not sure if you are happy with it >> because we are removing NAND_OWN_BUFFERS. > > All drivers using ->calc/code_buf are providing a ->correct() and/or > ->calculate() method, so I thought we could make the allocation > dependent on the presence of one of these hooks [1]. > > The only exception is the denali driver, but I think we can patch it > to not use the ->code_buf buffer [2]. Cool! > [1]http://code.bulix.org/2ks7yp-236649 > [2]http://code.bulix.org/sxqx7o-236650 > Thanks! I can issue Acked-by for [2].
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index e0eb51d..6c9f7ec 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -1681,7 +1681,7 @@ static int brcmstb_nand_verify_erased_page(struct mtd_info *mtd, int ret; if (!buf) { - buf = chip->buffers->databuf; + buf = chip->databuf; /* Invalidate page cache */ chip->pagebuf = -1; } diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index bc558c4..1e54196 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -613,7 +613,6 @@ static int cafe_nand_probe(struct pci_dev *pdev, uint32_t ctrl; int err = 0; int old_dma; - struct nand_buffers *nbuf; /* Very old versions shared the same PCI ident for all three functions on the chip. Verify the class too... */ @@ -732,14 +731,12 @@ static int cafe_nand_probe(struct pci_dev *pdev, goto out_irq; cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, - 2112 + sizeof(struct nand_buffers) + - mtd->writesize + mtd->oobsize, + 2112 + mtd->writesize + mtd->oobsize, &cafe->dmaaddr, GFP_KERNEL); if (!cafe->dmabuf) { err = -ENOMEM; goto out_irq; } - cafe->nand.buffers = nbuf = (void *)cafe->dmabuf + 2112; /* Set up DMA address */ cafe_writel(cafe, cafe->dmaaddr & 0xffffffff, NAND_DMA_ADDR0); @@ -753,9 +750,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, cafe_readl(cafe, NAND_DMA_ADDR0), cafe->dmabuf); /* this driver does not need the @ecccalc and @ecccode */ - nbuf->ecccalc = NULL; - nbuf->ecccode = NULL; - nbuf->databuf = (uint8_t *)(nbuf + 1); + cafe->nand.databuf = (void *)cafe->dmabuf + 2112; /* Restore the DMA flag */ usedma = old_dma; @@ -802,8 +797,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, out_free_dma: dma_free_coherent(&cafe->pdev->dev, - 2112 + sizeof(struct nand_buffers) + - mtd->writesize + mtd->oobsize, + 2112 + mtd->writesize + mtd->oobsize, cafe->dmabuf, cafe->dmaaddr); out_irq: /* Disable NAND IRQ in global IRQ mask register */ @@ -830,8 +824,7 @@ static void cafe_nand_remove(struct pci_dev *pdev) free_rs(cafe->rs); pci_iounmap(pdev, cafe->mmio); dma_free_coherent(&cafe->pdev->dev, - 2112 + sizeof(struct nand_buffers) + - mtd->writesize + mtd->oobsize, + 2112 + mtd->writesize + mtd->oobsize, cafe->dmabuf, cafe->dmaaddr); kfree(cafe); } diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 2fc964b..e1f8c6f 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -328,7 +328,7 @@ static int denali_check_erased_page(struct mtd_info *mtd, unsigned long uncor_ecc_flags, unsigned int max_bitflips) { - uint8_t *ecc_code = chip->buffers->ecccode; + uint8_t *ecc_code = chip->ecccode; int ecc_steps = chip->ecc.steps; int ecc_size = chip->ecc.size; int ecc_bytes = chip->ecc.bytes; diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index eac15d9..147ca3d 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -684,8 +684,8 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_calc = chip->buffers->ecccalc; - uint8_t *ecc_code = chip->buffers->ecccode; + uint8_t *ecc_calc = chip->ecccalc; + uint8_t *ecc_code = chip->ecccode; int off, len, group = 0; /* * ecc_oob is intentionally taken as uint16_t. In 16bit devices, we diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 50f8d4a..3312945 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -1712,7 +1712,7 @@ static int mx23_check_transcription_stamp(struct gpmi_nand_data *this) unsigned int search_area_size_in_strides; unsigned int stride; unsigned int page; - uint8_t *buffer = chip->buffers->databuf; + uint8_t *buffer = chip->databuf; int saved_chip_number; int found_an_ncb_fingerprint = false; @@ -1771,7 +1771,7 @@ static int mx23_write_transcription_stamp(struct gpmi_nand_data *this) unsigned int block; unsigned int stride; unsigned int page; - uint8_t *buffer = chip->buffers->databuf; + uint8_t *buffer = chip->databuf; int saved_chip_number; int status; diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 6135d00..1f8297c 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1456,8 +1456,8 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_calc = chip->buffers->ecccalc; - uint8_t *ecc_code = chip->buffers->ecccode; + uint8_t *ecc_calc = chip->ecccalc; + uint8_t *ecc_code = chip->ecccode; unsigned int max_bitflips = 0; chip->ecc.read_page_raw(mtd, chip, buf, 1, page); @@ -1529,7 +1529,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, /* Calculate ECC */ for (i = 0; i < eccfrag_len ; i += chip->ecc.bytes, p += chip->ecc.size) - chip->ecc.calculate(mtd, p, &chip->buffers->ecccalc[i]); + chip->ecc.calculate(mtd, p, &chip->ecccalc[i]); /* * The performance is faster if we position offsets according to @@ -1563,7 +1563,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, chip->read_buf(mtd, &chip->oob_poi[aligned_pos], aligned_len); } - ret = mtd_ooblayout_get_eccbytes(mtd, chip->buffers->ecccode, + ret = mtd_ooblayout_get_eccbytes(mtd, chip->ecccode, chip->oob_poi, index, eccfrag_len); if (ret) return ret; @@ -1572,16 +1572,16 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, for (i = 0; i < eccfrag_len ; i += chip->ecc.bytes, p += chip->ecc.size) { int stat; - stat = chip->ecc.correct(mtd, p, - &chip->buffers->ecccode[i], &chip->buffers->ecccalc[i]); + stat = chip->ecc.correct(mtd, p, &chip->ecccode[i], + &chip->ecccalc[i]); if (stat == -EBADMSG && (chip->ecc.options & NAND_ECC_GENERIC_ERASED_CHECK)) { /* check for empty pages with bitflips */ stat = nand_check_erased_ecc_chunk(p, chip->ecc.size, - &chip->buffers->ecccode[i], - chip->ecc.bytes, - NULL, 0, - chip->ecc.strength); + &chip->ecccode[i], + chip->ecc.bytes, + NULL, 0, + chip->ecc.strength); } if (stat < 0) { @@ -1611,8 +1611,8 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_calc = chip->buffers->ecccalc; - uint8_t *ecc_code = chip->buffers->ecccode; + uint8_t *ecc_calc = chip->ecccalc; + uint8_t *ecc_code = chip->ecccode; unsigned int max_bitflips = 0; for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { @@ -1674,8 +1674,8 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_code = chip->buffers->ecccode; - uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_code = chip->ecccode; + uint8_t *ecc_calc = chip->ecccalc; unsigned int max_bitflips = 0; /* Read the OOB area first */ @@ -1894,7 +1894,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, /* Is the current page in the buffer? */ if (realpage != chip->pagebuf || oob) { - bufpoi = use_bufpoi ? chip->buffers->databuf : buf; + bufpoi = use_bufpoi ? chip->databuf : buf; if (use_bufpoi && aligned) pr_debug("%s: using read bounce buffer for buf@%p\n", @@ -1938,7 +1938,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, /* Invalidate page cache */ chip->pagebuf = -1; } - memcpy(buf, chip->buffers->databuf + col, bytes); + memcpy(buf, chip->databuf + col, bytes); } if (unlikely(oob)) { @@ -1979,7 +1979,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, buf += bytes; max_bitflips = max_t(unsigned int, max_bitflips, ret); } else { - memcpy(buf, chip->buffers->databuf + col, bytes); + memcpy(buf, chip->databuf + col, bytes); buf += bytes; max_bitflips = max_t(unsigned int, max_bitflips, chip->pagebuf_bitflips); @@ -2403,7 +2403,7 @@ static int nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, int i, eccsize = chip->ecc.size, ret; int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; - uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_calc = chip->ecccalc; const uint8_t *p = buf; /* Software ECC calculation */ @@ -2433,7 +2433,7 @@ static int nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, int i, eccsize = chip->ecc.size, ret; int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; - uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_calc = chip->ecccalc; const uint8_t *p = buf; for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { @@ -2469,7 +2469,7 @@ static int nand_write_subpage_hwecc(struct mtd_info *mtd, int oob_required, int page) { uint8_t *oob_buf = chip->oob_poi; - uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_calc = chip->ecccalc; int ecc_size = chip->ecc.size; int ecc_bytes = chip->ecc.bytes; int ecc_steps = chip->ecc.steps; @@ -2503,7 +2503,7 @@ static int nand_write_subpage_hwecc(struct mtd_info *mtd, /* copy calculated ECC for whole page to chip->buffer->oob */ /* this include masked-value(0xFF) for unwritten subpages */ - ecc_calc = chip->buffers->ecccalc; + ecc_calc = chip->ecccalc; ret = mtd_ooblayout_set_eccbytes(mtd, ecc_calc, chip->oob_poi, 0, chip->ecc.total); if (ret) @@ -2737,9 +2737,9 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, if (part_pagewr) bytes = min_t(int, bytes - column, writelen); chip->pagebuf = -1; - memset(chip->buffers->databuf, 0xff, mtd->writesize); - memcpy(&chip->buffers->databuf[column], buf, bytes); - wbuf = chip->buffers->databuf; + memset(chip->databuf, 0xff, mtd->writesize); + memcpy(&chip->databuf[column], buf, bytes); + wbuf = chip->databuf; } if (unlikely(oob)) { @@ -4632,7 +4632,6 @@ int nand_scan_tail(struct mtd_info *mtd) { struct nand_chip *chip = mtd_to_nand(mtd); struct nand_ecc_ctrl *ecc = &chip->ecc; - struct nand_buffers *nbuf = NULL; int ret, i; /* New bad blocks should be marked in OOB, flash-based BBT, or both */ @@ -4647,31 +4646,23 @@ int nand_scan_tail(struct mtd_info *mtd) } if (!(chip->options & NAND_OWN_BUFFERS)) { - nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL); - if (!nbuf) + chip->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); + if (!chip->ecccalc) return -ENOMEM; - nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL); - if (!nbuf->ecccalc) { + chip->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); + if (!chip->ecccode) { ret = -ENOMEM; goto err_free_nbuf; } - nbuf->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL); - if (!nbuf->ecccode) { - ret = -ENOMEM; - goto err_free_nbuf; - } - - nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize, + chip->databuf = kmalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL); - if (!nbuf->databuf) { + if (!chip->databuf) { ret = -ENOMEM; goto err_free_nbuf; } - - chip->buffers = nbuf; - } else if (!chip->buffers) { + } else if (!chip->databuf) { return -ENOMEM; } @@ -4688,7 +4679,7 @@ int nand_scan_tail(struct mtd_info *mtd) goto err_free_nbuf; /* Set the internal oob buffer location, just after the page data */ - chip->oob_poi = chip->buffers->databuf + mtd->writesize; + chip->oob_poi = chip->databuf + mtd->writesize; /* * If no default placement scheme is given, select an appropriate one. @@ -4975,12 +4966,9 @@ int nand_scan_tail(struct mtd_info *mtd) nand_manufacturer_cleanup(chip); err_free_nbuf: - if (nbuf) { - kfree(nbuf->databuf); - kfree(nbuf->ecccode); - kfree(nbuf->ecccalc); - kfree(nbuf); - } + kfree(chip->databuf); + kfree(chip->ecccode); + kfree(chip->ecccalc); return ret; } @@ -5032,11 +5020,10 @@ void nand_cleanup(struct nand_chip *chip) /* Free bad block table memory */ kfree(chip->bbt); - if (!(chip->options & NAND_OWN_BUFFERS) && chip->buffers) { - kfree(chip->buffers->databuf); - kfree(chip->buffers->ecccode); - kfree(chip->buffers->ecccalc); - kfree(chip->buffers); + if (!(chip->options & NAND_OWN_BUFFERS)) { + kfree(chip->databuf); + kfree(chip->ecccode); + kfree(chip->ecccalc); } /* Free bad block descriptor memory */ diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 2915b67..53acc4a 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -898,7 +898,7 @@ static inline int nand_memory_bbt(struct mtd_info *mtd, struct nand_bbt_descr *b { struct nand_chip *this = mtd_to_nand(mtd); - return create_bbt(mtd, this->buffers->databuf, bd, -1); + return create_bbt(mtd, this->databuf, bd, -1); } /** diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index dad438c..7870cb1 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1530,7 +1530,7 @@ static int omap_write_page_bch(struct mtd_info *mtd, struct nand_chip *chip, const uint8_t *buf, int oob_required, int page) { int ret; - uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_calc = chip->ecccalc; /* Enable GPMC ecc engine */ chip->ecc.hwctl(mtd, NAND_ECC_WRITE); @@ -1568,7 +1568,7 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, u32 data_len, const u8 *buf, int oob_required, int page) { - u8 *ecc_calc = chip->buffers->ecccalc; + u8 *ecc_calc = chip->ecccalc; int ecc_size = chip->ecc.size; int ecc_bytes = chip->ecc.bytes; int ecc_steps = chip->ecc.steps; @@ -1605,7 +1605,7 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, /* copy calculated ECC for whole page to chip->buffer->oob */ /* this include masked-value(0xFF) for unwritten subpages */ - ecc_calc = chip->buffers->ecccalc; + ecc_calc = chip->ecccalc; ret = mtd_ooblayout_set_eccbytes(mtd, ecc_calc, chip->oob_poi, 0, chip->ecc.total); if (ret) @@ -1635,8 +1635,8 @@ static int omap_write_subpage_bch(struct mtd_info *mtd, static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf, int oob_required, int page) { - uint8_t *ecc_calc = chip->buffers->ecccalc; - uint8_t *ecc_code = chip->buffers->ecccode; + uint8_t *ecc_calc = chip->ecccalc; + uint8_t *ecc_code = chip->ecccode; int stat, ret; unsigned int max_bitflips = 0; diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 82244be..a487be5 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1544,7 +1544,7 @@ static int sunxi_nfc_hw_common_ecc_read_oob(struct mtd_info *mtd, chip->pagebuf = -1; - return chip->ecc.read_page(mtd, chip, chip->buffers->databuf, 1, page); + return chip->ecc.read_page(mtd, chip, chip->databuf, 1, page); } static int sunxi_nfc_hw_common_ecc_write_oob(struct mtd_info *mtd, @@ -1557,8 +1557,8 @@ static int sunxi_nfc_hw_common_ecc_write_oob(struct mtd_info *mtd, chip->pagebuf = -1; - memset(chip->buffers->databuf, 0xff, mtd->writesize); - ret = chip->ecc.write_page(mtd, chip, chip->buffers->databuf, 1, page); + memset(chip->databuf, 0xff, mtd->writesize); + ret = chip->ecc.write_page(mtd, chip, chip->databuf, 1, page); if (ret) return ret; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 749bb08..75bf28d 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -608,21 +608,6 @@ static inline int nand_standard_page_accessors(struct nand_ecc_ctrl *ecc) } /** - * struct nand_buffers - buffer structure for read/write - * @ecccalc: buffer pointer for calculated ECC, size is oobsize. - * @ecccode: buffer pointer for ECC read from flash, size is oobsize. - * @databuf: buffer pointer for data, size is (page size + oobsize). - * - * Do not change the order of buffers. databuf and oobrbuf must be in - * consecutive order. - */ -struct nand_buffers { - uint8_t *ecccalc; - uint8_t *ecccode; - uint8_t *databuf; -}; - -/** * struct nand_sdr_timings - SDR NAND chip timings * * This struct defines the timing requirements of a SDR NAND chip. @@ -790,7 +775,9 @@ struct nand_manufacturer_ops { * @setup_read_retry: [FLASHSPECIFIC] flash (vendor) specific function for * setting the read-retry mode. Mostly needed for MLC NAND. * @ecc: [BOARDSPECIFIC] ECC control structure - * @buffers: buffer structure for read/write + * @ecccalc: buffer pointer for calculated ECC, size is oobsize. + * @ecccode: buffer pointer for ECC read from flash, size is oobsize. + * @databuf: buffer pointer for data, size is (page size + oobsize). * @buf_align: minimum buffer alignment required by a platform * @hwcontrol: platform-specific hardware control structure * @erase: [REPLACEABLE] erase function @@ -938,7 +925,9 @@ struct nand_chip { struct nand_hw_control *controller; struct nand_ecc_ctrl ecc; - struct nand_buffers *buffers; + u8 *ecccalc; + u8 *ecccode; + u8 *databuf; unsigned long buf_align; struct nand_hw_control hwcontrol;
struct nand_buffers is malloc'ed in nand_scan_tail() just for containing three pointers. Move the pointers into nand_chip and delete struct nand_buffers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Another possibility is to keep struct nand_buffers, but embed it in struct nand_chip. struct nand_chip { ... struct nand_buffers buffers; ... }; I will follow Boris's opinion, anyway. drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/cafe_nand.c | 15 ++---- drivers/mtd/nand/denali.c | 2 +- drivers/mtd/nand/fsmc_nand.c | 4 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 4 +- drivers/mtd/nand/nand_base.c | 91 +++++++++++++++------------------- drivers/mtd/nand/nand_bbt.c | 2 +- drivers/mtd/nand/omap2.c | 10 ++-- drivers/mtd/nand/sunxi_nand.c | 6 +-- include/linux/mtd/rawnand.h | 23 +++------ 10 files changed, 64 insertions(+), 95 deletions(-)