From: Tien Fong Chee tien.fong.chee@intel.com
Firmware loader would encounter problem if the MMC is accessed before initializing it. This patch would adding the support of initializing MMC before the MMC is accessed by firmware loader.
Signed-off-by: Tien Fong Chee tien.fong.chee@intel.com --- drivers/misc/fs_loader.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 57a14a3..675f625 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -12,6 +12,7 @@ #include <linux/string.h> #include <mapmem.h> #include <malloc.h> +#include <mmc.h> #include <spl.h>
DECLARE_GLOBAL_DATA_PTR; @@ -221,6 +222,7 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) { const char *fs_loader_path; u32 phandlepart[2]; + struct device_platdata *plat = NULL;
fs_loader_path = ofnode_get_chosen_prop("firmware-loader");
@@ -229,7 +231,6 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev)
fs_loader_node = ofnode_path(fs_loader_path); if (ofnode_valid(fs_loader_node)) { - struct device_platdata *plat; plat = dev->platdata;
if (!ofnode_read_u32_array(fs_loader_node, @@ -247,6 +248,36 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) } }
+#ifdef CONFIG_MMC + int ret; + + ret = mmc_initialize(NULL); + if (ret) { + debug("MMC: could not initialize mmc. error: %d\n", ret); + + return ret; + } + + if (plat->phandlepart.phandle) { + ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); + + struct udevice *mmc_dev = NULL; + + ret = device_get_global_by_ofnode(node, &mmc_dev); + if (!ret) { + struct mmc *mmc = mmc_get_mmc_dev(mmc_dev); + + ret = mmc_init(mmc); + if (ret) { + debug("MMC: mmc init failed with error: %d\n", + ret); + + return ret; + } + } + } +#endif + return 0; }