Hi Jagan, Vignesh,

On mar., oct. 01, 2024 at 18:06, Neil Armstrong neil.armstrong@linaro.org wrote:

To smoothly handle the transition from the legacy SPI FLASH API to the the driver model API, add the DM functions as dummy inline functions.

Today, client code uses #if/#else conditionals, but it's better to use if(IS_ENABLED()) to make sure all code builds fine and avoid configuration hell, leaving the compiler remove the dead code.

An example is cmd/sf, which could make use of those dummy functions to drop the conditional compilation.

Signed-off-by: Neil Armstrong neil.armstrong@linaro.org

I'd like to submit this through u-boot-dfu but before that i'd prefer to have an Acked-by from one of you.

Any opinion on this ?

Thank you for your time!

---

include/spi_flash.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)

diff --git a/include/spi_flash.h b/include/spi_flash.h index 10d19fd4b11..2e703e85250 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -139,6 +139,40 @@ int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs, void sandbox_sf_unbind_emul(struct sandbox_state *state, int busnum, int cs);

#else +/* Compatibility functions for when DM_SPI_FLASH is disabled */ +static inline int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,

• 			 struct udevice **devp)
  

+{

• return -ENODEV;

+}

+static inline int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len,

• 		    void *buf)
  

+{

• return -ENODEV;

+}

+static inline int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len,

• 		     const void *buf)
  

+{

• return -ENODEV;

+}

+static inline int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len) +{

• return -ENODEV;

+}

+static inline int spl_flash_get_sw_write_prot(struct udevice *dev) +{

• return -ENODEV;

+}

+static inline int spi_flash_std_probe(struct udevice *dev) +{

• return -ENODEV;

+}

struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int spi_mode);

-- 2.34.1

Hi Neil,

Thank you for the patch.

On mar., oct. 01, 2024 at 18:06, Neil Armstrong neil.armstrong@linaro.org wrote:

Align with cmd_sf, and try to rely on DT for spi speed and mode, and still fallback on spi_flash_probe() if it fails.

With the current scheme, spi_flash_probe() will be called with CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE with are set to 0 by default on DT platforms using DM_SPI_FLASH.

Like cmd_sf, keep the option to specify the speed and mode from the dfu_alt_mode string, but rely on DT properties if not specified.

Using CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE makes the SPIFC controller on Amlogic Meson G12B & SM1 hardware fail and is unable to recover until a system reboot.

Signed-off-by: Neil Armstrong neil.armstrong@linaro.org

Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com

---

drivers/dfu/dfu_sf.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 7c1c0f9e2dc..8f7296adec6 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -123,6 +123,7 @@ static struct spi_flash *parse_dev(char *devstr) unsigned int mode = CONFIG_SF_DEFAULT_MODE; char *s, *endp; struct spi_flash *dev;

• bool use_dt = true;

  s = strsep(&devstr, ":"); if (!s || !*s || (bus = simple_strtoul(s, &endp, 0), *endp)) {

@@ -143,6 +144,8 @@ static struct spi_flash *parse_dev(char *devstr) printf("Invalid SPI speed %s\n", s); return NULL; }

• if (IS_ENABLED(CONFIG_DM_SPI_FLASH))
  

• 	use_dt = false;
  

  }

  s = strsep(&devstr, ":");

@@ -152,9 +155,20 @@ static struct spi_flash *parse_dev(char *devstr) printf("Invalid SPI mode %s\n", s); return NULL; }

• if (IS_ENABLED(CONFIG_DM_SPI_FLASH))
  

• 	use_dt = false;
  

  }

• dev = spi_flash_probe(bus, cs, speed, mode);

• if (IS_ENABLED(CONFIG_DM_SPI_FLASH) && use_dt) {

• struct udevice *new;
  

• if (!spi_flash_probe_bus_cs(bus, cs, &new))
  

• 	dev = dev_get_uclass_priv(new);
  

• else
  

• 	dev = NULL;
  

• } else {

• dev = spi_flash_probe(bus, cs, speed, mode);
  

• } if (!dev) { printf("Failed to create SPI flash at %u:%u:%u:%u\n", bus, cs, speed, mode);

-- 2.34.1