Skip to content

Commit e93a977

Browse files
herrera-luis-albertoambarus
authored andcommitted
mtd: revert "spi-nor: intel: provide a range for poll_timout"
This change reverts aba3a88: "mtd: spi-nor: intel: provide a range for poll_timout". That change introduces a performance regression when reading sequentially from flash. Logging calls to intel_spi_read without this change we get: Start MTD read [ 20.045527] intel_spi_read(from=1800000, len=400000) [ 20.045527] intel_spi_read(from=1800000, len=400000) [ 282.199274] intel_spi_read(from=1c00000, len=400000) [ 282.199274] intel_spi_read(from=1c00000, len=400000) [ 544.351528] intel_spi_read(from=2000000, len=400000) [ 544.351528] intel_spi_read(from=2000000, len=400000) End MTD read With this change: Start MTD read [ 21.942922] intel_spi_read(from=1c00000, len=400000) [ 21.942922] intel_spi_read(from=1c00000, len=400000) [ 23.784058] intel_spi_read(from=2000000, len=400000) [ 23.784058] intel_spi_read(from=2000000, len=400000) [ 25.625006] intel_spi_read(from=2400000, len=400000) [ 25.625006] intel_spi_read(from=2400000, len=400000) End MTD read Signed-off-by: Luis Alberto Herrera <[email protected]> Tested-by: Alexander Sverdlin <[email protected]> Acked-by: Mika Westerberg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Tudor Ambarus <[email protected]>
1 parent 99eae48 commit e93a977

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/mtd/spi-nor/controllers/intel-spi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static int intel_spi_wait_hw_busy(struct intel_spi *ispi)
292292
u32 val;
293293

294294
return readl_poll_timeout(ispi->base + HSFSTS_CTL, val,
295-
!(val & HSFSTS_CTL_SCIP), 40,
295+
!(val & HSFSTS_CTL_SCIP), 0,
296296
INTEL_SPI_TIMEOUT * 1000);
297297
}
298298

@@ -301,7 +301,7 @@ static int intel_spi_wait_sw_busy(struct intel_spi *ispi)
301301
u32 val;
302302

303303
return readl_poll_timeout(ispi->sregs + SSFSTS_CTL, val,
304-
!(val & SSFSTS_CTL_SCIP), 40,
304+
!(val & SSFSTS_CTL_SCIP), 0,
305305
INTEL_SPI_TIMEOUT * 1000);
306306
}
307307

0 commit comments

Comments
 (0)