Add SCSI scan for ENV in EXT4 or FAT

When having environment stored in EXT4 or FAT
and using an AHCI or SCSI device / partition
the scan would not be performed early enough
and hence the device would not be recognized.
This change adds the scan when the interface
is "scsi" in a similar way to mmc_initialize.

Signed-off-by: Rogier Stam <rogier@unrailed.org>
Reviewed-by: Pali Rohár <pali@kernel.org>

diff --git a/env/ext4.c b/env/ext4.c
index 9f65afb8a4235036ae2faafec8f483c78264ef52..47e05a489193103d2599da89616d5aba8557bd08 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <ext4fs.h>
 #include <mmc.h>
+#include <scsi.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -146,6 +147,10 @@ static int env_ext4_load(void)
        if (!strcmp(ifname, "mmc"))
                mmc_initialize(NULL);
 #endif
+#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI)
+       if (!strcmp(ifname, "scsi"))
+               scsi_scan(true);
+#endif
 
        part = blk_get_device_part_str(ifname, dev_and_part,
                                       &dev_desc, &info, 1);

diff --git a/env/fat.c b/env/fat.c
index 6251d9649b194237f12047d72faa2296cb5a9784..3172130d75d3d639f730d20b3c5aa39a6b3d46b5 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fat.h>
 #include <mmc.h>
+#include <scsi.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
@@ -128,7 +129,12 @@ static int env_fat_load(void)
        if (!strcmp(ifname, "mmc"))
                mmc_initialize(NULL);
 #endif
-
+#ifndef CONFIG_SPL_BUILD
+#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI)
+       if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "scsi"))
+               scsi_scan(true);
+#endif
+#endif
        part = blk_get_device_part_str(ifname, dev_and_part,
                                       &dev_desc, &info, 1);
        if (part < 0)