xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: cfi_cmdset_0002: Move and rename chip_check/chip_ready/chip_good_for_write

Browse Source 
commit 083084df578a8bdb18334f69e7b32d690aaa3247 upstream.

This is a preparation patch for the S29GL064N buffer writes fix. There
is no functional change.

Link: https://lore.kernel.org/r/b687c259-6413-26c9-d4c9-b3afa69ea124@pengutronix.de/
Fixes: dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to check correct value")
Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Cc: stable@vger.kernel.org
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220323170458.5608-2-ikegami.t@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tokunori Ikegami
2022-03-24 02:04:55 +09:00
committed by Greg Kroah-Hartman
parent b2b0144422
commit 08788b917b
1 changed files with 35 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
drivers/mtd/chips/cfi_cmdset_0002.c
View File

@@ -797,47 +797,11 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
return NULL; return NULL;
} }
/*
* Return true if the chip is ready.
*
* Ready is one of: read mode, query mode, erase-suspend-read mode (in any
* non-suspended sector) and is indicated by no toggle bits toggling.
*
* Note that anything more complicated than checking if no bits are toggling
* (including checking DQ5 for an error status) is tricky to get working
* correctly and is therefore not done (particularly with interleaved chips
* as each chip must be checked independently of the others).
*/
static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
unsigned long addr)
{
struct cfi_private *cfi = map->fldrv_priv;
map_word d, t;
if (cfi_use_status_reg(cfi)) {
map_word ready = CMD(CFI_SR_DRB);
/*
* For chips that support status register, check device
* ready bit
*/
cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
cfi->device_type, NULL);
d = map_read(map, addr);
return map_word_andequal(map, d, ready, ready);
}
d = map_read(map, addr);
t = map_read(map, addr);
return map_word_equal(map, d, t);
}
/* /*
* Return true if the chip is ready and has the correct value. * Return true if the chip is ready and has the correct value.
* *
* Ready is one of: read mode, query mode, erase-suspend-read mode (in any * Ready is one of: read mode, query mode, erase-suspend-read mode (in any
* non-suspended sector) and it is indicated by no bits toggling. * non-suspended sector) and is indicated by no toggle bits toggling.
* *
* Error are indicated by toggling bits or bits held with the wrong value, * Error are indicated by toggling bits or bits held with the wrong value,
* or with bits toggling. * or with bits toggling.
@@ -846,33 +810,36 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
* (including checking DQ5 for an error status) is tricky to get working * (including checking DQ5 for an error status) is tricky to get working
* correctly and is therefore not done (particularly with interleaved chips * correctly and is therefore not done (particularly with interleaved chips
* as each chip must be checked independently of the others). * as each chip must be checked independently of the others).
*
*/ */
static int __xipram chip_good(struct map_info *map, struct flchip *chip, static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
unsigned long addr, map_word expected) unsigned long addr, map_word *expected)
{ {
struct cfi_private *cfi = map->fldrv_priv; struct cfi_private *cfi = map->fldrv_priv;
map_word oldd, curd; map_word d, t;
int ret;
if (cfi_use_status_reg(cfi)) { if (cfi_use_status_reg(cfi)) {
map_word ready = CMD(CFI_SR_DRB); map_word ready = CMD(CFI_SR_DRB);
/* /*
* For chips that support status register, check device * For chips that support status register, check device
* ready bit * ready bit
*/ */
cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi, cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
cfi->device_type, NULL); cfi->device_type, NULL);
curd = map_read(map, addr); t = map_read(map, addr);
return map_word_andequal(map, curd, ready, ready); return map_word_andequal(map, t, ready, ready);
} }
oldd = map_read(map, addr); d = map_read(map, addr);
curd = map_read(map, addr); t = map_read(map, addr);
return map_word_equal(map, oldd, curd) && ret = map_word_equal(map, d, t);
map_word_equal(map, curd, expected);
if (!ret || !expected)
return ret;
return map_word_equal(map, t, *expected);
} }
static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode) static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode)
@@ -889,7 +856,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
case FL_STATUS: case FL_STATUS:
for (;;) { for (;;) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
break; break;
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -927,7 +894,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
chip->state = FL_ERASE_SUSPENDING; chip->state = FL_ERASE_SUSPENDING;
chip->erase_suspended = 1; chip->erase_suspended = 1;
for (;;) { for (;;) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
break; break;
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -1458,7 +1425,7 @@ static int do_otp_lock(struct map_info *map, struct flchip *chip, loff_t adr,
/* wait for chip to become ready */ /* wait for chip to become ready */
timeo = jiffies + msecs_to_jiffies(2); timeo = jiffies + msecs_to_jiffies(2);
for (;;) { for (;;) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
break; break;
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -1690,11 +1657,11 @@ static int __xipram do_write_oneword_once(struct map_info *map,
} }
/* /*
* We check "time_after" and "!chip_good" before checking * We check "time_after" and "!chip_ready" before checking
* "chip_good" to avoid the failure due to scheduling. * "chip_ready" to avoid the failure due to scheduling.
*/ */
if (time_after(jiffies, timeo) && if (time_after(jiffies, timeo) &&
!chip_good(map, chip, adr, datum)) { !chip_ready(map, chip, adr, &datum)) {
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__); printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr); xip_disable(map, chip, adr);
@@ -1702,7 +1669,7 @@ static int __xipram do_write_oneword_once(struct map_info *map,
break; break;
} }
if (chip_good(map, chip, adr, datum)) { if (chip_ready(map, chip, adr, &datum)) {
if (cfi_check_err_status(map, chip, adr)) if (cfi_check_err_status(map, chip, adr))
ret = -EIO; ret = -EIO;
break; break;
@@ -1970,18 +1937,18 @@ static int __xipram do_write_buffer_wait(struct map_info *map,
} }
/* /*
* We check "time_after" and "!chip_good" before checking * We check "time_after" and "!chip_ready" before checking
* "chip_good" to avoid the failure due to scheduling. * "chip_ready" to avoid the failure due to scheduling.
*/ */
if (time_after(jiffies, timeo) && if (time_after(jiffies, timeo) &&
!chip_good(map, chip, adr, datum)) { !chip_ready(map, chip, adr, &datum)) {
pr_err("MTD %s(): software timeout, address:0x%.8lx.\n", pr_err("MTD %s(): software timeout, address:0x%.8lx.\n",
__func__, adr); __func__, adr);
ret = -EIO; ret = -EIO;
break; break;
} }
if (chip_good(map, chip, adr, datum)) { if (chip_ready(map, chip, adr, &datum)) {
if (cfi_check_err_status(map, chip, adr)) if (cfi_check_err_status(map, chip, adr))
ret = -EIO; ret = -EIO;
break; break;
@@ -2190,7 +2157,7 @@ static int cfi_amdstd_panic_wait(struct map_info *map, struct flchip *chip,
* If the driver thinks the chip is idle, and no toggle bits * If the driver thinks the chip is idle, and no toggle bits
* are changing, then the chip is actually idle for sure. * are changing, then the chip is actually idle for sure.
*/ */
if (chip->state == FL_READY && chip_ready(map, chip, adr)) if (chip->state == FL_READY && chip_ready(map, chip, adr, NULL))
return 0; return 0;
/* /*
@@ -2207,7 +2174,7 @@ static int cfi_amdstd_panic_wait(struct map_info *map, struct flchip *chip,
/* wait for the chip to become ready */ /* wait for the chip to become ready */
for (i = 0; i < jiffies_to_usecs(timeo); i++) { for (i = 0; i < jiffies_to_usecs(timeo); i++) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
return 0; return 0;
udelay(1); udelay(1);
@@ -2271,13 +2238,13 @@ retry:
map_write(map, datum, adr); map_write(map, datum, adr);
for (i = 0; i < jiffies_to_usecs(uWriteTimeout); i++) { for (i = 0; i < jiffies_to_usecs(uWriteTimeout); i++) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
break; break;
udelay(1); udelay(1);
} }
if (!chip_good(map, chip, adr, datum) || if (!chip_ready(map, chip, adr, &datum) ||
cfi_check_err_status(map, chip, adr)) { cfi_check_err_status(map, chip, adr)) {
/* reset on all failures. */ /* reset on all failures. */
map_write(map, CMD(0xF0), chip->start); map_write(map, CMD(0xF0), chip->start);
@@ -2419,6 +2386,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int ret; int ret;
int retry_cnt = 0; int retry_cnt = 0;
map_word datum = map_word_ff(map);
adr = cfi->addr_unlock1; adr = cfi->addr_unlock1;
@@ -2473,7 +2441,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
if (chip_good(map, chip, adr, map_word_ff(map))) { if (chip_ready(map, chip, adr, &datum)) {
if (cfi_check_err_status(map, chip, adr)) if (cfi_check_err_status(map, chip, adr))
ret = -EIO; ret = -EIO;
break; break;
@@ -2518,6 +2486,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int ret; int ret;
int retry_cnt = 0; int retry_cnt = 0;
map_word datum = map_word_ff(map);
adr += chip->start; adr += chip->start;
@@ -2572,7 +2541,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
if (chip_good(map, chip, adr, map_word_ff(map))) { if (chip_ready(map, chip, adr, &datum)) {
if (cfi_check_err_status(map, chip, adr)) if (cfi_check_err_status(map, chip, adr))
ret = -EIO; ret = -EIO;
break; break;
@@ -2766,7 +2735,7 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map,
*/ */
timeo = jiffies + msecs_to_jiffies(2000); /* 2s max (un)locking */ timeo = jiffies + msecs_to_jiffies(2000); /* 2s max (un)locking */
for (;;) { for (;;) {
if (chip_ready(map, chip, adr)) if (chip_ready(map, chip, adr, NULL))
break; break;
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {