[U-Boot] [PATCH v3 06/13] sf: Update status reg check in spi_flash_cmd_wait_ready

[Bin Meng]

On Wed, Sep 2, 2015 at 2:09 PM, Jagan Teki <jteki at openedev.com> wrote:
> Current flash wait_ready logic is not modular to add new
> register status check, hence updated the status check for
> adding few more register checks in future.
>
> Below are the sf speed runs with 'sf update' on whole flash, 16MiB.
>
> => sf update 0x100 0x0 0x1000000
> device 0 whole chip
> 16777216 bytes written, 0 bytes skipped in 59.564s, speed 289262 B/s
>
> => sf update 0x100 0x0 0x1000000
> device 0 whole chip
> 16777216 bytes written, 0 bytes skipped in 62.549s, speed 275036 B/s
>
> => sf update 0x100 0x0 0x1000000
> device 0 whole chip
> 16777216 bytes written, 0 bytes skipped in 61.276s, speed 284359 B/s
>
> Signed-off-by: Jagan Teki <jteki at openedev.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Marek Vasut <marex at denx.de>
> Cc: Michal Simek <michal.simek at xilinx.com>
> Cc: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> Cc: Stefan Roese <sr at denx.de>
> Cc: Tom Warren <twarren at nvidia.com>
> Cc: Bin Meng <bmeng.cn at gmail.com>
> Cc: Tom Rini <trini at konsulko.com>
> Tested-by: Jagan Teki <jteki at openedev.com>
> ---

Please fix the compiler warnings below:

drivers/mtd/spi/sf_ops.c: In function ‘spi_flash_cmd_wait_ready’:
drivers/mtd/spi/sf_ops.c:165:3: warning: passing argument 2 of
‘spi_flash_cmd_read_status’ from incompatible pointer type [enabled by
default]
drivers/mtd/spi/sf_ops.c:29:5: note: expected ‘u8 *’ but argument is
of type ‘int *’

Other than that,

Tested on Intel Crown Bay
Tested-by: Bin Meng <bmeng.cn at gmail.com>

> Changes for v3:
>         - none
> Changes for v2:
>         - Remove unneeded comments.
>
>  drivers/mtd/spi/sf_ops.c | 70 +++++++++---------------------------------------
>  1 file changed, 12 insertions(+), 58 deletions(-)
>
> diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
> index 6e457ec..c1cdde7 100644
> --- a/drivers/mtd/spi/sf_ops.c
> +++ b/drivers/mtd/spi/sf_ops.c
> @@ -139,72 +139,26 @@ static void spi_flash_dual_flash(struct spi_flash *flash, u32 *addr)
>  }
>  #endif
>
> -static int spi_flash_poll_status(struct spi_slave *spi, unsigned long timeout,
> -                                u8 cmd, u8 poll_bit)
> -{
> -       unsigned long timebase;
> -       unsigned long flags = SPI_XFER_BEGIN;
> -       int ret;
> -       u8 status;
> -       u8 check_status = 0x0;
> -
> -       if (cmd == CMD_FLAG_STATUS)
> -               check_status = poll_bit;
> -
> -#ifdef CONFIG_SF_DUAL_FLASH
> -       if (spi->flags & SPI_XFER_U_PAGE)
> -               flags |= SPI_XFER_U_PAGE;
> -#endif
> -       ret = spi_xfer(spi, 8, &cmd, NULL, flags);
> -       if (ret) {
> -               debug("SF: fail to read %s status register\n",
> -                     cmd == CMD_READ_STATUS ? "read" : "flag");
> -               return ret;
> -       }
> -
> -       timebase = get_timer(0);
> -       do {
> -               WATCHDOG_RESET();
> -
> -               ret = spi_xfer(spi, 8, NULL, &status, 0);
> -               if (ret)
> -                       return -1;
> -
> -               if ((status & poll_bit) == check_status)
> -                       break;
> -
> -       } while (get_timer(timebase) < timeout);
> -
> -       spi_xfer(spi, 0, NULL, NULL, SPI_XFER_END);
> -
> -       if ((status & poll_bit) == check_status)
> -               return 0;
> -
> -       /* Timed out */
> -       debug("SF: time out!\n");
> -       return -1;
> -}
> -
>  int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
>  {
> -       struct spi_slave *spi = flash->spi;
> -       int ret;
> -       u8 poll_bit = STATUS_WIP;
> -       u8 cmd = CMD_READ_STATUS;
> +       int timebase, ret, sr;
>
> -       ret = spi_flash_poll_status(spi, timeout, cmd, poll_bit);
> -       if (ret < 0)
> -               return ret;
> +       timebase = get_timer(0);
>
> -       if (flash->poll_cmd == CMD_FLAG_STATUS) {
> -               poll_bit = STATUS_PEC;
> -               cmd = CMD_FLAG_STATUS;
> -               ret = spi_flash_poll_status(spi, timeout, cmd, poll_bit);
> +       while (get_timer(timebase) < timeout) {
> +               ret = spi_flash_cmd_read_status(flash, &sr);
>                 if (ret < 0)
>                         return ret;
> +
> +               if (sr < 0)
> +                       break;
> +               else if (!(sr & STATUS_WIP))
> +                       return 0;
>         }
>
> -       return 0;
> +       printf("SF: Timeout!\n");
> +
> +       return -ETIMEDOUT;
>  }
>
>  int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
> --

Regards,
Bin