Patchwork [U-Boot,V2,2/4] disk: part_efi: parse and store partition UUID

login
register
mail settings
Submitter Stephen Warren
Date Sept. 5, 2012, 10:03 p.m.
Message ID <1346882624-12783-2-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/181972/
State Changes Requested
Headers show

Comments

Stephen Warren - Sept. 5, 2012, 10:03 p.m.
From: Stephen Warren <swarren@nvidia.com>

Each EFI partition table entry contains a UUID. Extend U-Boot's struct
disk_partition to be able to store this information, and modify
get_partition_info_efi() to fill it in.

The implementation of uuid_string() was stolen from the Linux kernel.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: Add #ifdef CONFIG_PARTITION_UUIDS around all new code and struct fields.
---
 disk/part.c     |    5 +++++
 disk/part_efi.c |   25 +++++++++++++++++++++++++
 include/part.h  |    3 +++
 3 files changed, 33 insertions(+), 0 deletions(-)
Tom Rini - Sept. 5, 2012, 11:24 p.m.
On Wed, Sep 05, 2012 at 04:03:42PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Each EFI partition table entry contains a UUID. Extend U-Boot's struct
> disk_partition to be able to store this information, and modify
> get_partition_info_efi() to fill it in.
> 
> The implementation of uuid_string() was stolen from the Linux kernel.

Don't say "stolen", say borrowed and cite a release and file path.
Thanks!

Patch

diff --git a/disk/part.c b/disk/part.c
index 76f3939..db422c4 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -294,6 +294,11 @@  void init_part (block_dev_desc_t * dev_desc)
 int get_partition_info (block_dev_desc_t *dev_desc, int part
 					, disk_partition_t *info)
 {
+#ifdef CONFIG_PARTITION_UUIDS
+	/* The common case is no UUID support */
+	info->uuid[0] = 0;
+#endif
+
 	switch (dev_desc->part_type) {
 #ifdef CONFIG_MAC_PARTITION
 	case PART_TYPE_MAC:
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 2962fd8..264ea9c 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -154,6 +154,28 @@  void print_part_efi(block_dev_desc_t * dev_desc)
 	return;
 }
 
+#ifdef CONFIG_PARTITION_UUIDS
+static void uuid_string(unsigned char *uuid, char *str)
+{
+	static const u8 le[16] = {3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11,
+				  12, 13, 14, 15};
+	int i;
+
+	for (i = 0; i < 16; i++) {
+		sprintf(str, "%02x", uuid[le[i]]);
+		str += 2;
+		switch (i) {
+		case 3:
+		case 5:
+		case 7:
+		case 9:
+			*str++ = '-';
+			break;
+		}
+	}
+}
+#endif
+
 int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
 				disk_partition_t * info)
 {
@@ -190,6 +212,9 @@  int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
 	sprintf((char *)info->name, "%s",
 			print_efiname(&gpt_pte[part - 1]));
 	sprintf((char *)info->type, "U-Boot");
+#ifdef CONFIG_PARTITION_UUIDS
+	uuid_string(gpt_pte[part - 1].unique_partition_guid.b, info->uuid);
+#endif
 
 	debug("%s: start 0x%lX, size 0x%lX, name %s", __func__,
 		info->start, info->size, info->name);
diff --git a/include/part.h b/include/part.h
index e1478f4..fde320a 100644
--- a/include/part.h
+++ b/include/part.h
@@ -93,6 +93,9 @@  typedef struct disk_partition {
 	ulong	blksz;		/* block size in bytes			*/
 	uchar	name[32];	/* partition name			*/
 	uchar	type[32];	/* string type description		*/
+#ifdef CONFIG_PARTITION_UUIDS
+	char	uuid[37];	/* filesystem UUID as string, if exists	*/
+#endif
 } disk_partition_t;
 
 /* Misc _get_dev functions */