[U-Boot] [PATCH] Save environment data to mmc.

* [U-Boot] [PATCH] Save environment data to mmc.
@ 2009-11-05  7:43 Terry Lv
  2009-11-05 12:09 ` Mike Frysinger
  2009-11-05 18:52 ` Wolfgang Denk
  0 siblings, 2 replies; 19+ messages in thread
From: Terry Lv @ 2009-11-05  7:43 UTC (permalink / raw)
  To: u-boot

This patch is to save environment data to mmc card.
It uses interfaces defined in generic mmc.

Signed-off-by: Terry Lv <r65388@freescale.com>
---
 common/Makefile       |    1 +
 common/cmd_nvedit.c   |    3 +-
 common/env_mmc.c      |  359 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/environment.h |   18 +++
 lib_arm/board.c       |   10 +-
 lib_ppc/board.c       |   12 +-
 6 files changed, 391 insertions(+), 12 deletions(-)
 create mode 100644 common/env_mmc.c

diff --git a/common/Makefile b/common/Makefile
index a92a75f..e92a2ce 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -58,6 +58,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
 COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
+COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
 COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 
 # command
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 9f8d531..9168241 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -60,9 +60,10 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
+    !defined(CONFIG_ENV_IS_IN_MMC)	&& \
     !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\
-SPI_FLASH|MG_DISK|NVRAM|NOWHERE}
+SPI_FLASH|MG_DISK|NVRAM|MMC|NOWHERE}
 #endif
 
 #define XMK_STR(x)	#x
diff --git a/common/env_mmc.c b/common/env_mmc.c
new file mode 100644
index 0000000..9ef7c40
--- /dev/null
+++ b/common/env_mmc.c
@@ -0,0 +1,359 @@
+/*
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+
+ * (C) Copyright 2000-2006
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ *
+ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
+ * Andreas Heppel <aheppel@sysgo.de>
+
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* #define DEBUG */
+
+#include <common.h>
+
+#if defined(CONFIG_ENV_IS_IN_MMC) /* Environment is in MMC Flash */
+
+#include <command.h>
+#include <environment.h>
+#include <linux/stddef.h>
+#include <malloc.h>
+#include <mmc.h>
+
+#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_MMC)
+#define CMD_SAVEENV
+#elif defined(CONFIG_ENV_OFFSET_REDUND)
+#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_MMC
+#endif
+
+#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
+#error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
+#endif
+
+#ifdef CONFIG_INFERNO
+#error CONFIG_INFERNO not supported yet
+#endif
+
+/* references to names in env_common.c */
+extern uchar default_environment[];
+extern int default_environment_size;
+
+char *env_name_spec = "MMC";
+
+#ifdef ENV_IS_EMBEDDED
+extern uchar environment[];
+env_t *env_ptr = (env_t *)(&environment[0]);
+#else /* ! ENV_IS_EMBEDDED */
+env_t *env_ptr;
+#endif /* ENV_IS_EMBEDDED */
+
+/* local functions */
+#if !defined(ENV_IS_EMBEDDED)
+static void use_default(void);
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+uchar env_get_char_spec(int index)
+{
+	return *((uchar *)(gd->env_addr + index));
+}
+
+int env_init(void)
+{
+#if defined(CONFIG_IS_EMBEDDED)
+	size_t total;
+	int crc1_ok = 0, crc2_ok = 0;
+	env_t *tmp_env1, *tmp_env2;
+
+	total = CONFIG_ENV_SIZE;
+
+	tmp_env1 = env_ptr;
+	tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE);
+
+	crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
+	crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
+
+	if (!crc1_ok && !crc2_ok)
+		gd->env_valid = 0;
+	else if (crc1_ok && !crc2_ok)
+		gd->env_valid = 1;
+	else if (!crc1_ok && crc2_ok)
+		gd->env_valid = 2;
+	else {
+		/* both ok - check serial */
+		if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
+			gd->env_valid = 2;
+		else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
+			gd->env_valid = 1;
+		else if (tmp_env1->flags > tmp_env2->flags)
+			gd->env_valid = 1;
+		else if (tmp_env2->flags > tmp_env1->flags)
+			gd->env_valid = 2;
+		else /* flags are equal - almost impossible */
+			gd->env_valid = 1;
+	}
+
+	if (gd->env_valid == 1)
+		env_ptr = tmp_env1;
+	else if (gd->env_valid == 2)
+		env_ptr = tmp_env2;
+
+#else /* ENV_IS_EMBEDDED */
+	gd->env_addr  = (ulong)&default_environment[0];
+	gd->env_valid = 1;
+
+#endif /* ENV_IS_EMBEDDED */
+
+	return 0;
+}
+
+#ifdef CMD_SAVEENV
+#ifdef CONFIG_ENV_OFFSET_REDUND
+int saveenv(void)
+{
+	size_t total;
+	uint blk_start = 0, blk_cnt = 0, n = 0;
+	struct mmc *mmc = find_mmc_device(0);
+
+	env_ptr->flags++;
+	total = CONFIG_ENV_SIZE;
+
+	if (!mmc) {
+		puts("No MMC card found\n");
+		return;
+	}
+
+	if (mmc_init(mmc)) {
+		puts("MMC init failed\n");
+		return 1;
+	}
+
+	if (gd->env_valid == 1) {
+		puts("Writing to redundant MMC... ");
+		blk_start = (CONFIG_ENV_OFFSET_REDUND % 512) ? \
+			((CONFIG_ENV_OFFSET_REDUND / 512) + 1) : (CONFIG_ENV_OFFSET_REDUND / 512);
+		blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+		n = mmc->block_dev.block_write(0, blk_start , blk_cnt, (u_char *)env_ptr);
+	} else {
+		puts("Writing to MMC... ");
+		blk_start = (CONFIG_ENV_OFFSET % 512) ? \
+			((CONFIG_ENV_OFFSET / 512) + 1) : (CONFIG_ENV_OFFSET / 512);
+		blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+		n = mmc->block_dev.block_write(0, blk_start , blk_cnt, (u_char *)env_ptr);
+	}
+	if ((n != blk_cnt) || (total != CONFIG_ENV_SIZE)) {
+		puts("failed\n");
+		return 1;
+	}
+
+	puts("done\n");
+	gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
+	return 0;
+}
+
+#else /* ! CONFIG_ENV_OFFSET_REDUND */
+
+int saveenv(void)
+{
+	size_t total;
+	uint blk_start = 0, blk_cnt = 0, n = 0;
+	struct mmc *mmc = find_mmc_device(0);
+
+	if (!mmc) {
+		puts("No MMC card found\n");
+		return;
+	}
+
+	if (mmc_init(mmc)) {
+		puts("MMC init failed\n");
+		return 1;
+	}
+
+	puts("Writing to MMC... ");
+	total = CONFIG_ENV_SIZE;
+	blk_start = (CONFIG_ENV_OFFSET % 512) ? \
+			((CONFIG_ENV_OFFSET / 512) + 1) : (CONFIG_ENV_OFFSET / 512);
+	blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+	n = mmc->block_dev.block_write(0, blk_start , blk_cnt, (u_char *)env_ptr);
+	if ((n != blk_cnt) || (total != CONFIG_ENV_SIZE)) {
+		puts("failed\n");
+		return 1;
+	}
+
+	puts("done\n");
+	return 0;
+}
+#endif /* CONFIG_ENV_OFFSET_REDUND */
+#endif /* CMD_SAVEENV */
+
+#ifdef CONFIG_ENV_OFFSET_REDUND
+void env_relocate_spec(void)
+{
+#if !defined(ENV_IS_EMBEDDED)
+	size_t total;
+	int crc1_ok = 0, crc2_ok = 0;
+	env_t *tmp_env1 = NULL, *tmp_env2 = NULL;
+	uint blk_start = 0, blk_cnt = 0, n = 0;
+	struct mmc *mmc = find_mmc_device(0);
+
+	if (!mmc) {
+		puts("No MMC card found\n");
+		return;
+	}
+
+	if (mmc_init(mmc)) {
+		puts("MMC init failed\n");
+		goto use_default;
+	}
+
+	total = CONFIG_ENV_SIZE;
+
+	tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
+	if (!tmp_env1) {
+		puts("Not enough memory!\n");
+		goto use_default;
+	}
+	memset(tmp_env1, 0, CONFIG_ENV_SIZE);
+
+	tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
+	if (!tmp_env2) {
+		puts("Not enough memory!\n");
+		goto use_default;
+	}
+	memset(tmp_env2, 0, CONFIG_ENV_SIZE);
+
+	puts("Loading environment from mmc... ");
+
+	blk_start = (CONFIG_ENV_OFFSET % 512) ? \
+			((CONFIG_ENV_OFFSET / 512) + 1) : (CONFIG_ENV_OFFSET / 512);
+	blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+
+	n = mmc->block_dev.block_read(0, blk_start, blk_cnt, (uchar *)tmp_env1);
+	
+	if (n != blk_cnt) {
+		puts("failed\n");
+		goto use_default;
+	}
+	puts("done\n");
+
+	puts("Loading redundant environment from mmc... ");
+
+	blk_start = (CONFIG_ENV_OFFSET_REDUND % 512) ? \
+			((CONFIG_ENV_OFFSET_REDUND / 512) + 1) : (CONFIG_ENV_OFFSET_REDUND / 512);
+	blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+
+	n = mmc->block_dev.block_read(0, blk_start, blk_cnt, (uchar *)tmp_env2);
+
+	if (n != blk_cnt) {
+		puts("failed\n");
+		goto use_default;
+	}
+	puts("done\n");
+
+	crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
+	crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
+
+	if (!crc1_ok && !crc2_ok)
+		goto use_default;
+	else if (crc1_ok && !crc2_ok)
+		gd->env_valid = 1;
+	else if (!crc1_ok && crc2_ok)
+		gd->env_valid = 2;
+	else {
+		/* both ok - check serial */
+		if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
+			gd->env_valid = 2;
+		else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
+			gd->env_valid = 1;
+		else if (tmp_env1->flags > tmp_env2->flags)
+			gd->env_valid = 1;
+		else if (tmp_env2->flags > tmp_env1->flags)
+			gd->env_valid = 2;
+		else /* flags are equal - almost impossible */
+			gd->env_valid = 1;
+	}
+
+	free(env_ptr);
+	if (gd->env_valid == 1) {
+		env_ptr = tmp_env1;
+		free(tmp_env2);
+	} else {
+		env_ptr = tmp_env2;
+		free(tmp_env1);
+	}
+
+	return;
+
+use_default:
+	if (tmp_env1)
+		free(tmp_env1);
+	if (tmp_env2)
+		free(tmp_env2);
+	return use_default();
+
+#endif /* ! ENV_IS_EMBEDDED */
+}
+#else /* ! CONFIG_ENV_OFFSET_REDUND */
+
+void env_relocate_spec(void)
+{
+#if !defined(ENV_IS_EMBEDDED)
+	size_t total;
+	uint blk_start = 0, blk_cnt = 0, n = 0;
+	struct mmc *mmc = find_mmc_device(0);
+
+	if (!mmc) {
+		puts("No MMC card found\n");
+		return;	
+	}
+
+	if (mmc_init(mmc)) {
+		puts("MMC init failed\n");
+		return;
+	}
+
+	total = CONFIG_ENV_SIZE;
+
+	blk_start = (CONFIG_ENV_OFFSET % 512) ? \
+			((CONFIG_ENV_OFFSET / 512) + 1) : (CONFIG_ENV_OFFSET / 512);
+	blk_cnt = (total % 512) ? ((total / 512) + 1) : (total / 512);
+
+	n = mmc->block_dev.block_read(0, blk_start, blk_cnt, (uchar *)env_ptr);
+	
+	if ((n != blk_cnt) || (total != CONFIG_ENV_SIZE))
+		return use_default();
+
+	if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
+		return use_default();
+#endif /* ! ENV_IS_EMBEDDED */
+}
+#endif /* CONFIG_ENV_OFFSET_REDUND */
+
+#if !defined(ENV_IS_EMBEDDED)
+static void use_default()
+{
+	puts ("*** Warning - bad CRC or MMC, using default environment\n\n");
+	set_default_env();
+}
+#endif
+
+#endif /* CONFIG_ENV_IS_IN_MMC */
diff --git a/include/environment.h b/include/environment.h
index b9924fd..0b72e0b 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -94,6 +94,24 @@
 # endif
 #endif /* CONFIG_ENV_IS_IN_MG_DISK */
 
+#if defined(CONFIG_ENV_IS_IN_MMC)
+# ifndef CONFIG_ENV_OFFSET
+#  error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_MMC"
+# endif
+# ifndef CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR	(CONFIG_ENV_OFFSET)
+# endif
+# ifndef CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
+# endif
+# ifdef CONFIG_ENV_OFFSET_REDUND
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# endif
+# ifdef CONFIG_ENV_IS_EMBEDDED
+#  define ENV_IS_EMBEDDED	1
+# endif
+#endif /* CONFIG_ENV_IS_IN_MMC */
+
 /* Embedded env is only supported for some flash types */
 #ifdef CONFIG_ENV_IS_EMBEDDED
 # if !defined(CONFIG_ENV_IS_IN_FLASH) && \
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 5e3d7f6..bece7d7 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -335,6 +335,11 @@ void start_armboot (void)
 	nand_init();		/* go init the NAND */
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+        puts ("MMC:   ");
+        mmc_initialize (gd->bd);
+#endif
+
 #if defined(CONFIG_CMD_ONENAND)
 	onenand_init();
 #endif
@@ -416,11 +421,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
 	board_late_init ();
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	puts ("MMC:   ");
-	mmc_initialize (gd->bd);
-#endif
-
 #ifdef CONFIG_BITBANGMII
 	bb_miiphy_init();
 #endif
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 765f97a..fac5c29 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -776,6 +776,12 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	nand_init();		/* go init the NAND */
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+        WATCHDOG_RESET ();
+        puts ("MMC:  ");
+        mmc_initialize (bd);
+#endif
+
 	/* relocate environment function pointers etc. */
 	env_relocate ();
 
@@ -932,12 +938,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	scsi_init ();
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	WATCHDOG_RESET ();
-	puts ("MMC:  ");
-	mmc_initialize (bd);
-#endif
-
 #if defined(CONFIG_CMD_DOC)
 	WATCHDOG_RESET ();
 	puts ("DOC:   ");
-- 
1.6.0.4

^ permalink raw reply related	[flat|nested] 19+ messages in thread