leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sf: Simplify fastest read cmd code

Browse Source 
Fastest read command code look for fastest read command
taking inputs from spi->mode_rx and flags from param table
and controller mode_rx is always been a priority.

Since mode_rx is always set from controller side this optimized
code doesn't require much and this code required exctra overhead like
1) Maintain e_rx_cmd in param table
2) Maintain mode_rx in spi_slave {}

Hence removed this code, and look for read command from normal
spi->mode from spi_slave{} and params->flags

Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Jagan Teki
2016-08-08 16:50:45 +05:30
committed by Jagan Teki
parent 28b69f6488
commit edd35f712e
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/spi/sf_internal.h
View File

@@ -46,6 +46,10 @@ enum {
E_FSR = BIT(2), E_FSR = BIT(2),
SST_WR = BIT(3), SST_WR = BIT(3),
WR_QPP = BIT(4), WR_QPP = BIT(4),
RD_QUAD = BIT(5),
RD_DUAL = BIT(6),
RD_QUADIO = BIT(7),
RD_DUALIO = BIT(8),
}; };
enum spi_nor_option_flags { enum spi_nor_option_flags {

28
drivers/mtd/spi/spi_flash.c
View File

@@ -1013,15 +1013,8 @@ int spi_flash_scan(struct spi_flash *flash)
struct spi_slave *spi = flash->spi; struct spi_slave *spi = flash->spi;
const struct spi_flash_params *params; const struct spi_flash_params *params;
u16 jedec, ext_jedec; u16 jedec, ext_jedec;
u8 cmd, idcode[5]; u8 idcode[5];
int ret; int ret;
static u8 spi_read_cmds_array[] = {
CMD_READ_ARRAY_SLOW,
CMD_READ_ARRAY_FAST,
CMD_READ_DUAL_OUTPUT_FAST,
CMD_READ_QUAD_OUTPUT_FAST,
CMD_READ_DUAL_IO_FAST,
CMD_READ_QUAD_IO_FAST };
/* Read the ID codes */ /* Read the ID codes */
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
@@ -1177,17 +1170,16 @@ int spi_flash_scan(struct spi_flash *flash)
/* Now erase size becomes valid sector size */ /* Now erase size becomes valid sector size */
flash->sector_size = flash->erase_size; flash->sector_size = flash->erase_size;
/* Look for the fastest read cmd */ /* Look for read commands */
cmd = fls(params->e_rd_cmd & spi->mode_rx); flash->read_cmd = CMD_READ_ARRAY_FAST;
if (cmd) { if (spi->mode_rx & SPI_RX_SLOW)
cmd = spi_read_cmds_array[cmd - 1]; flash->read_cmd = CMD_READ_ARRAY_SLOW;
flash->read_cmd = cmd; else if (spi->mode_rx & SPI_RX_QUAD && params->flags & RD_QUAD)
} else { flash->read_cmd = CMD_READ_QUAD_OUTPUT_FAST;
/* Go for default supported read cmd */ else if (spi->mode_rx & SPI_RX_DUAL && params->flags & RD_DUAL)
flash->read_cmd = CMD_READ_ARRAY_FAST; flash->read_cmd = CMD_READ_DUAL_OUTPUT_FAST;
}
/* Not require to look for fastest only two write cmds yet */ /* Look for write commands */
if (params->flags & WR_QPP && spi->mode & SPI_TX_QUAD) if (params->flags & WR_QPP && spi->mode & SPI_TX_QUAD)
flash->write_cmd = CMD_QUAD_PAGE_PROGRAM; flash->write_cmd = CMD_QUAD_PAGE_PROGRAM;
else else