part:efi: add GUID for linux file system data
Subsystems (2)
PATCH v3 1/3 part:efi: add GUID for linux file system data
Previously, Linux used the same GUID for the data partitions as Windows (Basic data partition: EBD0A0A2-B9E5-4433-87C0-68B6B72699C7). This created problems when dual-booting Linux and Windows in UEFI-GPT Setup, so a new GUID (Linux filesystem data:
0FC63DAF-8483-4772-8E79-3D69D8477DE4) was defined jointly by GPT fdisk and GNU Parted developers.
---
see https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs
and nota 9
Changes in v3:
- Documentation update
Changes in v2:
- None
doc/README.gpt | 3 ++- include/part_efi.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
doc/README.gpt +2 -1
@@ -31,7 +31,8 @@ More often UUID is displayed as 32 hexadecimal digits, in 5 groups, separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 digits and 4 hyphens) -For instance, GUID of Linux data partition: EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 +For instance, GUID of Basic data partition: EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 +and GUID of Linux filesystem data: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 Historically there are 5 methods to generate this number. The oldest one is combining machine's MAC address and timer (epoch) value.
include/part_efi.h +3 -0
@@ -43,6 +43,9 @@#define PARTITION_BASIC_DATA_GUID \ EFI_GUID( 0xEBD0A0A2, 0xB9E5, 0x4433, \ 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7) +#define PARTITION_LINUX_FILE_SYSTEM_DATA_GUID \ + EFI_GUID(0x0FC63DAF, 0x8483, 0x4772, \ + 0x8E, 0x79, 0x3D, 0x69, 0xD8, 0x47, 0x7D, 0xE4)#define PARTITION_LINUX_RAID_GUID \ EFI_GUID( 0xa19d880f, 0x05fc, 0x4d3b, \ 0xa0, 0x06, 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e)
Signature · 1 line
1.9.1
PATCH v3 2/3 gpt: add optional parameter type in gpt command
code under flag CONFIG_PARTITION_TYPE_GUID add parameter "type" to select partition type guid
example of use with gpt command :
partitions = uuid_disk=${uuid_gpt_disk}; \
name=boot,size=0x6bc00,uuid=${uuid_gpt_boot}; \
name=root,size=0x7538ba00,uuid=${uuid_gpt_root}, \
type=0fc63daf-8483-4772-8e79-3d69d8477de4;gpt write mmc 0 $partitions
---
Changes in v3:
- documentation update
Changes in v2:
- change guid to type in gpt command parameter
- change guid to type_guid in disk_partition_t
- remove 'S' at the end of some flag CONFIG_PARTITION_TYPE_GUID
common/cmd_gpt.c | 17 +++++++++++++++++ disk/part.c | 9 +++++++++ disk/part_efi.c | 25 +++++++++++++++++++++++++ doc/README.gpt | 13 +++++++++++++ include/part.h | 3 +++ 5 files changed, 67 insertions(+)
common/cmd_gpt.c +17 -0
@@ -218,6 +218,23 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,strcpy ((char *)parts[i].uuid, p);free (val); } +#ifdef CONFIG_PARTITION_TYPE_GUID +/* guid */ + val =extract_val (tok,"type" ); +if (val) { +/* 'type' is optional */ +if (extract_env (val, &p)) + p = val; +if (strlen (p) >=sizeof (parts[i].type_guid)) { +printf ("Wrong type guid format for partition %d\n" , + i); + errno =-4 ; + goto err; + } +strcpy ((char *)parts[i].type_guid, p); +free (val); + } +#endif /* name */ val =extract_val (tok,"name" );if (!val) {/* name is mandatory */
disk/part.c +9 -0
@@ -391,6 +391,9 @@ int get_partition_info(block_dev_desc_t *dev_desc, int part,/* The common case is no UUID support */ info->uuid[0 ] =0 ;#endif +#ifdef CONFIG_PARTITION_TYPE_GUID + info->type_guid[0 ] =0 ; +#endif switch (dev_desc->part_type) {#ifdef CONFIG_MAC_PARTITION
@@ -526,6 +529,9 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,#ifdef CONFIG_PARTITION_UUIDS info->uuid[0 ] =0 ;#endif +#ifdef CONFIG_PARTITION_TYPE_GUID + info->type_guid[0 ] =0 ; +#endif return 0 ; }
@@ -610,6 +616,9 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,#ifdef CONFIG_PARTITION_UUIDS info->uuid[0 ] =0 ;#endif +#ifdef CONFIG_PARTITION_TYPE_GUID + info->type_guid[0 ] =0 ; +#endif ret =0 ; goto cleanup;
disk/part_efi.c +25 -0
@@ -283,6 +283,10 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,uuid_bin_to_str (gpt_pte[part -1 ].unique_partition_guid.b, info->uuid,UUID_STR_FORMAT_GUID );#endif +#ifdef CONFIG_PARTITION_TYPE_GUID +uuid_bin_to_str (gpt_pte[part -1 ].partition_type_guid.b, + info->type_guid,UUID_STR_FORMAT_GUID ); +#endif debug ("%s: start 0x" LBAF ", size 0x" LBAF ", name %s\n" , __func__, info->start, info->size, info->name);
@@ -419,6 +423,10 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,char *str_uuid;unsigned char *bin_uuid;#endif +#ifdef CONFIG_PARTITION_TYPE_GUID +char *str_type_guid; +unsigned char *bin_type_guid; +#endif for (i =0 ; i < parts; i++) {/* partition starting lba */
@@ -445,9 +453,26 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,else gpt_e[i].ending_lba =cpu_to_le64 (offset -1 ); +#ifdef CONFIG_PARTITION_TYPE_GUID + str_type_guid = partitions[i].type_guid; + bin_type_guid = gpt_e[i].partition_type_guid.b; +if (strlen (str_type_guid)) { +if (uuid_str_to_bin (str_type_guid, bin_type_guid, +UUID_STR_FORMAT_GUID )) { +printf ("Partition no. %d: invalid type guid: %s\n" , + i, str_type_guid); +return -1 ; + } + }else { +/* default partition type GUID */ +memcpy (bin_type_guid, + &PARTITION_BASIC_DATA_GUID ,16 ); + } +#else /* partition type GUID */ memcpy (gpt_e[i].partition_type_guid.b, &PARTITION_BASIC_DATA_GUID ,16 ); +#endif #ifdef CONFIG_PARTITION_UUIDS str_uuid = partitions[i].uuid;
doc/README.gpt +13 -0
@@ -171,6 +171,19 @@ To restore GUID partition table one needs to: 2. From u-boot prompt type: gpt write mmc 0 $partitions +Partition type GUID: +==================== + +For created partition, the used partition type GUID is +PARTITION_BASIC_DATA_GUID (EBD0A0A2-B9E5-4433-87C0-68B6B72699C7). + +If you define 'CONFIG_PARTITION_TYPE_GUID', a optionnal parameter 'type' +can specify a other partition type guid: + + "partitions=uuid_disk=...;name=u-boot,size=60MiB,uuid=...; + name=kernel,size=60MiB,uuid=..., + type=0FC63DAF-8483-4772-8E79-3D69D8477DE4;" + Useful info: ============
include/part.h +3 -0
@@ -93,6 +93,9 @@ typedef struct disk_partition {#ifdef CONFIG_PARTITION_UUIDS char uuid[37 ];/* filesystem UUID as string, if exists */ #endif +#ifdef CONFIG_PARTITION_TYPE_GUID +char type_guid[37 ];/* type GUID as string, if exists */ +#endif } disk_partition_t;/* Misc _get_dev functions */
Signature · 1 line
1.9.1
PATCH v3 2/3 gpt: add optional parameter type in gpt command
Quoted 5 lines · Patrick Delaunay
code under flag
CONFIG_PARTITION_TYPE_GUIDadd parameter "type" to select partition type guidexample of use with gpt command :
Quoted 8 lines
partitions = uuid_disk=${uuid_gpt_disk}; \ name=boot,size=0x6bc00,uuid=${uuid_gpt_boot}; \ name=root,size=0x7538ba00,uuid=${uuid_gpt_root}, \ type=0fc63daf-8483-4772-8e79-3d69d8477de4;gpt write mmc 0 $partitions
Signed-off-by Patrick Delaunay <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151112/2beba5de/attachment.sig>
PATCH v3 3/3 uuid: add selection by string for known partition type GUID
In reply to Patrick Delaunayshort strings can be used in type parameter of gpt command to replace the guid string for the types known by u-boot
partitions = name=boot,size=0x6bc00,type=data; \
name=root,size=0x7538ba00,type=linux;
gpt write mmc 0 $partitionsand they are also used to display the type of partition in "part list" command
Partition Map for MMC device 0 -- Partition Type: EFI
Part Start LBA End LBA Name
Attributes
Type GUID
Partition GUID
1 0x00000022 0x0000037f "boot"
attrs: 0x0000000000000000
type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7
type: data
guid: d117f98e-6f2c-d04b-a5b2-331a19f91cb2
2 0x00000380 0x003a9fdc "root"
attrs: 0x0000000000000000
type: 0fc63daf-8483-4772-8e79-3d69d8477de4
type: linux
guid: 25718777-d0ad-7443-9e60-02cb591c9737---
Changes in v3:
- documentation update
Changes in v2:
- guid change to type in gpt parameter
- remove hardcoded array size and use ARRAY_SIZE
- use guid in parameter name
- array is renamed to list_guid
(it could be not limited to partition type)
disk/part_efi.c | 4 ++++ doc/README.gpt | 24 ++++++++++++++++++++++ include/uuid.h | 4 ++++ lib/uuid.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 94 insertions(+), 2 deletions(-)
disk/part_efi.c +4 -0
@@ -223,6 +223,10 @@ void print_part_efi(block_dev_desc_t * dev_desc) uuid_bin = (unsigned char *)gpt_pte[i].partition_type_guid.b;uuid_bin_to_str (uuid_bin, uuid,UUID_STR_FORMAT_GUID );printf ("\ttype:\t%s\n" , uuid); +#ifdef CONFIG_PARTITION_TYPE_GUID +if (!uuid_guid_get_str (uuid_bin, uuid)) +printf ("\ttype:\t%s\n" , uuid); +#endif uuid_bin = (unsigned char *)gpt_pte[i].unique_partition_guid.b;uuid_bin_to_str (uuid_bin, uuid,UUID_STR_FORMAT_GUID );printf ("\tguid:\t%s\n" , uuid);
doc/README.gpt +24 -0
@@ -184,6 +184,30 @@ can specify a other partition type guid: name=kernel,size=60MiB,uuid=..., type=0FC63DAF-8483-4772-8E79-3D69D8477DE4;" +Some strings can be also used at the place of known GUID : + "system" = PARTITION_SYSTEM_GUID + (C12A7328-F81F-11D2-BA4B-00A0C93EC93B) + "mbr" = LEGACY_MBR_PARTITION_GUID + (024DEE41-33E7-11D3-9D69-0008C781F39F) + "msft" = PARTITION_MSFT_RESERVED_GUID + (E3C9E316-0B5C-4DB8-817D-F92DF00215AE) + "data" = PARTITION_BASIC_DATA_GUID + (EBD0A0A2-B9E5-4433-87C0-68B6B72699C7) + "linux" = PARTITION_LINUX_FILE_SYSTEM_DATA_GUID + (0FC63DAF-8483-4772-8E79-3D69D8477DE4) + "raid" = PARTITION_LINUX_RAID_GUID + (A19D880F-05FC-4D3B-A006-743F0F84911E) + "swap" = PARTITION_LINUX_SWAP_GUID + (0657FD6D-A4AB-43C4-84E5-0933C84B4F4F) + "lvm" = PARTITION_LINUX_LVM_GUID + (E6D6D379-F507-44C2-A23C-238F2A3DF928) + + "partitions=uuid_disk=...;name=u-boot,size=60MiB,uuid=...; + name=kernel,size=60MiB,uuid=...,type=linux;" + +They are also used to display the type of partition in "part list" command. + + Useful info: ============
include/uuid.h +4 -0
@@ -36,6 +36,10 @@ enum {int uuid_str_valid (const char *uuid);int uuid_str_to_bin (char *uuid_str,unsigned char *uuid_bin,int str_format);void uuid_bin_to_str (unsigned char *uuid_bin,char *uuid_str,int str_format); +#ifdef CONFIG_PARTITION_TYPE_GUID +int uuid_guid_get_bin (const char *guid_str,unsigned char *guid_bin); +int uuid_guid_get_str (unsigned char *guid_bin,char *guid_str); +#endif void gen_rand_uuid (unsigned char *uuid_bin);void gen_rand_uuid_str (char *uuid_str,int str_format);#endif
lib/uuid.c +62 -2
80 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v3 3/3 uuid: add selection by string for known partition type GUID
Quoted 27 lines · Patrick Delaunay
short strings can be used in type parameter of gpt command to replace the guid string for the types known by u-boot
partitions = name=boot,size=0x6bc00,type=data; \ name=root,size=0x7538ba00,type=linux; gpt write mmc 0 $partitionsand they are also used to display the type of partition in "part list" command
Partition Map for MMC device 0 -- Partition Type: EFI
Part Start LBA End LBA Name
Attributes Type GUID Partition GUID 1 0x00000022 0x0000037f "boot" attrs: 0x0000000000000000 type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 type: data guid: d117f98e-6f2c-d04b-a5b2-331a19f91cb2 2 0x00000380 0x003a9fdc "root" attrs: 0x0000000000000000 type: 0fc63daf-8483-4772-8e79-3d69d8477de4 type: linux guid: 25718777-d0ad-7443-9e60-02cb591c9737
Quoted 1 line
Signed-off-by Patrick Delaunay <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151112/f2453582/attachment.sig>
PATCH v3 1/3 part:efi: add GUID for linux file system data
In reply to Patrick DelaunayQuoted 8 lines · Patrick Delaunay
Previously, Linux used the same GUID for the data partitions as Windows (Basic data partition: EBD0A0A2-B9E5-4433-87C0-68B6B72699C7). This created problems when dual-booting Linux and Windows in UEFI-GPT Setup, so a new GUID (Linux filesystem data:
0FC63DAF-8483-4772-8E79-3D69D8477DE4) was defined jointly by GPT fdisk and GNU Parted developers.Signed-off-by Patrick Delaunay <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151112/b7e2df06/attachment.sig>