Add MBR partition table creation and verify command
A message that is not in the archive (sent off-list or not yet received): CGME20201223125533eucas1p26a3a9fdce43c0902e8ee3c033cb510b0@eucas1p2.samsung.com
v3 cover Add MBR partition table creation and verify command
Hi All,
This patchset adds 'mbr' command to let one to create or verify MBR (Master Boot Record) partition layout based on the provided text description. This can be used in scripts to help system flashing tools/scripts to ensure proper partition layout. It has been inspired by the 'gpt' command already present in u-boot.
Best regards
Marek Szyprowski
Samsung R&D Institute Poland
Changelog:
v3:
- fixed minor issues in the docs
v2: https://lists.denx.de/pipermail/u-boot/2020-December/435689.html
- added docs and minor fixes in the code style
v1: https://lists.denx.de/pipermail/u-boot/2020-December/435208.html
- initial version
Patch summary:
Marek Szyprowski (6):
disk: dos: rename write_mbr_partition to write_mbr_sector
disk: dos: add some defines for the hardcoded numbers
disk: dos: use generic macro for unaligned le32 access
disk: dos: make some functions static
disk: dos: add code for creating MBR partition layout
cmd: Add MBR partition layout control utility
cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/mbr.c | 314 ++++++++++++++++++++++++++++++++++++++ disk/part_dos.c | 207 ++++++++++++++++++++++--- disk/part_dos.h | 5 + doc/usage/index.rst | 1 + doc/usage/mbr.rst | 93 +++++++++++ drivers/fastboot/fb_mmc.c | 2 +- include/part.h | 9 +- 9 files changed, 612 insertions(+), 28 deletions(-) create mode 100644 cmd/mbr.c create mode 100644 doc/usage/mbr.rst
Signature · 1 line
2.17.1
PATCH v3 1/6 disk: dos: rename write_mbr_partition to write_mbr_sector
write_mbr_partition() function name is a bit misleading, so rename it to write_mbr_sector(). This is a preparation for adding code for writing a complete MBR partition layout.
--- disk/part_dos.c | 2 +- drivers/fastboot/fb_mmc.c | 2 +- include/part.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
disk/part_dos.c +1 -1
@@ -329,7 +329,7 @@ int is_valid_dos_buf(void *buf)return test_block_type (buf) ==DOS_MBR ?0 :-1 ; } -int write_mbr_partition (struct blk_desc *dev_desc,void *buf) +int write_mbr_sector (struct blk_desc *dev_desc,void *buf) {if (is_valid_dos_buf (buf))return -1 ;
drivers/fastboot/fb_mmc.c +1 -1
@@ -508,7 +508,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,fastboot_fail ("invalid MBR partition" , response);return ; } -if (write_mbr_partition (dev_desc, download_buffer)) { +if (write_mbr_sector (dev_desc, download_buffer)) {printf ("%s: writing MBR partition failed\n" , __func__);fastboot_fail ("writing MBR partition failed" , response);
include/part.h +2 -2
@@ -465,14 +465,14 @@ int get_disk_guid(struct blk_desc *dev_desc, char *guid);int is_valid_dos_buf (void *buf);/** -* write_mbr_partition() - write DOS MBR +* write_mbr_sector() - write DOS MBR * * @param dev_desc - block device descriptor * @param buf - buffer which contains the MBR * * @return - '0' on success, otherwise error */ -int write_mbr_partition (struct blk_desc *dev_desc,void *buf); +int write_mbr_sector (struct blk_desc *dev_desc,void *buf);#endif
Signature · 1 line
2.17.1
PATCH v3 1/6 disk: dos: rename write_mbr_partition to write_mbr_sector
Quoted 5 lines · Marek Szyprowski
write_mbr_partition()function name is a bit misleading, so rename it towrite_mbr_sector(). This is a preparation for adding code for writing a complete MBR partition layout.Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/dc693b9d/attachment.sig>
PATCH v3 2/6 disk: dos: add some defines for the hardcoded numbers
In reply to Marek SzyprowskiAdd some handy defines for some hardcoded magic numbers related to extended partition handling.
--- disk/part_dos.c | 6 +++--- disk/part_dos.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)
disk/part_dos.c +3 -3
@@ -42,9 +42,9 @@ static inline unsigned int le32_to_int(unsigned char *le32)static inline int is_extended (int part_type) { -return (part_type ==0x5 || - part_type ==0xf || - part_type ==0x85 ); +return (part_type ==DOS_PART_TYPE_EXTENDED || + part_type ==DOS_PART_TYPE_EXTENDED_LBA || + part_type ==DOS_PART_TYPE_EXTENDED_LINUX ); }static int get_bootable (dos_partition_t *p)
disk/part_dos.h +3 -0
@@ -15,6 +15,9 @@#define DOS_PBR_MEDIA_TYPE_OFFSET 0x15#define DOS_MBR 0#define DOS_PBR 1 +#define DOS_PART_TYPE_EXTENDED 0x05 +#define DOS_PART_TYPE_EXTENDED_LBA 0x0F +#define DOS_PART_TYPE_EXTENDED_LINUX 0x85 typedef struct dos_partition { unsigned char boot_ind; /* 0x80 - active */
Signature · 1 line
2.17.1
PATCH v3 2/6 disk: dos: add some defines for the hardcoded numbers
Quoted 4 lines · Marek Szyprowski
Add some handy defines for some hardcoded magic numbers related to extended partition handling.
Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/cf43e9d5/attachment.sig>
PATCH v3 3/6 disk: dos: use generic macro for unaligned le32 access
In reply to Marek SzyprowskiUse a generic helper for reading LE32 integers.
--- disk/part_dos.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
disk/part_dos.c +9 -19
@@ -18,6 +18,7 @@#include <command.h> #include <ide.h> #include <memalign.h> +#include <asm/unaligned.h> #include "part_dos.h" #include <part.h>
@@ -29,17 +30,6 @@* to use large numbers of partitions */ #define MAX_EXT_PARTS 256 -/* Convert char[4] in little endian format to the host format integer -*/ -static inline unsigned int le32_to_int (unsigned char *le32) -{ -return ((le32[3 ] <<24 ) + - (le32[2 ] <<16 ) + - (le32[1 ] <<8 ) + - le32[0 ] - ); -} -static inline int is_extended (int part_type) { return (part_type == DOS_PART_TYPE_EXTENDED ||
@@ -61,8 +51,8 @@ static int get_bootable(dos_partition_t *p)static void print_one_part (dos_partition_t *p,lbaint_t ext_part_sector,int part_num,unsigned int disksig) { -lbaint_t lba_start = ext_part_sector +le32_to_int (p->start4); -lbaint_t lba_size =le32_to_int (p->size4); +lbaint_t lba_start = ext_part_sector +get_unaligned_le32 (p->start4); +lbaint_t lba_size =get_unaligned_le32 (p->size4); printf("%3d\t%-10" LBAFlength "u\t%-10" LBAFlength "u\t%08x-%02x\t%02x%s%s\n",
@@ -171,7 +161,7 @@ static void print_partition_extended(struct blk_desc *dev_desc, }if (!ext_part_sector) - disksig =le32_to_int (&buffer[DOS_PART_DISKSIG_OFFSET ]); + disksig =get_unaligned_le32 (&buffer[DOS_PART_DISKSIG_OFFSET ]);/* Print all primary/logical partitions */ pt = (dos_partition_t *) (buffer +DOS_PART_TBL_OFFSET );
@@ -198,7 +188,7 @@ static void print_partition_extended(struct blk_desc *dev_desc,for (i =0 ; i <4 ; i++, pt++) {if (is_extended (pt->sys_ind)) {lbaint_t lba_start - =le32_to_int (pt->start4) + relative; + =get_unaligned_le32 (pt->start4) + relative; print_partition_extended(dev_desc, lba_start, ext_part_sector == 0 ? lba_start : relative,
@@ -244,7 +234,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,#if CONFIG_IS_ENABLED (PARTITION_UUIDS )if (!ext_part_sector) - disksig =le32_to_int (&buffer[DOS_PART_DISKSIG_OFFSET ]); + disksig =get_unaligned_le32 (&buffer[DOS_PART_DISKSIG_OFFSET ]);#endif /* Print all primary/logical partitions */
@@ -260,8 +250,8 @@ static int part_get_info_extended(struct blk_desc *dev_desc, (ext_part_sector == 0 || is_extended(pt->sys_ind) == 0)) { info->blksz =DOS_PART_DEFAULT_SECTOR ; info->start = (lbaint_t)(ext_part_sector + -le32_to_int (pt->start4)); - info->size = (lbaint_t )le32_to_int (pt->size4); +get_unaligned_le32 (pt->start4)); + info->size = (lbaint_t )get_unaligned_le32 (pt->size4);part_set_generic_name (dev_desc, part_num, (char *)info->name);/* sprintf(info->type, "%d, pt->sys_ind); */
@@ -286,7 +276,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,for (i =0 ; i <4 ; i++, pt++) {if (is_extended (pt->sys_ind)) {lbaint_t lba_start - =le32_to_int (pt->start4) + relative; + =get_unaligned_le32 (pt->start4) + relative; return part_get_info_extended(dev_desc, lba_start, ext_part_sector == 0 ? lba_start : relative,
Signature · 1 line
2.17.1
PATCH v3 3/6 disk: dos: use generic macro for unaligned le32 access
Quoted 3 lines · Marek Szyprowski
Use a generic helper for reading LE32 integers.
Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/3cd4e9cc/attachment.sig>
PATCH v3 4/6 disk: dos: make some functions static
In reply to Marek SzyprowskiMake functions not used outside this file static.
--- disk/part_dos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
disk/part_dos.c +2 -2
@@ -302,13 +302,13 @@ static int part_get_info_extended(struct blk_desc *dev_desc,return -1 ; } -void part_print_dos (struct blk_desc *dev_desc) +static void part_print_dos (struct blk_desc *dev_desc) {printf ("Part\tStart Sector\tNum Sectors\tUUID\t\tType\n" );print_partition_extended (dev_desc,0 ,0 ,1 ,0 ); } -int part_get_info_dos (struct blk_desc *dev_desc,int part, +static int part_get_info_dos (struct blk_desc *dev_desc,int part,struct disk_partition *info) {return part_get_info_extended (dev_desc,0 ,0 ,1 , part, info,0 );
Signature · 1 line
2.17.1
PATCH v3 4/6 disk: dos: make some functions static
Quoted 3 lines · Marek Szyprowski
Make functions not used outside this file static.
Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/9625564d/attachment-0001.sig>
PATCH v3 5/6 disk: dos: add code for creating MBR partition layout
In reply to Marek SzyprowskiAdd a code for creating and writing MBR partition layout. The code generates similar layout of EBRs (Exteneded Block Records) and logical volumes as Linux's fdisk utility.
--- disk/part_dos.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ disk/part_dos.h | 2 + include/part.h | 5 ++ 3 files changed, 174 insertions(+)
disk/part_dos.c +167 -0
@@ -319,6 +319,173 @@ int is_valid_dos_buf(void *buf)return test_block_type (buf) ==DOS_MBR ?0 :-1 ; } +#if CONFIG_IS_ENABLED (CMD_MBR ) +static void lba_to_chs (lbaint_t lba,unsigned char *rc,unsigned char *rh, +unsigned char *rs) +{ +unsigned int c, h, s; +/* use fixed CHS geometry */ +unsigned int sectpertrack =63 ; +unsigned int heads =255 ; + + c = (lba +1 ) / sectpertrack / heads; + h = (lba +1 ) / sectpertrack - c * heads; + s = (lba +1 ) - (c * heads + h) * sectpertrack; + +if (c >1023 ) { + c =1023 ; + h =254 ; + s =63 ; + } + + *rc = c &0xff ; + *rh = h; + *rs = s + ((c &0x300 ) >>2 ); +} + +static void mbr_fill_pt_entry (dos_partition_t *pt,lbaint_t start, +lbaint_t relative,lbaint_t size,uchar sys_ind,bool bootable) +{ + pt->boot_ind = bootable ?0x80 :0x00 ; + pt->sys_ind = sys_ind; +lba_to_chs (start, &pt->cyl, &pt->head, &pt->sector); +lba_to_chs (start + size -1 , &pt->end_cyl, &pt->end_head, &pt->end_sector); +put_unaligned_le32 (relative, &pt->start4); +put_unaligned_le32 (size, &pt->size4); +} + +int write_mbr_partitions (struct blk_desc *dev, +struct disk_partition *p,int count,unsigned int disksig) +{ + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev->blksz); +lbaint_t ext_part_start =0 , ext_part_size =0 , ext_part_sect =0 ; +dos_partition_t *pt; +int i; + +memset (buffer,0 , dev->blksz); + buffer[DOS_PART_MAGIC_OFFSET ] =0x55 ; + buffer[DOS_PART_MAGIC_OFFSET +1 ] =0xaa ; +put_unaligned_le32 (disksig, &buffer[DOS_PART_DISKSIG_OFFSET ]); + pt = (dos_partition_t *) (buffer +DOS_PART_TBL_OFFSET ); + +/* create all primary partitions */ +for (i =0 ; i <4 && i < count; i++, pt++) { +mbr_fill_pt_entry (pt, p[i].start, p[i].start, p[i].size, + p[i].sys_ind, p[i].bootable); +if (is_extended (p[i].sys_ind)) { + ext_part_start = p[i].start; + ext_part_size = p[i].size; + ext_part_sect = p[i].start; + } + } + +if (i < count && !ext_part_start) { +printf ("%s: extended partition is needed for more than 4 partitions\n" , + __func__); +return -1 ; + } + +/* write MBR */ +if (blk_dwrite (dev,0 ,1 , buffer) !=1 ) { +printf ("%s: failed writing 'MBR' (1 blks@0x0)\n" , + __func__); +return -1 ; + } + +/* create extended volumes */ +for (; i < count; i++) { +lbaint_t next_ebr =0 ; + +memset (buffer,0 , dev->blksz); + buffer[DOS_PART_MAGIC_OFFSET ] =0x55 ; + buffer[DOS_PART_MAGIC_OFFSET +1 ] =0xaa ; + pt = (dos_partition_t *) (buffer +DOS_PART_TBL_OFFSET ); + +mbr_fill_pt_entry (pt, p[i].start, p[i].start - ext_part_sect, + p[i].size, p[i].sys_ind, p[i].bootable); + +if (i +1 < count) { + pt++; + next_ebr = p[i].start + p[i].size; +mbr_fill_pt_entry (pt, next_ebr, + next_ebr - ext_part_start, + p[i+1 ].start + p[i+1 ].size - next_ebr, +DOS_PART_TYPE_EXTENDED ,0 ); + } + +/* write EBR */ +if (blk_dwrite (dev, ext_part_sect,1 , buffer) !=1 ) { +printf ("%s: failed writing 'EBR' (1 blks@0x%lx)\n" , + __func__, ext_part_sect); +return -1 ; + } + ext_part_sect = next_ebr; + } + +return 0 ; +} + +int layout_mbr_partitions (struct disk_partition *p,int count, +lbaint_t total_sectors) +{ +struct disk_partition *ext =NULL ; +int i, j; +lbaint_t ext_vol_start; + +/* calculate primary partitions start and size if needed */ +if (!p[0 ].start) + p[0 ].start =DOS_PART_DEFAULT_GAP ; +for (i =0 ; i <4 && i < count; i++) { +if (!p[i].start) + p[i].start = p[i -1 ].start + p[i -1 ].size; +if (!p[i].size) { +lbaint_t end = total_sectors; +lbaint_t allocated =0 ; + +for (j = i +1 ; j <4 && j < count; j++) { +if (p[j].start) { + end = p[j].start; +break ; + } + allocated += p[j].size; + } + p[i].size = end - allocated - p[i].start; + } +if (p[i].sys_ind ==0x05 ) + ext = &p[i]; + } + +if (i >=4 && !ext) { +printf ("%s: extended partition is needed for more than 4 partitions\n" , + __func__); +return -1 ; + } + +/* calculate extended volumes start and size if needed */ + ext_vol_start = ext->start; +for (i =4 ; i < count; i++) { +if (!p[i].start) + p[i].start = ext_vol_start +DOS_PART_DEFAULT_GAP ; +if (!p[i].size) { +lbaint_t end = ext->start + ext->size; +lbaint_t allocated =0 ; + +for (j = i +1 ; j < count; j++) { +if (p[j].start) { + end = p[j].start -DOS_PART_DEFAULT_GAP ; +break ; + } + allocated += p[j].size +DOS_PART_DEFAULT_GAP ; + } + p[i].size = end - allocated - p[i].start; + } + ext_vol_start = p[i].start + p[i].size; + } + +return 0 ; +} +#endif +int write_mbr_sector (struct blk_desc *dev_desc,void *buf) {if (is_valid_dos_buf (buf))
disk/part_dos.h +2 -0
@@ -19,6 +19,8 @@#define DOS_PART_TYPE_EXTENDED_LBA 0x0F#define DOS_PART_TYPE_EXTENDED_LINUX 0x85 +#define DOS_PART_DEFAULT_GAP 2048 + typedef struct dos_partition { unsigned char boot_ind; /* 0x80 - active */ unsigned char head; /* starting head */
include/part.h +5 -0
@@ -474,6 +474,11 @@ int is_valid_dos_buf(void *buf);*/ int write_mbr_sector (struct blk_desc *dev_desc,void *buf); +int write_mbr_partitions (struct blk_desc *dev, +struct disk_partition *p,int count,unsigned int disksig); +int layout_mbr_partitions (struct disk_partition *p,int count, +lbaint_t total_sectors); +#endif
Signature · 1 line
2.17.1
PATCH v3 5/6 disk: dos: add code for creating MBR partition layout
Quoted 5 lines · Marek Szyprowski
Add a code for creating and writing MBR partition layout. The code generates similar layout of EBRs (Exteneded Block Records) and logical volumes as Linux's fdisk utility.
Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/a81b61ee/attachment.sig>
PATCH v3 6/6 cmd: Add MBR partition layout control utility
In reply to Marek SzyprowskiAdd a 'mbr' command to let users create or verify MBR partition layout based on the provided text description. The partition layout is alternatively read from the 'mbr_parts' environment variable. This can be used in scripts to help system image flashing tools to ensure proper partition layout.
The syntax of the text description of the partition list is similar to the one used by the 'gpt' command. Supported parameters are: name (currently ignored), start (partition start offset in bytes), size (in bytes or '-' to expand it to the whole free area), bootable (boolean flag) and id (MBR partition type). If one wants to create more than 4 partitions, an 'Extended' primary partition (with 0x05 ID) has to be explicitely provided as a one of the first 4 entries.
Here is an example how to create a 6 partitions (3 on the 'extended volume'), some of the predefined sizes:
Quoted 1 line
setenv
mbr_parts'name=boot,start=4M,size=128M,bootable,id=0x0e;
name=rootfs,size=3072M,id=0x83;
name=system-data,size=512M,id=0x83;
name=[ext],size=-,id=0x05;
name=user,size=-,id=0x83;
name=modules,size=100M,id=0x83;
name=ramdisk,size=8M,id=0x83'
Quoted 1 line
mbr write mmc 0
--- cmd/Kconfig | 8 ++ cmd/Makefile | 1 + cmd/mbr.c | 314 ++++++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + doc/usage/mbr.rst | 93 +++++++++++++ 5 files changed, 417 insertions(+) create mode 100644 cmd/mbr.c create mode 100644 doc/usage/mbr.rst
cmd/Kconfig +8 -0
@@ -1025,6 +1025,14 @@ config CMD_LSBLK Print list of available block device drivers, and for each, the list of known block devices. +config CMD_MBR + bool "MBR (Master Boot Record) command" + select DOS_PARTITION + select HAVE_BLOCK_DEVICE + help + Enable the 'mbr' command to ready and write MBR (Master Boot Record) + style partition tables. + config CMD_MISC bool "misc" depends on MISC
cmd/Makefile +1 -0
@@ -178,6 +178,7 @@ obj-$(CONFIG_CMD_ZFS) += zfs.o obj-$(CONFIG_CMD_DFU) += dfu.o obj-$(CONFIG_CMD_GPT) += gpt.o +obj-$(CONFIG_CMD_MBR) += mbr.o obj-$(CONFIG_CMD_ETHSW) += ethsw.o obj-$(CONFIG_CMD_AXI) += axi.o obj-$(CONFIG_CMD_PVBLOCK) += pvblock.o
cmd/mbr.c new file +314 -0
314 lines not on this page · raw message
doc/usage/index.rst +1 -0
@@ -14,4 +14,5 @@ Shell commands bootefi bootmenu button + mbr pstore
doc/usage/mbr.rst new file +93 -0
93 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 6/6 cmd: Add MBR partition layout control utility
Quoted 24 lines · Marek Szyprowski
Add a 'mbr' command to let users create or verify MBR partition layout based on the provided text description. The partition layout is alternatively read from the '
mbr_parts' environment variable. This can be used in scripts to help system image flashing tools to ensure proper partition layout.The syntax of the text description of the partition list is similar to the one used by the 'gpt' command. Supported parameters are: name (currently ignored), start (partition start offset in bytes), size (in bytes or '-' to expand it to the whole free area), bootable (boolean flag) and id (MBR partition type). If one wants to create more than 4 partitions, an 'Extended' primary partition (with
0x05ID) has to be explicitely provided as a one of the first 4 entries.Here is an example how to create a 6 partitions (3 on the 'extended volume'), some of the predefined sizes:
Quoted 1 line
setenv
mbr_parts'name=boot,start=4M,size=128M,bootable,id=0x0e;name=rootfs,size=3072M,id=0x83;
name=system-data,size=512M,id=0x83;
name=[ext],size=-,id=0x05;
name=user,size=-,id=0x83;
name=modules,size=100M,id=0x83;
name=ramdisk,size=8M,id=0x83'
Quoted 3 lines
Quoted 1 line
mbr write mmc 0
Signed-off-by Marek Szyprowski <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210116/9009d632/attachment.sig>