colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: mmc: refactor mmc_offset_try_partition()

Browse Source 
In preparation for fixing the handling of a the case of redundant
environment defined in two separate partitions with the U-Boot env
GUID, refactor the

  for ()
    if (str)
      ...
  #ifdef CONFIG_FOO
    if (!str)
      ..
  #endif

to

  if (str)
    for ()
  else if (CONFIG_FOO && !str)
    for ()

and put those for loops in separate functions.

No functional change intended, but I did change the direct access of
info.type_guid into using the disk_partition_type_guid() helper, so
that I could avoid the #ifdef and use IS_ENABLED() in the if() statement.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
This commit is contained in:
Rasmus Villemoes
2024-09-12 15:41:39 +02:00
committed by Tom Rini
parent 2857b983f8
commit d7c59bfc3b
1 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
env/mmc.c vendored
View File

@@ -53,11 +53,45 @@ DECLARE_GLOBAL_DATA_PTR;
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
static int mmc_env_partition_by_name(struct blk_desc *desc, const char *str,
struct disk_partition *info)
{
int i, ret;
for (i = 1;; i++) {
ret = part_get_info(desc, i, info);
if (ret < 0)
return ret;
if (!strncmp((const char *)info->name, str, sizeof(info->name)))
return 0;
}
}
static int mmc_env_partition_by_guid(struct blk_desc *desc, struct disk_partition *info)
{
const efi_guid_t env_guid = PARTITION_U_BOOT_ENVIRONMENT;
efi_guid_t type_guid;
int i, ret;
for (i = 1;; i++) {
ret = part_get_info(desc, i, info);
if (ret < 0)
return ret;
uuid_str_to_bin(disk_partition_type_guid(info), type_guid.b, UUID_STR_FORMAT_GUID);
if (!memcmp(&env_guid, &type_guid, sizeof(efi_guid_t)))
return 0;
}
}
static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val)
{ {
struct disk_partition info; struct disk_partition info;
struct blk_desc *desc; struct blk_desc *desc;
int len, i, ret; int len, ret;
char dev_str[4]; char dev_str[4];
snprintf(dev_str, sizeof(dev_str), "%d", mmc_get_env_dev()); snprintf(dev_str, sizeof(dev_str), "%d", mmc_get_env_dev());
@@ -65,25 +99,14 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val)
if (ret < 0) if (ret < 0)
return (ret); return (ret);
for (i = 1;;i++) { if (str) {
ret = part_get_info(desc, i, &info); ret = mmc_env_partition_by_name(desc, str, &info);
} else if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) && !str) {
ret = mmc_env_partition_by_guid(desc, &info);
}
if (ret < 0) if (ret < 0)
return ret; return ret;
if (str && !strncmp((const char *)info.name, str, sizeof(info.name)))
break;
#ifdef CONFIG_PARTITION_TYPE_GUID
if (!str) {
const efi_guid_t env_guid = PARTITION_U_BOOT_ENVIRONMENT;
efi_guid_t type_guid;
uuid_str_to_bin(info.type_guid, type_guid.b, UUID_STR_FORMAT_GUID);
if (!memcmp(&env_guid, &type_guid, sizeof(efi_guid_t)))
break;
}
#endif
}
/* round up to info.blksz */ /* round up to info.blksz */
len = DIV_ROUND_UP(CONFIG_ENV_SIZE, info.blksz); len = DIV_ROUND_UP(CONFIG_ENV_SIZE, info.blksz);