| Message ID | 1546100894-22709-1-git-send-email-tien.fong.chee@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Jaehoon Chung |
| Headers | show |
| Series | [U-Boot,v2] Add support for initializing MMC | expand |
On Sun, 2018-12-30 at 00:28 +0800, tien.fong.chee@intel.com wrote: > 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 probing block > device and initializing MMC before the MMC is accessed by firmware > loader. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > --- > Changes in v2: > - Initializing MMC through probing the blk device Please ignore this patch, just realized missing a line status checking code. I would resend another patch. > --- > drivers/misc/fs_loader.c | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c > index 57a14a3..d981b5a 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; > @@ -252,6 +253,37 @@ static int fs_loader_ofdata_to_platdata(struct > udevice *dev) > > static int fs_loader_probe(struct udevice *dev) > { > +#if defined(CONFIG_DM_MMC) && defined(CONFIG_BLK) > + int ret; > + struct device_platdata *plat = dev->platdata; > + > + 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); > + struct udevice *dev; > + > + if (blk_get_from_parent(mmc->dev, &dev)) > + { > + debug("MMC: No block device: %d\n", > + ret); > + > + return ret; > + } > + } > + } > +#endif > return 0; > }; >
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 57a14a3..d981b5a 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; @@ -252,6 +253,37 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) static int fs_loader_probe(struct udevice *dev) { +#if defined(CONFIG_DM_MMC) && defined(CONFIG_BLK) + int ret; + struct device_platdata *plat = dev->platdata; + + 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); + struct udevice *dev; + + if (blk_get_from_parent(mmc->dev, &dev)) + { + debug("MMC: No block device: %d\n", + ret); + + return ret; + } + } + } +#endif return 0; };