Revert "mmc: cmd_mmc: Use TOT cmd_mmc.c from Denx's repo - old one didn't build"

This reverts commit 31cc6903e6790835acd042d078984d98a8277eff.

1 files changed, 164 insertions, 87 deletions

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 6166749ad5..5df66e431d 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -25,8 +25,14 @@
 #include <command.h>
 #include <mmc.h>
 
-#ifndef CONFIG_GENERIC_MMC
 static int curr_device = -1;
+#ifndef CONFIG_GENERIC_MMC
+
+/* TODO: temporary hack for factory bring up; remove/rewrite when necessary */
+int get_mmc_current_device(void)
+{
+	return curr_device;
+}
 
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
@@ -47,7 +53,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			return cmd_usage(cmdtp);
 		}
 
-		if (mmc_legacy_init(dev) != 0) {
+		if (initialize_mmc_device(dev) != 0) {
 			puts("No MMC card found\n");
 			return 1;
 		}
@@ -73,6 +79,24 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 
 		printf("mmc%d is current device\n", curr_device);
+	} else if (strcmp(argv[1], "part") == 0) {
+		if (argc == 2) {
+			if (curr_device < 0) {
+				puts("No MMC device available\n");
+				return 1;
+			}
+			dev = curr_device;
+		} else {
+			dev = simple_strtoul(argv[2], NULL, 10);
+
+#ifdef CONFIG_SYS_MMC_SET_DEV
+			if (mmc_set_dev(dev) != 0)
+				return 1;
+#endif
+			curr_device = dev;
+		}
+		print_part(mmc_get_dev(dev));
+		return 0;
 	} else {
 		return cmd_usage(cmdtp);
 	}
@@ -110,143 +134,196 @@ static void print_mmcinfo(struct mmc *mmc)
 	printf("Bus Width: %d-bit\n", mmc->bus_width);
 }
 
-int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int initialize_mmc_device(int dev_num)
 {
 	struct mmc *mmc;
-	int dev_num;
 
-	if (argc < 2)
-		dev_num = 0;
-	else
-		dev_num = simple_strtoul(argv[1], NULL, 0);
+	if (curr_device < 0) {
+		if (get_mmc_num() > 0)
+			curr_device = 0;
+		else {
+			puts("No MMC device available\n");
+			return 1;
+		}
+	}
 
-	mmc = find_mmc_device(dev_num);
+	mmc = find_mmc_device(curr_device);
 
 	if (mmc) {
 		mmc_init(mmc);
 
 		print_mmcinfo(mmc);
+		return 0;
+	} else {
+		printf("no mmc device at slot %x\n", curr_device);
+		return 1;
 	}
-
-	return 0;
 }
 
 U_BOOT_CMD(
-	mmcinfo, 2, 0, do_mmcinfo,
+	mmcinfo, 1, 0, do_mmcinfo,
 	"display MMC info",
-	"<dev num>\n"
 	"    - device number of the device to dislay info of\n"
 	""
 );
 
 int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	int rc = 0;
+	if (argc < 2)
+		return cmd_usage(cmdtp);
+
+	if (curr_device < 0) {
+		if (get_mmc_num() > 0)
+			curr_device = 0;
+		else {
+			puts("No MMC device available\n");
+			return 1;
+		}
+	}
 
-	switch (argc) {
-	case 3:
-		if (strcmp(argv[1], "rescan") == 0) {
-			int dev = simple_strtoul(argv[2], NULL, 10);
-			struct mmc *mmc = find_mmc_device(dev);
+	if (strcmp(argv[1], "rescan") == 0) {
+		struct mmc *mmc = find_mmc_device(curr_device);
 
-			if (!mmc)
-				return 1;
+		if (!mmc) {
+			printf("no mmc device at slot %x\n", curr_device);
+			return 1;
+		}
 
-			mmc_init(mmc);
+		mmc->has_init = 0;
+		mmc_init(mmc);
 
+		return 0;
+	} else if (strncmp(argv[1], "part", 4) == 0) {
+		block_dev_desc_t *mmc_dev;
+		struct mmc *mmc = find_mmc_device(curr_device);
+
+		if (!mmc) {
+			printf("no mmc device at slot %x\n", curr_device);
+			return 1;
+		}
+		mmc_init(mmc);
+		mmc_dev = mmc_get_dev(curr_device);
+		if (mmc_dev != NULL &&
+				mmc_dev->type != DEV_TYPE_UNKNOWN) {
+			print_part(mmc_dev);
 			return 0;
-		} else if (strncmp(argv[1], "part", 4) == 0) {
-			int dev = simple_strtoul(argv[2], NULL, 10);
-			block_dev_desc_t *mmc_dev;
-			struct mmc *mmc = find_mmc_device(dev);
+		}
 
-			if (!mmc) {
-				puts("no mmc devices available\n");
+		puts("get mmc type error!\n");
+		return 1;
+	} else if (strcmp(argv[1], "list") == 0) {
+		print_mmc_devices('\n');
+		return 0;
+	} else if (strcmp(argv[1], "dev") == 0) {
+		int dev, part = -1;
+		struct mmc *mmc;
+
+		if (argc == 2)
+			dev = curr_device;
+		else if (argc == 3)
+			dev = simple_strtoul(argv[2], NULL, 10);
+		else if (argc == 4) {
+			dev = (int)simple_strtoul(argv[2], NULL, 10);
+			part = (int)simple_strtoul(argv[3], NULL, 10);
+			if (part > PART_ACCESS_MASK) {
+				printf("#part_num shouldn't be larger"
+					" than %d\n", PART_ACCESS_MASK);
 				return 1;
 			}
-			mmc_init(mmc);
-			mmc_dev = mmc_get_dev(dev);
-			if (mmc_dev != NULL &&
-			    mmc_dev->type != DEV_TYPE_UNKNOWN) {
-				print_part(mmc_dev);
-				return 0;
-			}
+		} else
+			return cmd_usage(cmdtp);
 
-			puts("get mmc type error!\n");
+		mmc = find_mmc_device(dev);
+		if (!mmc) {
+			printf("no mmc device at slot %x\n", dev);
 			return 1;
 		}
 
-	case 0:
-	case 1:
-	case 4:
-		return cmd_usage(cmdtp);
+		mmc_init(mmc);
+		if (part != -1) {
+			int ret;
+			if (mmc->part_config == MMCPART_NOAVAILABLE) {
+				printf("Card doesn't support part_switch\n");
+				return 1;
+			}
 
-	case 2:
-		if (!strcmp(argv[1], "list")) {
-			print_mmc_devices('\n');
-			return 0;
+			if (part != mmc->part_num) {
+				ret = mmc_switch_part(dev, part);
+				if (!ret)
+					mmc->part_num = part;
+
+				printf("switch to partions #%d, %s\n",
+						part, (!ret) ? "OK" : "ERROR");
+			}
+		}
+		curr_device = dev;
+		if (mmc->part_config == MMCPART_NOAVAILABLE)
+			printf("mmc%d is current device\n", curr_device);
+		else
+			printf("mmc%d(part %d) is current device\n",
+				curr_device, mmc->part_num);
+
+		return 0;
+	} else if (strcmp(argv[1], "read") == 0) {
+		void *addr = (void *)simple_strtoul(argv[2], NULL, 16);
+		u32 cnt = simple_strtoul(argv[4], NULL, 16);
+		u32 n;
+		u32 blk = simple_strtoul(argv[3], NULL, 16);
+		struct mmc *mmc = find_mmc_device(curr_device);
+
+		if (!mmc) {
+			printf("no mmc device at slot %x\n", curr_device);
+			return 1;
 		}
-		return 1;
-	default: /* at least 5 args */
-		if (strcmp(argv[1], "read") == 0) {
-			int dev = simple_strtoul(argv[2], NULL, 10);
-			void *addr = (void *)simple_strtoul(argv[3], NULL, 16);
-			u32 cnt = simple_strtoul(argv[5], NULL, 16);
-			u32 n;
-			u32 blk = simple_strtoul(argv[4], NULL, 16);
-			struct mmc *mmc = find_mmc_device(dev);
-
-			if (!mmc)
-				return 1;
 
-			printf("\nMMC read: dev # %d, block # %d, count %d ... ",
-				dev, blk, cnt);
+		printf("\nMMC read: dev # %d, block # %d, count %d ... ",
+				curr_device, blk, cnt);
 
-			mmc_init(mmc);
+		mmc_init(mmc);
 
-			n = mmc->block_dev.block_read(dev, blk, cnt, addr);
+		n = mmc->block_dev.block_read(curr_device, blk, cnt, addr);
 
-			/* flush cache after read */
-			flush_cache((ulong)addr, cnt * 512); /* FIXME */
+		/* flush cache after read */
+		flush_cache((ulong)addr, cnt * 512); /* FIXME */
 
-			printf("%d blocks read: %s\n",
+		printf("%d blocks read: %s\n",
 				n, (n==cnt) ? "OK" : "ERROR");
-			return (n == cnt) ? 0 : 1;
-		} else if (strcmp(argv[1], "write") == 0) {
-			int dev = simple_strtoul(argv[2], NULL, 10);
-			void *addr = (void *)simple_strtoul(argv[3], NULL, 16);
-			u32 cnt = simple_strtoul(argv[5], NULL, 16);
-			u32 n;
-			struct mmc *mmc = find_mmc_device(dev);
+		return (n == cnt) ? 0 : 1;
+	} else if (strcmp(argv[1], "write") == 0) {
+		void *addr = (void *)simple_strtoul(argv[2], NULL, 16);
+		u32 cnt = simple_strtoul(argv[4], NULL, 16);
+		u32 n;
+		struct mmc *mmc = find_mmc_device(curr_device);
 
-			int blk = simple_strtoul(argv[4], NULL, 16);
+		int blk = simple_strtoul(argv[3], NULL, 16);
 
-			if (!mmc)
-				return 1;
+		if (!mmc) {
+			printf("no mmc device at slot %x\n", curr_device);
+			return 1;
+		}
 
-			printf("\nMMC write: dev # %d, block # %d, count %d ... ",
-				dev, blk, cnt);
+		printf("\nMMC write: dev # %d, block # %d, count %d ... ",
+				curr_device, blk, cnt);
 
-			mmc_init(mmc);
+		mmc_init(mmc);
 
-			n = mmc->block_dev.block_write(dev, blk, cnt, addr);
+		n = mmc->block_dev.block_write(curr_device, blk, cnt, addr);
 
-			printf("%d blocks written: %s\n",
+		printf("%d blocks written: %s\n",
 				n, (n == cnt) ? "OK" : "ERROR");
-			return (n == cnt) ? 0 : 1;
-		} else
-			rc = cmd_usage(cmdtp);
-
-		return rc;
+		return (n == cnt) ? 0 : 1;
 	}
+
+	return cmd_usage(cmdtp);
 }
 
 U_BOOT_CMD(
 	mmc, 6, 1, do_mmcops,
 	"MMC sub system",
-	"read <device num> addr blk# cnt\n"
-	"mmc write <device num> addr blk# cnt\n"
-	"mmc rescan <device num>\n"
-	"mmc part <device num> - lists available partition on mmc\n"
+	"read addr blk# cnt\n"
+	"mmc write addr blk# cnt\n"
+	"mmc rescan\n"
+	"mmc part - lists available partition on current mmc device\n"
+	"mmc dev [dev] [part] - show or set current mmc device [partition]\n"
 	"mmc list - lists available devices");
 #endif