diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-07-27 09:44:18 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-09-04 22:50:49 +0200 |
| commit | 52f05b6b87decfc74245ac16b4ae18e321b5ae98 (patch) | |
| tree | 3762211b251c5628575c29247851452800622f08 | |
| parent | 85e08e5864458b2e5e25defe2601bd835a42912c (diff) | |
| download | linux-stable-52f05b6b87decfc74245ac16b4ae18e321b5ae98.tar.gz linux-stable-52f05b6b87decfc74245ac16b4ae18e321b5ae98.tar.bz2 linux-stable-52f05b6b87decfc74245ac16b4ae18e321b5ae98.zip | |
mtd: rawnand: Add the nand_wait_rdy_op() helper and use it
In order to make sure we use ->exec_op() to wait for chip readiness
when it's available we provide an helper that does the selection
between ->exec_op(), udelay(chip->chip_delay) and nand_wait_ready()
based on what's implemented by the controller driver.
We then use it in nand_wait_readrdy().
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 21a04b7b918c..e591410cddc9 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -2246,6 +2246,28 @@ static int nand_get_features_op(struct nand_chip *chip, u8 feature, return 0; } +static int nand_wait_rdy_op(struct nand_chip *chip, unsigned int timeout_ms, + unsigned int delay_ns) +{ + if (chip->exec_op) { + struct nand_op_instr instrs[] = { + NAND_OP_WAIT_RDY(PSEC_TO_MSEC(timeout_ms), + PSEC_TO_NSEC(delay_ns)), + }; + struct nand_operation op = NAND_OPERATION(instrs); + + return nand_exec_op(chip, &op); + } + + /* Apply delay or wait for ready/busy pin */ + if (!chip->dev_ready) + udelay(chip->chip_delay); + else + nand_wait_ready(nand_to_mtd(chip)); + + return 0; +} + /** * nand_reset_op - Do a reset operation * @chip: The NAND chip @@ -3526,14 +3548,13 @@ static int nand_setup_read_retry(struct mtd_info *mtd, int retry_mode) static void nand_wait_readrdy(struct nand_chip *chip) { + const struct nand_sdr_timings *sdr; + if (!(chip->options & NAND_NEED_READRDY)) return; - /* Apply delay or wait for ready/busy pin */ - if (!chip->dev_ready) - udelay(chip->chip_delay); - else - nand_wait_ready(nand_to_mtd(chip)); + sdr = nand_get_sdr_timings(&chip->data_interface); + WARN_ON(nand_wait_rdy_op(chip, PSEC_TO_MSEC(sdr->tR_max), 0)); } /** |