Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

scsi: move scsi_scan() call out of scsi_get_blk_by_uuid()

Browse Source 
Move scsi_scan() call out of scsi_get_blk_by_uuid().

The only caller, env_scsi_get_part(), should be managing this call since
it may also want to use different ways to get the partition information
in the future.

Signed-off-by: David Lechner <dlechner@baylibre.com>
This commit is contained in:
David Lechner
2026-03-26 17:59:26 -05:00
committed by Tom Rini
parent 7b824e7505
commit b382cd0973
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/scsi-uclass.c
View File

@@ -29,15 +29,9 @@ int scsi_get_blk_by_uuid(const char *uuid,
struct blk_desc **blk_desc_ptr,
struct disk_partition *part_info_ptr)
{
static int is_scsi_scanned;
struct blk_desc *blk;
int i, ret;
if (!is_scsi_scanned) {
scsi_scan(false /* no verbose */);
is_scsi_scanned = 1;
}
for (i = 0; i < blk_find_max_devnum(UCLASS_SCSI) + 1; i++) {
ret = blk_get_desc(UCLASS_SCSI, i, &blk);
if (ret)

6
env/scsi.c vendored
View File

@@ -33,8 +33,14 @@ static struct env_scsi_info env_part;
static inline struct env_scsi_info *env_scsi_get_part(void)
{
static bool is_scsi_scanned;
struct env_scsi_info *ep = &env_part;
if (!is_scsi_scanned) {
scsi_scan(false /* no verbose */);
is_scsi_scanned = true;
}
if (scsi_get_blk_by_uuid(CONFIG_ENV_SCSI_PART_UUID, &ep->blk, &ep->part))
return NULL;

2
include/scsi.h
View File

@@ -356,6 +356,8 @@ int scsi_scan_dev(struct udevice *dev, bool verbose);
/**
* scsi_get_blk_by_uuid() - Provides SCSI partition information.
*
* scsi_scan() must have been called before calling this function.
*
* @uuid: UUID of the partition for fetching its info
* @blk_desc_ptr: Provides the blk descriptor
* @part_info_ptr: Provides partition info