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

Commit a371ba57 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Vignesh Raghavendra
Browse files

mtd: cfi_cmdset_0002: Split do_write_oneword() to reduce function size 



Reduce the size of do_write_oneword() by extracting a helper function
for the hardware access.

Cc: Fabio Bettoni <fbettoni@gmail.com>
Co: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: default avatarTokunori Ikegami <ikegami.t@gmail.com>
Reviewed-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 5981dfce

drivers/mtd/chips/cfi_cmdset_0002.c

+50 −40
Original line number Diff line number Diff line
@@ -1637,11 +1637,11 @@ static int cfi_amdstd_lock_user_prot_reg(struct mtd_info *mtd, loff_t from, 
				   do_otp_lock, 1);

}



static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,

static int __xipram do_write_oneword_once(struct map_info *map,

					  struct flchip *chip,

					  unsigned long adr, map_word datum,

				     int mode)

					  int mode, struct cfi_private *cfi)

{

	struct cfi_private *cfi = map->fldrv_priv;

	unsigned long timeo = jiffies + HZ;

	/*

	 * We use a 1ms + 1 jiffies generic timeout for writes (most devices
@@ -1654,42 +1654,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 
	 */

	unsigned long uWriteTimeout = (HZ / 1000) + 1;

	int ret = 0;

	map_word oldd;

	int retry_cnt = 0;



	adr += chip->start;



	mutex_lock(&chip->mutex);

	ret = get_chip(map, chip, adr, mode);

	if (ret) {

		mutex_unlock(&chip->mutex);

		return ret;

	}



	pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",

		 __func__, adr, datum.x[0]);



	if (mode == FL_OTP_WRITE)

		otp_enter(map, chip, adr, map_bankwidth(map));



	/*

	 * Check for a NOP for the case when the datum to write is already

	 * present - it saves time and works around buggy chips that corrupt

	 * data at other locations when 0xff is written to a location that

	 * already contains 0xff.

	 */

	oldd = map_read(map, adr);

	if (map_word_equal(map, oldd, datum)) {

		pr_debug("MTD %s(): NOP\n",

		       __func__);

		goto op_done;

	}



	XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));

	ENABLE_VPP(map);

	xip_disable(map, chip, adr);



 retry:

	cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0xA0, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -1737,7 +1702,52 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 
		UDELAY(map, chip, adr, 1);

	}



	/* Did we succeed? */

	return ret;

}



static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,

				     unsigned long adr, map_word datum,

				     int mode)

{

	struct cfi_private *cfi = map->fldrv_priv;

	int ret = 0;

	map_word oldd;

	int retry_cnt = 0;



	adr += chip->start;



	mutex_lock(&chip->mutex);

	ret = get_chip(map, chip, adr, mode);

	if (ret) {

		mutex_unlock(&chip->mutex);

		return ret;

	}



	pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n",

		 __func__, adr, datum.x[0]);



	if (mode == FL_OTP_WRITE)

		otp_enter(map, chip, adr, map_bankwidth(map));



	/*

	 * Check for a NOP for the case when the datum to write is already

	 * present - it saves time and works around buggy chips that corrupt

	 * data at other locations when 0xff is written to a location that

	 * already contains 0xff.

	 */

	oldd = map_read(map, adr);

	if (map_word_equal(map, oldd, datum)) {

		pr_debug("MTD %s(): NOP\n",

			 __func__);

		goto op_done;

	}



	XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));

	ENABLE_VPP(map);

	xip_disable(map, chip, adr);



 retry:

	ret = do_write_oneword_once(map, chip, adr, datum, mode, cfi);

	if (ret) {

		/* reset on all failures. */

		cfi_check_err_status(map, chip, adr);