cmd: gpt: add eMMC and GPT support
PATCH v4 1/1 cmd: gpt: add eMMC and GPT support
From: Corneliu Doban <[email protected]>
Add eMMC and GPT support.
- GPT partition list and command to create the GPT added to u-boot environment
- eMMC boot commands added to u-boot environment
- new gpt commands (enumarate and setenv) that are used by broadcom update scripts and boot commands
- eMMC specific u-boot configurations with environment saved in eMMC and GPT support
---
Changes from v3:
-Address review comments from Simon Glass,
Return -ve number instead of 1 upon failure, Use shorter variable name,
Modified code to avoid buffer overflow,
Use if (!strcmp(...)) instead of if (strcmp(...) == 0)
Changes from v2:
-Address review comments from Simon Glass,
Check for return value of part_driver_get_count(), Don't check return value of part_driver_get(), Rewrite part_driver_get() and rename to part_driver_get_first(), Use env_set_ulong() whereever applicable,
-Address review comments from Michael Nazzareno Trimarchi,
Add new function to set all env vriables,
Changes from v1:
-Address review comments from Simon Glass,
Correct function comments,
Check for return value,
Add helper function in part.h
cmd/gpt.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 29 +++++++++ 2 files changed, 190 insertions(+)
cmd/gpt.c +161 -0
@@ -18,6 +18,7 @@#include <command.h> #include <part.h> #include <part_efi.h> +#include <part.h> #include <exports.h> #include <uuid.h> #include <linux/ctype.h>
@@ -621,6 +622,152 @@ static int gpt_verify(struct blk_desc *blk_dev_desc, const char *str_part)return ret; } +/** +* gpt_enumerate() - Enumerate partition names into environment variable. +* +* Enumerate partition names. Partition names are stored in gpt_partition_list +* environment variable. Each partition name is delimited by space. +* +* @desc: block device descriptor +* +* @Return: '0' on success and -ve error on failure +*/ +static int gpt_enumerate (struct blk_desc *desc) +{ +struct part_driver *first_drv, *part_drv; +int str_len =0 , tmp_len; +char part_list[2048 ]; +int n_drvs; +char *ptr; + + part_list[0 ] =0 ; + n_drvs =part_driver_get_count (); +if (!n_drvs) { +printf ("Failed to get partition driver count\n" ); +return -ENOENT ; + } + + first_drv =part_driver_get_first (); +for (part_drv = first_drv; part_drv != first_drv + n_drvs; part_drv++) { +struct disk_partition pinfo; +int ret; +int i; + +for (i =1 ; i < part_drv->max_entries; i++) { + ret = part_drv->get_info (desc, i, &pinfo); +if (ret) { +/* no more entries in table */ +break ; + } + + ptr = &part_list[str_len]; + tmp_len =strlen ((const char *)pinfo.name); + str_len += tmp_len; +/* +1 for space */ + str_len++; +if (str_len >sizeof (part_list)) { +printf ("Error insufficient memory\n" ); +return -ENOMEM ; + } +strcpy (ptr, (const char *)pinfo.name); +/* One byte for space(" ") delimiter */ + ptr[tmp_len] =' ' ; + } + } +if (*part_list) + part_list[strlen (part_list) -1 ] =0 ; +debug ("setenv gpt_partition_list %s\n" , part_list); + +return env_set ("gpt_partition_list" , part_list); +} + +/** +* gpt_setenv_part_variables() - setup partition environmental variables +* +* Setup the gpt_partition_name, gpt_partition_entry, gpt_partition_addr +* and gpt_partition_size environment variables. +* +* @pinfo: pointer to disk partition +* @i: partition entry +* +* @Return: '0' on success and -ENOENT on failure +*/ +static int gpt_setenv_part_variables (struct disk_partition *pinfo,int i) +{ +int ret; + + ret =env_set_ulong ("gpt_partition_addr" , pinfo->start); +if (ret) + goto fail; + + ret =env_set_ulong ("gpt_partition_size" , pinfo->size); +if (ret) + goto fail; + + ret =env_set_ulong ("gpt_partition_entry" , i); +if (ret) + goto fail; + + ret =env_set ("gpt_partition_name" , (const char *)pinfo->name); +if (ret) + goto fail; + +return 0 ; + +fail: +return -ENOENT ; +} + +/** +* gpt_setenv() - Dynamically setup environment variables. +* +* Dynamically setup environment variables for name, index, offset and size +* for partition in GPT table after running "gpt setenv" for a partition name. +* +* @desc: block device descriptor +* @name: partition name +* +* @Return: '0' on success and -ve err on failure +*/ +static int gpt_setenv (struct blk_desc *desc,const char *name) +{ +struct part_driver *first_drv, *part_drv; +int n_drvs; +int ret; + + n_drvs =part_driver_get_count (); +if (!n_drvs) { +printf ("Failed to get partition driver count\n" ); + goto fail; + } + + first_drv =part_driver_get_first (); +for (part_drv = first_drv; part_drv != first_drv + n_drvs; part_drv++) { +struct disk_partition pinfo; +int i; + +for (i =1 ; i < part_drv->max_entries; i++) { + ret = part_drv->get_info (desc, i, &pinfo); +if (ret) { +/* no more entries in table */ +break ; + } + +if (!strcmp (name, (const char *)pinfo.name)) { +/* match found, setup environment variables */ + ret =gpt_setenv_part_variables (&pinfo, i); +if (ret) + goto fail; + +return 0 ; + } + } + } + +fail: +return ret; +} +static int do_disk_guid (struct blk_desc *dev_desc,char *const namestr) {int ret;
@@ -827,6 +974,10 @@ static int do_gpt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) }else if ((strcmp (argv[1 ],"verify" ) ==0 )) { ret =gpt_verify (blk_dev_desc, argv[4 ]);printf ("Verify GPT: " ); + }else if ((strcmp (argv[1 ],"setenv" ) ==0 )) { + ret =gpt_setenv (blk_dev_desc, argv[4 ]); + }else if ((strcmp (argv[1 ],"enumerate" ) ==0 )) { + ret =gpt_enumerate (blk_dev_desc); }else if (strcmp (argv[1 ],"guid" ) ==0 ) { ret =do_disk_guid (blk_dev_desc, argv[4 ]);#ifdef CONFIG_CMD_GPT_RENAME
@@ -857,7 +1008,17 @@ U_BOOT_CMD(gpt, CONFIG_SYS_MAXARGS, 1, do_gpt," to interface\n" " Example usage:\n" " gpt write mmc 0 $partitions\n" +" - write the GPT to device\n" " gpt verify mmc 0 $partitions\n" +" - verify the GPT on device against $partitions\n" +" gpt setenv mmc 0 $name\n" +" - setup environment variables for partition $name:\n" +" gpt_partition_addr, gpt_partition_size,\n" +" gpt_partition_name, gpt_partition_entry\n" +" gpt enumerate mmc 0\n" +" - store list of partitions to gpt_partition_list environment variable\n" +" read <interface> <dev>\n" +" - read GPT into a data structure for manipulation\n" " gpt guid <interface> <dev>\n" " - print disk GUID\n" " gpt guid <interface> <dev> <varname>\n"
include/part.h +29 -0
@@ -9,6 +9,7 @@#include <blk.h> #include <ide.h> #include <uuid.h> +#include <linker_lists.h> #include <linux/list.h> struct block_drvr {
@@ -476,5 +477,33 @@ int write_mbr_partition(struct blk_desc *dev_desc, void *buf);#endif +#ifdef CONFIG_PARTITIONS +/** +* part_driver_get_count() - get partition driver count +* +* @return - number of partition drivers +*/ +static inline int part_driver_get_count (void ) +{ + return ll_entry_count(struct part_driver, part_driver); +} + +/** +* part_driver_get_first() - get first partition driver +* +* @return - pointer to first partition driver on success, otherwise NULL +*/ +static inline struct part_driver *part_driver_get_first (void ) +{ + return ll_entry_start(struct part_driver, part_driver); +} + +#else +static inline int part_driver_get_count (void ) +{return 0 ; } + +static inline struct part_driver *part_driver_get_first (void ) +{return NULL ; } +#endif /* CONFIG_PARTITIONS */ #endif /* _PART_H */
Signature · 1 line
2.17.1
PATCH v4 1/1 cmd: gpt: add eMMC and GPT support
Hi Rayagonda,
Quoted 38 lines · Rayagonda Kokatanur
From: Corneliu Doban <[email protected]>
Add eMMC and GPT support.
- GPT partition list and command to create the GPT added to u-boot environment
- eMMC boot commands added to u-boot environment
- new gpt commands (enumarate and setenv) that are used by broadcom update scripts and boot commands
- eMMC specific u-boot configurations with environment saved in eMMC and GPT supportSigned-off-by Corneliu Doban <[email protected]>Signed-off-by Rayagonda Kokatanur <[email protected]>---
Changes from v3:
-Address review comments from Simon Glass,
Return -ve number instead of 1 upon failure, Use shorter variable name,
Modified code to avoid buffer overflow,
Use if (!strcmp(...)) instead of if (strcmp(...) == 0)Changes from v2:
-Address review comments from Simon Glass,
Check for return value ofpart_driver_get_count(), Don't check return value ofpart_driver_get(), Rewritepart_driver_get()and rename topart_driver_get_first(), Useenv_set_ulong()whereever applicable,-Address review comments from Michael Nazzareno Trimarchi,
Add new function to set all env vriables,Changes from v1:
-Address review comments from Simon Glass,
Correct function comments,
Check for return value,
Add helper function inpart.h
Quoted 3 lines
cmd/gpt.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 29 +++++++++ 2 files changed, 190 insertions(+)
Yes this looks OK to me. What sort of trouble are you having with the test?
Regards,
SImon
PATCH v4 1/1 cmd: gpt: add eMMC and GPT support
In reply to Rayagonda KokatanurQuoted 55 lines · Rayagonda Kokatanur
From: Corneliu Doban <[email protected]>
Add eMMC and GPT support.
- GPT partition list and command to create the GPT added to u-boot environment
- eMMC boot commands added to u-boot environment
- new gpt commands (enumarate and setenv) that are used by broadcom update scripts and boot commands
- eMMC specific u-boot configurations with environment saved in eMMC and GPT supportSigned-off-by Corneliu Doban <[email protected]>Signed-off-by Rayagonda Kokatanur <[email protected]>---
Changes from v3:
-Address review comments from Simon Glass,
Return -ve number instead of 1 upon failure, Use shorter variable name,
Modified code to avoid buffer overflow,
Use if (!strcmp(...)) instead of if (strcmp(...) == 0)Changes from v2:
-Address review comments from Simon Glass,
Check for return value ofpart_driver_get_count(), Don't check return value ofpart_driver_get(), Rewritepart_driver_get()and rename topart_driver_get_first(), Useenv_set_ulong()whereever applicable,-Address review comments from Michael Nazzareno Trimarchi,
Add new function to set all env vriables,Changes from v1:
-Address review comments from Simon Glass,
Correct function comments,
Check for return value,
Add helper function inpart.hcmd/gpt.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ include/part.h | 29 +++++++++ 2 files changed, 190 insertions(+)cmd/gpt.c +9
-0+ +/** +* gpt_setenv_part_variables() - setup partition environmental variables +* +* Setup the gpt_partition_name, gpt_partition_entry, gpt_partition_addr +* and gpt_partition_size environment variables. +* +* @pinfo: pointer to disk partition +* @i: partition entry
cmd/gpt.c static int gpt_verify(struct blk_desc *blk_dev_desc, const char *str_part) · line 701
Quoted 10 lines
cmd/gpt.c +10
-0+* +* @Return: '0' on success and -ENOENT on failure +*/ +static int gpt_setenv_part_variables (struct disk_partition *pinfo,int i) +{ +int ret; + + ret =env_set_ulong ("gpt_partition_addr" , pinfo->start); +if (ret) + goto fail;
You should use env_set_hex() instead of env_set_ulong() for following reasons:
1. commands (ex: mmc read/write etc.) that use gpt_partition_addr and gpt_partition_size expect them to be in hex values.
2. maintain compatibility with existing usage in the upstream code base
https://gitlab.denx.de/u-boot/u-boot/-/blob/master/include/configs/bcm_ns3.h
ex:
"gpt setenv mmc ${sd_device_number} ${fit_image};"\
"mmc read ${fit_image_loadaddr} ${gpt_partition_addr} "\cmd/gpt.c static int gpt_verify(struct blk_desc *blk_dev_desc, const char *str_part) · line 705
Quoted 4 lines
cmd/gpt.c +4
-0+ + ret =env_set_ulong ("gpt_partition_size" , pinfo->size); +if (ret) + goto fail;
You should use env_set_hex() instead of env_set_ulong() for same above reasons.
Best Regards,
Thiru