[MTD] OneNAND: fix onenand_wait bug (f6272487) · Commits · e / devices / android_kernel_sony_msm8998

drivers/mtd/onenand/onenand_base.c

+15 −23

Original line number	Diff line number	Diff line
		@@ -318,15 +318,10 @@ static int onenand_wait(struct mtd_info *mtd, int state)
		ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);

		if (ctrl & ONENAND_CTRL_ERROR) {
		/* It maybe occur at initial bad block */
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: controller error = 0x%04x\n", ctrl);
		/* Clear other interrupt bits for preventing ECC error */
		interrupt &= ONENAND_INT_MASTER;
		}

		if (ctrl & ONENAND_CTRL_LOCK) {
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error = 0x%04x\n", ctrl);
		return -EACCES;
		if (ctrl & ONENAND_CTRL_LOCK)
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error.\n");
		return ctrl;
		}

		if (interrupt & ONENAND_INT_READ) {
		@@ -750,21 +745,21 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,

		ret = this->wait(mtd, FL_READING);
		/* First copy data and check return value for ECC handling */
		onenand_update_bufferram(mtd, from, 1);
		onenand_update_bufferram(mtd, from, !ret);
		}

		this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);

		read += thislen;

		if (read == len)
		break;

		if (ret) {
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret);
		goto out;
		}

		read += thislen;

		if (read == len)
		break;

		from += thislen;
		buf += thislen;
		}
		@@ -832,16 +827,16 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,

		this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);

		if (ret) {
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = 0x%x\n", ret);
		goto out;
		}

		read += thislen;

		if (read == len)
		break;

		if (ret) {
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = %d\n", ret);
		goto out;
		}

		buf += thislen;

		/* Read more? */
		@@ -1199,9 +1194,6 @@ static int onenand_erase(struct mtd_info mtd, struct erase_info instr)
		ret = this->wait(mtd, FL_ERASING);
		/* Check, if it is write protected */
		if (ret) {
		if (ret == -EPERM)
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Device is write protected!!!\n");
		else
		DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift));
		instr->state = MTD_ERASE_FAILED;
		instr->fail_addr = addr;

drivers/mtd/onenand/onenand_bbt.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,8 @@ static int create_bbt(struct mtd_info mtd, uint8_t buf, struct nand_bbt_descr
		ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
		readlen, &retlen, &buf[0]);

		if (ret)
		/* If it is a initial bad block, just ignore it */
		if (ret && !(ret & ONENAND_CTRL_LOAD))
		return ret;

		if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {