From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lothar =?UTF-8?B?V2HDn21hbm4=?= Date: Tue, 6 Jun 2017 10:28:45 +0200 Subject: [U-Boot] [PATCH v3 3/5] GPT: read partition table from device into a data structure In-Reply-To: <1496456554-6816-4-git-send-email-alison@peloton-tech.com> References: <20170530084651.545d9954@ipc1.ka-ro> <1496456554-6816-1-git-send-email-alison@peloton-tech.com> <1496456554-6816-4-git-send-email-alison@peloton-tech.com> Message-ID: <20170606102845.3fd12018@karo-electronics.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Hi, On Fri, 2 Jun 2017 19:22:32 -0700 alison at peloton-tech.com wrote: > From: Alison Chaiken >=20 > Make the partition table available for modification by reading it from > the user-specified device into a linked list. Provide an accessor > function for command-line testing. >=20 > Signed-off-by: Alison Chaiken > --- > cmd/gpt.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ > include/part.h | 7 ++++ > 2 files changed, 119 insertions(+) >=20 > diff --git a/cmd/gpt.c b/cmd/gpt.c > index 4d00a35..5c2651f 100644 > --- a/cmd/gpt.c > +++ b/cmd/gpt.c > @@ -19,6 +19,9 @@ > #include > #include > #include > +#include > + > +static LIST_HEAD(disk_partitions); > =20 > /** > * extract_env(): Expand env name from string format '&{env_name}' > @@ -151,6 +154,111 @@ static bool found_key(const char *str, const char *= key) > return result; > } > =20 > +static void del_gpt_info(void) > +{ > + struct list_head *pos =3D &disk_partitions; > + struct disk_part *curr; > + while (!list_empty(pos)) { > + curr =3D list_entry(pos->next, struct disk_part, list); > + list_del(pos->next); > + free(curr); > + } > +} > + > +static struct disk_part *allocate_disk_part(disk_partition_t *info, int = partnum) > +{ > + struct disk_part *newpart; > + newpart =3D (struct disk_part *)malloc(sizeof(*newpart)); > + if (!newpart) > + return ERR_PTR(-ENOMEM); > + memset(newpart, '\0', sizeof(newpart)); > + > + newpart->gpt_part_info.start =3D info->start; > + newpart->gpt_part_info.size =3D info->size; > + newpart->gpt_part_info.blksz =3D info->blksz; > + strncpy((char *)newpart->gpt_part_info.name, (const char *)info->name, = PART_NAME_LEN); > + newpart->gpt_part_info.name[PART_NAME_LEN - 1] =3D '\0'; > + strncpy((char *)newpart->gpt_part_info.type, (const char *)info->type, = PART_TYPE_LEN); > + newpart->gpt_part_info.type[PART_TYPE_LEN - 1] =3D '\0'; > + newpart->gpt_part_info.bootable =3D info->bootable; > +#ifdef CONFIG_PARTITION_UUIDS > + strncpy(newpart->gpt_part_info.uuid, (const char *)info->uuid, > + UUID_STR_LEN); > +#endif > + newpart->partnum =3D partnum; > + > + return newpart; > +} > + > +static void print_gpt_info(void) > +{ > + struct list_head *pos; > + struct disk_part *curr; > + > + list_for_each(pos, &disk_partitions) { > + curr =3D list_entry(pos, struct disk_part, list); > + printf("Partition %d:\n", curr->partnum); > + printf("1st block %x, size %x\n", (unsigned)curr->gpt_part_info.start, > + (unsigned)curr->gpt_part_info.size); > + printf("Block size %lu, name %s\n", curr->gpt_part_info.blksz, > + curr->gpt_part_info.name); > + printf("Type %s, bootable %d\n", curr->gpt_part_info.type, > + curr->gpt_part_info.bootable); > +#ifdef CONFIG_PARTITION_UUIDS > + printf("UUID %s\n", curr->gpt_part_info.uuid); > +#endif > + printf("\n"); > + } > +} > + > +/* > + * read partition info into disk_partitions list where > + * it can be printed or modified > + */ > +static int get_gpt_info(struct blk_desc *dev_desc) > +{ > + /* start partition numbering at 1, as U-Boot does */ > + int valid_parts =3D 1, p, ret; > + disk_partition_t info; > + struct disk_part *new_disk_part; > + > + if (disk_partitions.next =3D=3D NULL) > + INIT_LIST_HEAD(&disk_partitions); > + > + for (p =3D 1; p <=3D MAX_SEARCH_PARTITIONS; p++) { > + ret =3D part_get_info(dev_desc, p, &info); > + if (ret) > + continue; > + > + new_disk_part =3D allocate_disk_part(&info, valid_parts); > + if (IS_ERR(new_disk_part) && valid_parts >=3D 2) > + return -ENODEV; > del_gpt_info()? This calls for a common error exit which does the cleanup. > + > + list_add_tail(&new_disk_part->list, &disk_partitions); > + valid_parts++; > + } > + if (!valid_parts) { > + printf("** No valid partitions found **\n"); > + del_gpt_info(); > + return -ENODEV; > + } > + return --valid_parts; > +} > + Lothar Wa=C3=9Fmann