Skip to contentSkip to conversation

cmd/gpt: Support gpt command for all devices.

PATCH New egbert.eich at googlemail.com 5 participants 5 messages Mar 26, 2013 – Apr 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmd/gpt: Support gpt command for all devices.

From: Egbert Eich <[email protected]>

The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes.
This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs.

---
 common/cmd_gpt.c |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)
common/cmd_gpt.c +18 -25
index efd7934..1a72e8e 100644
@@ -23,7 +23,6 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
-#include <mmc.h>
 #include <part_efi.h>
 #include <exports.h>
 #include <linux/ctype.h>
@@ -134,7 +133,7 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
 	int errno = 0;
 	uint64_t size_ll, start_ll;
 
-	debug("%s: MMC lba num: 0x%x %d\n", __func__,
+	debug("%s:  lba num: 0x%x %d\n", __func__,
 	      (unsigned int)dev_desc->lba, (unsigned int)dev_desc->lba);
 
 	if (str_part == NULL)
@@ -247,25 +246,18 @@ err:
 	return errno;
 }
 
-static int gpt_mmc_default(int dev, const char *str_part)
+static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part)
 {
 	int ret;
 	char *str_disk_guid;
 	u8 part_count = 0;
 	disk_partition_t *partitions = NULL;
 
-	struct mmc *mmc = find_mmc_device(dev);
-
-	if (mmc == NULL) {
-		printf("%s: mmc dev %d NOT available\n", __func__, dev);
-		return CMD_RET_FAILURE;
-	}
-
 	if (!str_part)
 		return -1;
 
 	/* fill partitions */
-	ret = set_gpt_info(&mmc->block_dev, str_part,
+	ret = set_gpt_info(blk_dev_desc, str_part,
 			&str_disk_guid, &partitions, &part_count);
 	if (ret) {
 		if (ret == -1)
@@ -278,7 +270,7 @@ static int gpt_mmc_default(int dev, const char *str_part)
 	}
 
 	/* save partitions layout to disk */
-	gpt_restore(&mmc->block_dev, str_disk_guid, partitions, part_count);
+	gpt_restore(&blk_dev_desc, str_disk_guid, partitions, part_count);
 	free(str_disk_guid);
 	free(partitions);
 
@@ -306,20 +298,21 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	/* command: 'write' */
 	if ((strcmp(argv[1], "write") == 0) && (argc == 5)) {
-		/* device: 'mmc' */
-		if (strcmp(argv[2], "mmc") == 0) {
-			/* check if 'dev' is a number */
-			for (pstr = argv[3]; *pstr != '\0'; pstr++)
-				if (!isdigit(*pstr)) {
-					printf("'%s' is not a number\n",
-						argv[3]);
-					return CMD_RET_USAGE;
-				}
-			dev = (int)simple_strtoul(argv[3], NULL, 10);
-			/* write to mmc */
-			if (gpt_mmc_default(dev, argv[4]))
-				return CMD_RET_FAILURE;
+		char *ep;
+		block_dev_desc_t *blk_dev_desc;
+		dev = (int)simple_strtoul(argv[3], NULL, 10);
+		if (*ep) {
+			printf("'%s' is not a number\n", argv[3]);
+			return CMD_RET_USAGE;
 		}
+		blk_dev_desc = get_dev(argv[2], dev);
+		if (!blk_dev_desc) {
+			printf("%s: %s dev %d NOT available\n", __func__, argv[2], dev);
+			return CMD_RET_FAILURE;
+		}
+
+		if (gpt_default(blk_dev_desc, argv[4]))
+			return CMD_RET_FAILURE;
 	} else {
 		return CMD_RET_USAGE;
 	}
Signature · 1 line
1.7.7
#1 lore raw

PATCH 1/1 cmd/gpt: Support gpt command for all devices.

Dear egbert.eich at googlemail.com,

Quoted 8 lines · In message <[email protected]> you wrote:

From: Egbert Eich <[email protected]>

The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes.
This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs.

Quoted 4 lines
---
 common/cmd_gpt.c |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)

Please mark resubmits of new versions of patches as such; also, please provide a change log so we can see what you actually changed. Please see [1] for detailled instructions, and consider using patman to help you doing this.

[1] http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions

Note that this patch is still not checkpatch-clean:

WARNING: line over 80 characters
#195: FILE: common/cmd_gpt.c:310:
+ printf("%s: %s dev %d NOT available\n", __func__, argv[2], dev);

Please fix!!

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
As a general rule, the freedom of any people can  be  judged  by  the
volume of their laughter.
#2 lore raw

PATCH v2 1/1 cmd/gpt: Support gpt command for all devices

In reply to egbert.eich at googlemail.com

From: Egbert Eich <[email protected]>

The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes.
This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs.

---
Changes for v2:
- Coding style cleanup.

 common/cmd_gpt.c | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)
common/cmd_gpt.c +19 -25
index efd7934..3594dca 100644
@@ -23,7 +23,6 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
-#include <mmc.h>
 #include <part_efi.h>
 #include <exports.h>
 #include <linux/ctype.h>
@@ -134,7 +133,7 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
 	int errno = 0;
 	uint64_t size_ll, start_ll;
 
-	debug("%s: MMC lba num: 0x%x %d\n", __func__,
+	debug("%s:  lba num: 0x%x %d\n", __func__,
 	      (unsigned int)dev_desc->lba, (unsigned int)dev_desc->lba);
 
 	if (str_part == NULL)
@@ -247,25 +246,18 @@ err:
 	return errno;
 }
 
-static int gpt_mmc_default(int dev, const char *str_part)
+static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part)
 {
 	int ret;
 	char *str_disk_guid;
 	u8 part_count = 0;
 	disk_partition_t *partitions = NULL;
 
-	struct mmc *mmc = find_mmc_device(dev);
-
-	if (mmc == NULL) {
-		printf("%s: mmc dev %d NOT available\n", __func__, dev);
-		return CMD_RET_FAILURE;
-	}
-
 	if (!str_part)
 		return -1;
 
 	/* fill partitions */
-	ret = set_gpt_info(&mmc->block_dev, str_part,
+	ret = set_gpt_info(blk_dev_desc, str_part,
 			&str_disk_guid, &partitions, &part_count);
 	if (ret) {
 		if (ret == -1)
@@ -278,7 +270,7 @@ static int gpt_mmc_default(int dev, const char *str_part)
 	}
 
 	/* save partitions layout to disk */
-	gpt_restore(&mmc->block_dev, str_disk_guid, partitions, part_count);
+	gpt_restore(&blk_dev_desc, str_disk_guid, partitions, part_count);
 	free(str_disk_guid);
 	free(partitions);
 
@@ -306,20 +298,22 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	/* command: 'write' */
 	if ((strcmp(argv[1], "write") == 0) && (argc == 5)) {
-		/* device: 'mmc' */
-		if (strcmp(argv[2], "mmc") == 0) {
-			/* check if 'dev' is a number */
-			for (pstr = argv[3]; *pstr != '\0'; pstr++)
-				if (!isdigit(*pstr)) {
-					printf("'%s' is not a number\n",
-						argv[3]);
-					return CMD_RET_USAGE;
-				}
-			dev = (int)simple_strtoul(argv[3], NULL, 10);
-			/* write to mmc */
-			if (gpt_mmc_default(dev, argv[4]))
-				return CMD_RET_FAILURE;
+		char *ep;
+		block_dev_desc_t *blk_dev_desc;
+		dev = (int)simple_strtoul(argv[3], NULL, 10);
+		if (*ep) {
+			printf("'%s' is not a number\n", argv[3]);
+			return CMD_RET_USAGE;
 		}
+		blk_dev_desc = get_dev(argv[2], dev);
+		if (!blk_dev_desc) {
+			printf("%s: %s dev %d NOT available\n",
+			       __func__, argv[2], dev);
+			return CMD_RET_FAILURE;
+		}
+
+		if (gpt_default(blk_dev_desc, argv[4]))
+			return CMD_RET_FAILURE;
 	} else {
 		return CMD_RET_USAGE;
 	}
Signature · 1 line
1.8.1.4
#3 lore raw

PATCH v2 1/1 cmd/gpt: Support gpt command for all devices

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Egbert Eich

From: Egbert Eich <[email protected]>

The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes. This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs.

Quoted 5 lines

Coding style cleanup.

common/cmd_gpt.c | 44 +++++++++++++++++++-------------------------

 1 file changed, 19 insertions(+), 25 deletions(-)

Thanks!

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRZDOLAAoJENk4IS6UOR1WdAwP/jUM63BXUnoe1ZdL40MjjK8W ML48SoHv14unwjHB3Nr5fl4EGQOGpWN18HB7h/tGVdcZPCu6MaP3VQR+dV9iWDlh ijwv0b390ojj2Hb9tqOy3VEt+v/jrOJOcfDdgheDkfs/82d6NysJnbxbmfCTbtFv B68ToxYNKv2LirLz/HC4lUYWLekfwLSgqK+lcwA0WqgylnUuANa05d+VD8LUzPem bPDzn7dhoMmhaCqfzyRhPCsdT3RREGeFNqQ3rkhmdXZ359Zj7ex2z0oVzzzxbWPy mes60Hj9l6zRayiR2NQ4eiB31jJWM5EPj2mzKCV/XGIj7C/unecbfbt8JxJlTnUg gkT8Y1b3vBSf18Zh6GrUBJRcofVbfj3e5hQJ8t36ItQqX8iPJu0lVCXVed8y+67I u+WCQ6LIZroSYUM+f+U2S2ZPyRMq2gyp9C+P6VPXtQTL6v2qZEezZhsKzlNwKiql UDZLMK3KafaWY52hXrld5d49fPpaufHS+2CfWR4+2tM2sFgHhXjCuBVwwcL7iJF1 E1gtJF77sFnGk8Dwcb/WGGbqbLw6kc+cMyIMKowLulvluQsbPkl2UWen4YI4Kom2 7+Z4wLVp9MExKAZ7F5ySjkCJ5LwE3VE8COZCzOfNYE4dfun2IPkGHguywGG/udQK D8YnUvj3CfcACvYC/ZBt
=PcsZ
-----END PGP SIGNATURE-----

#4 lore raw

PATCH v2 1/1 cmd/gpt: Support gpt command for all devices

In reply to Egbert Eich

Dear Egbert Eich,

Quoted 74 lines

-----Original Message-----
From: Egbert Eich [mailto:egbert.eich at gmail.com]
Sent: Tuesday, April 09, 2013 5:12 PM
To: u-boot at lists.denx.de
Cc: Piotr Wilczek; Egbert Eich
Subject: [Patch v2] cmd/gpt: Support gpt command for all devices

From: Egbert Eich <[email protected]>

The gpt command was only implemented for mmc devices. There is no reason why this command should not be generalized and be applied all other storage device classes.
This change both simplifies the implementation and eliminates a build failure for systems that don't support mmcs.

---
Changes for v2:
- Coding style cleanup.

 common/cmd_gpt.c | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)
common/cmd_gpt.c index efd7934..3594dca renamed from common/cmd_gpt.c +0 -0

100644

common/cmd_gpt.c +4 -11
@@ -23,7 +23,6 @@
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
-#include <mmc.h>
 #include <part_efi.h>
 #include <exports.h>
 #include <linux/ctype.h>
@@ -134,7 +133,7 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
 	int errno = 0;
 	uint64_t size_ll, start_ll;
 
-	debug("%s: MMC lba num: 0x%x %d\n", __func__,
+	debug("%s:  lba num: 0x%x %d\n", __func__,
 	      (unsigned int)dev_desc->lba, (unsigned int)dev_desc->lba);
 
 	if (str_part == NULL)
@@ -247,25 +246,18 @@ err:
 	return errno;
 }
 
-static int gpt_mmc_default(int dev, const char *str_part)
+static int gpt_default(block_dev_desc_t *blk_dev_desc, const char
+*str_part)
 {
 	int ret;
 	char *str_disk_guid;
 	u8 part_count = 0;
 	disk_partition_t *partitions = NULL;
 
-	struct mmc *mmc = find_mmc_device(dev);
-
-	if (mmc == NULL) {
-		printf("%s: mmc dev %d NOT available\n", __func__, dev);
-		return CMD_RET_FAILURE;
-	}
-
 	if (!str_part)
 		return -1;
 
 	/* fill partitions */
-	ret = set_gpt_info(&mmc->block_dev, str_part,
+	ret = set_gpt_info(blk_dev_desc, str_part,
 			&str_disk_guid, &partitions, &part_count);
 	if (ret) {
 		if (ret == -1)

common/cmd_gpt.c static int gpt_mmc_default(int dev, const char · line 276

Quoted 8 lines
common/cmd_gpt.c +1 -1
@@ -278,7 +270,7 @@ static int gpt_mmc_default(int dev, const char
 *str_part)
 	}
 
 	/* save partitions layout to disk */
-	gpt_restore(&mmc->block_dev, str_disk_guid, partitions,
 part_count);
+	gpt_restore(&blk_dev_desc, str_disk_guid, partitions,
 part_count);

'blk_dev_desc' is a pointer, no need to take its address

Quoted 15 lines
common/cmd_gpt.c +0 -7
 	free(str_disk_guid);
 	free(partitions);
@@ -306,20 +298,22 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int
 argc, char * const argv[])
 
 	/* command: 'write' */
 	if ((strcmp(argv[1], "write") == 0) && (argc == 5)) {
-		/* device: 'mmc' */
-		if (strcmp(argv[2], "mmc") == 0) {
-			/* check if 'dev' is a number */
-			for (pstr = argv[3]; *pstr != '\0'; pstr++)
-				if (!isdigit(*pstr)) {
-					printf("'%s' is not a number\n",
-						argv[3]);

common/cmd_gpt.c static int do_gpt(cmd_tbl_t *cmdtp, int flag, int · line 305

Quoted 10 lines
common/cmd_gpt.c +4 -6
-					return CMD_RET_USAGE;
-				}
-			dev = (int)simple_strtoul(argv[3], NULL, 10);
-			/* write to mmc */
-			if (gpt_mmc_default(dev, argv[4]))
-				return CMD_RET_FAILURE;
+		char *ep;
+		block_dev_desc_t *blk_dev_desc;
+		dev = (int)simple_strtoul(argv[3], NULL, 10);
+		if (*ep) {

warning: 'ep' may be used uninitialized in this function shouldn't the address of 'ep' be passed to 'simple_strtoul' and then compared with argv[3]?

common/cmd_gpt.c static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 316

Quoted 12 lines
common/cmd_gpt.c +11 -0
+			printf("'%s' is not a number\n", argv[3]);
+			return CMD_RET_USAGE;
 		}
+		blk_dev_desc = get_dev(argv[2], dev);
+		if (!blk_dev_desc) {
+			printf("%s: %s dev %d NOT available\n",
+			       __func__, argv[2], dev);
+			return CMD_RET_FAILURE;
+		}
+
+		if (gpt_default(blk_dev_desc, argv[4]))
+			return CMD_RET_FAILURE;

unused 'pstr' variable can be removed

Quoted 5 lines
common/cmd_gpt.c +0 -0
 	} else {
 		return CMD_RET_USAGE;

}
--
1.8.1.4

Best ragards,
Piotr Wilczek