Commit f720e7ce authored by Huang Shijie's avatar Huang Shijie Committed by David Woodhouse
Browse files

mtd: gpmi: remove the nand_scan() 



In order to make the nand_scan() work, the current code uses the hack code
to init the @nand_chip->ecc.size and the @nand_chip->ecc.strength. and
re-init some the ECC info in the gpmi_pre_bbt_scan().
This code is really a little ugly.

The patch does following changes:
  (1) Use the nand_scan_ident()/nand_scan_tail() to replace the nand_scan().

  (2) Init all the necessary values in the gpmi_init_last()
      before we call the nand_scan_tail().

  (3) remove the code setting the ECC info, let the mtd layer to do the
      real job.

  (4) remove the gpmi_scan_bbt(). we do not need this function any more.

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4204cccd

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+35 −30
Original line number Original line Diff line number Diff line
@@ -214,7 +214,6 @@ static bool set_geometry_by_ecc_info(struct gpmi_nand_data *this) 
	if (geo->page_size < mtd->writesize + mtd->oobsize) {

	if (geo->page_size < mtd->writesize + mtd->oobsize) {

		of->offset = geo->page_size - mtd->writesize;

		of->offset = geo->page_size - mtd->writesize;

		of->length = mtd->oobsize - of->offset;

		of->length = mtd->oobsize - of->offset;

		mtd->oobavail = gpmi_hw_ecclayout.oobavail = of->length;

	}

	}





	geo->payload_size = mtd->writesize;

	geo->payload_size = mtd->writesize;
@@ -1582,19 +1581,22 @@ static int gpmi_pre_bbt_scan(struct gpmi_nand_data *this) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	/* Adjust the ECC strength according to the chip. */

	this->nand.ecc.strength = this->bch_geometry.ecc_strength;

	this->mtd.ecc_strength = this->bch_geometry.ecc_strength;

	this->mtd.bitflip_threshold = this->bch_geometry.ecc_strength;



	/* NAND boot init, depends on the gpmi_set_geometry(). */

	/* NAND boot init, depends on the gpmi_set_geometry(). */

	return nand_boot_init(this);

	return nand_boot_init(this);

}

}





static int gpmi_scan_bbt(struct mtd_info *mtd)

static void gpmi_nfc_exit(struct gpmi_nand_data *this)

{

	nand_release(&this->mtd);

	gpmi_free_dma_buffer(this);

}



static int gpmi_init_last(struct gpmi_nand_data *this)

{

{

	struct mtd_info *mtd = &this->mtd;

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd->priv;

	struct gpmi_nand_data *this = chip->priv;

	struct nand_ecc_ctrl *ecc = &chip->ecc;

	struct bch_geometry *bch_geo = &this->bch_geometry;

	int ret;

	int ret;





	/* Prepare for the BBT scan. */

	/* Prepare for the BBT scan. */
@@ -1602,6 +1604,16 @@ static int gpmi_scan_bbt(struct mtd_info *mtd) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	/* Init the nand_ecc_ctrl{} */

	ecc->read_page	= gpmi_ecc_read_page;

	ecc->write_page	= gpmi_ecc_write_page;

	ecc->read_oob	= gpmi_ecc_read_oob;

	ecc->write_oob	= gpmi_ecc_write_oob;

	ecc->mode	= NAND_ECC_HW;

	ecc->size	= bch_geo->ecc_chunk_size;

	ecc->strength	= bch_geo->ecc_strength;

	ecc->layout	= &gpmi_hw_ecclayout;



	/*

	/*

	 * Can we enable the extra features? such as EDO or Sync mode.

	 * Can we enable the extra features? such as EDO or Sync mode.

	 *

	 *
@@ -1610,14 +1622,7 @@ static int gpmi_scan_bbt(struct mtd_info *mtd) 
	 */

	 */

	gpmi_extra_init(this);

	gpmi_extra_init(this);





	/* use the default BBT implementation */

	return 0;

	return nand_default_bbt(mtd);

}



static void gpmi_nfc_exit(struct gpmi_nand_data *this)

{

	nand_release(&this->mtd);

	gpmi_free_dma_buffer(this);

}

}





static int gpmi_nfc_init(struct gpmi_nand_data *this)

static int gpmi_nfc_init(struct gpmi_nand_data *this)
@@ -1643,33 +1648,33 @@ static int gpmi_nfc_init(struct gpmi_nand_data *this) 
	chip->read_byte		= gpmi_read_byte;

	chip->read_byte		= gpmi_read_byte;

	chip->read_buf		= gpmi_read_buf;

	chip->read_buf		= gpmi_read_buf;

	chip->write_buf		= gpmi_write_buf;

	chip->write_buf		= gpmi_write_buf;

	chip->ecc.read_page	= gpmi_ecc_read_page;

	chip->ecc.write_page	= gpmi_ecc_write_page;

	chip->ecc.read_oob	= gpmi_ecc_read_oob;

	chip->ecc.write_oob	= gpmi_ecc_write_oob;

	chip->scan_bbt		= gpmi_scan_bbt;

	chip->badblock_pattern	= &gpmi_bbt_descr;

	chip->badblock_pattern	= &gpmi_bbt_descr;

	chip->block_markbad	= gpmi_block_markbad;

	chip->block_markbad	= gpmi_block_markbad;

	chip->options		|= NAND_NO_SUBPAGE_WRITE;

	chip->options		|= NAND_NO_SUBPAGE_WRITE;

	chip->ecc.mode		= NAND_ECC_HW;

	chip->ecc.size		= 1;

	chip->ecc.strength	= 8;

	chip->ecc.layout	= &gpmi_hw_ecclayout;

	if (of_get_nand_on_flash_bbt(this->dev->of_node))

	if (of_get_nand_on_flash_bbt(this->dev->of_node))

		chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;

		chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;





	/* Allocate a temporary DMA buffer for reading ID in the nand_scan() */

	/*

	 * Allocate a temporary DMA buffer for reading ID in the

	 * nand_scan_ident().

	 */

	this->bch_geometry.payload_size = 1024;

	this->bch_geometry.payload_size = 1024;

	this->bch_geometry.auxiliary_size = 128;

	this->bch_geometry.auxiliary_size = 128;

	ret = gpmi_alloc_dma_buffer(this);

	ret = gpmi_alloc_dma_buffer(this);

	if (ret)

	if (ret)

		goto err_out;

		goto err_out;





	ret = nand_scan(mtd, 1);

	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret) {

	if (ret)

		pr_err("Chip scan failed\n");

		goto err_out;



	ret = gpmi_init_last(this);

	if (ret)

		goto err_out;



	ret = nand_scan_tail(mtd);

	if (ret)

		goto err_out;

		goto err_out;

	}





	ppdata.of_node = this->pdev->dev.of_node;

	ppdata.of_node = this->pdev->dev.of_node;

	ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);

	ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);