mtd: spi-nor-core: Perform a Soft Reset on boot

When the flash is handed to us in a stateful mode like 8D-8D-8D, it is

difficult to detect the mode the flash is in. One option is to read SFDP
in all modes and see which one gives the correct "SFDP" signature, but
not all flashes support SFDP in 8D-8D-8D mode.

Further, even if you detect the mode of the flash via SFDP, you still
have the problem of actually reading the ID. The Read ID command is not
standardized across flash vendors. Flashes can have different dummy
cycles needed for reading the ID. Some flashes even expect a 4-byte
dummy address with the Read ID command. All this information cannot be
obtained from the SFDP table.

So, perform a Software Reset sequence before reading the ID and
initializing the flash. A Soft Reset will bring back the flash in its
default protocol mode assuming no non-volatile configuration was set.
This will let us detect the flash even if ROM hands it to us in Octal
DTR mode.

To accommodate cases where there is more than one flash on a board, and
only one of them needs a soft reset, failure to reset is not made fatal,
and we still try to read ID if possible.

Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 185ebbeb022a347ee40058739ab396ff7ee4ab63..b46035aee4a216c905fd4448cda602398f9b5d97 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -104,6 +104,16 @@ config SPI_FLASH_SOFT_RESET
         Enable support for xSPI Software Reset. It will be used to switch from
         Octal DTR mode to legacy mode on shutdown and boot (if enabled).
 
+config SPI_FLASH_SOFT_RESET_ON_BOOT
+       bool "Perform a Software Reset on boot on flashes that boot in stateful mode"
+       depends on SPI_FLASH_SOFT_RESET
+       default n
+       help
+        Perform a Software Reset on boot to allow detecting flashes that are
+        handed to us in Octal DTR mode. Do not enable this config on flashes
+        that are not supposed to be handed to U-Boot in Octal DTR mode, even
+        if they _do_ support the Soft Reset sequence.
+
 config SPI_FLASH_BAR
        bool "SPI flash Bank/Extended address register support"
        help

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 642068a4e265ee1e453c802e4875c42a73abfaf5..3bf94044905bbfd8efc787dd74a9a24ff9f1cd03 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3062,6 +3062,33 @@ int spi_nor_scan(struct spi_nor *nor)
 
        nor->setup = spi_nor_default_setup;
 
+#ifdef CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT
+       /*
+        * When the flash is handed to us in a stateful mode like 8D-8D-8D, it
+        * is difficult to detect the mode the flash is in. One option is to
+        * read SFDP in all modes and see which one gives the correct "SFDP"
+        * signature, but not all flashes support SFDP in 8D-8D-8D mode.
+        *
+        * Further, even if you detect the mode of the flash via SFDP, you
+        * still have the problem of actually reading the ID. The Read ID
+        * command is not standardized across flash vendors. Flashes can have
+        * different dummy cycles needed for reading the ID. Some flashes even
+        * expect a 4-byte dummy address with the Read ID command. All this
+        * information cannot be obtained from the SFDP table.
+        *
+        * So, perform a Software Reset sequence before reading the ID and
+        * initializing the flash. A Soft Reset will bring back the flash in
+        * its default protocol mode assuming no non-volatile configuration was
+        * set. This will let us detect the flash even if ROM hands it to us in
+        * Octal DTR mode.
+        *
+        * To accommodate cases where there is more than one flash on a board,
+        * and only one of them needs a soft reset, failure to reset is not
+        * made fatal, and we still try to read ID if possible.
+        */
+       spi_nor_soft_reset(nor);
+#endif /* CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT */
+
        info = spi_nor_read_id(nor);
        if (IS_ERR_OR_NULL(info))
                return -ENOENT;