Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85e5b2f2 authored by Paul Parsons's avatar Paul Parsons Committed by David Woodhouse
Browse files

mtd: chips: cfi_cmdset_0001: Match ENABLE_VPP()/DISABLE_VPP() calls 



This patch is part of a set which fixes unnecessary flash erase and write errors
resulting from the MTD CFI driver turning off vpp while an erase is in progress.
This patch ensures that only those flash operations which call ENABLE_VPP() can
then call DISABLE_VPP(). Other operations should never call DISABLE_VPP().

Signed-off-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 0c78e93b

drivers/mtd/chips/cfi_cmdset_0001.c

+9 −6
Original line number Diff line number Diff line
@@ -1017,8 +1017,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 
	case FL_READY:

	case FL_STATUS:

	case FL_JEDEC_QUERY:

		/* We should really make set_vpp() count, rather than doing this */

		DISABLE_VPP(map);

		break;

	default:

		printk(KERN_ERR "%s: put_chip() called with oldstate %d!!\n", map->name, chip->oldstate);
@@ -1552,7 +1550,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 
	}



	xip_enable(map, chip, adr);

 out:	put_chip(map, chip, adr);

 out:	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);

	return ret;

}
@@ -1791,7 +1790,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
	}



	xip_enable(map, chip, cmd_adr);

 out:	put_chip(map, chip, cmd_adr);

 out:	DISABLE_VPP(map);

	put_chip(map, chip, cmd_adr);

	mutex_unlock(&chip->mutex);

	return ret;

}
@@ -1928,6 +1928,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
			ret = -EIO;

		} else if (chipstatus & 0x20 && retries--) {

			printk(KERN_DEBUG "block erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);

			DISABLE_VPP(map);

			put_chip(map, chip, adr);

			mutex_unlock(&chip->mutex);

			goto retry;
@@ -1940,7 +1941,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
	}



	xip_enable(map, chip, adr);

 out:	put_chip(map, chip, adr);

 out:	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);

	return ret;

}
@@ -2082,7 +2084,8 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip 
	}



	xip_enable(map, chip, adr);

out:	put_chip(map, chip, adr);

 out:	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);

	return ret;

}