Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / drivers / net / pfe_eth / pfe_firmware.c

diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index 13112d9..55e661c 100644 (file)
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -10,16 +10,20 @@
  * files.
  */
 
+#include <image.h>
+#include <log.h>
 #include <malloc.h>
+#include <linux/bitops.h>
 #include <net/pfe_eth/pfe_eth.h>
 #include <net/pfe_eth/pfe_firmware.h>
+#include <spi_flash.h>
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
 
 #define PFE_FIRMWARE_FIT_CNF_NAME      "config@1"
 
-static const void *pfe_fit_addr = (void *)CONFIG_SYS_LS_PFE_FW_ADDR;
+static const void *pfe_fit_addr;
 
 /*
  * PFE elf firmware loader.
@@ -160,6 +164,44 @@ static int pfe_fit_check(void)
        return ret;
 }
 
+int pfe_spi_flash_init(void)
+{
+       struct spi_flash *pfe_flash;
+       int ret = 0;
+       void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
+
+#ifdef CONFIG_DM_SPI_FLASH
+       struct udevice *new;
+
+       /* speed and mode will be read from DT */
+       ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS,
+                                    CONFIG_ENV_SPI_CS, 0, 0, &new);
+
+       pfe_flash = dev_get_uclass_priv(new);
+#else
+       pfe_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
+                                   CONFIG_ENV_SPI_CS,
+                                   CONFIG_ENV_SPI_MAX_HZ,
+                                   CONFIG_ENV_SPI_MODE);
+#endif
+       if (!pfe_flash) {
+               printf("SF: probe for pfe failed\n");
+               return -ENODEV;
+       }
+
+       ret = spi_flash_read(pfe_flash,
+                            CONFIG_SYS_LS_PFE_FW_ADDR,
+                            CONFIG_SYS_QE_FMAN_FW_LENGTH,
+                            addr);
+       if (ret)
+               printf("SF: read for pfe failed\n");
+
+       pfe_fit_addr = addr;
+       spi_flash_free(pfe_flash);
+
+       return ret;
+}
+
 /*
  * PFE firmware initialization.
  * Loads different firmware files from FIT image.
@@ -184,6 +226,10 @@ int pfe_firmware_init(void)
        int ret = 0;
        int fw_count;
 
+       ret = pfe_spi_flash_init();
+       if (ret)
+               goto err;
+
        ret = pfe_fit_check();
        if (ret)
                goto err;