Message ID | 1548934453-4567-1-git-send-email-tien.fong.chee@intel.com |
---|---|
State | Accepted |
Commit | db32a446f91b421f516e9d2f5f42970e3a90a723 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot,v4] misc: fs_loader: Add support for initializing block device | expand |
On Thu, 31 Jan 2019 at 04:34, <tien.fong.chee@intel.com> wrote: > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > Firmware loader would encounter problem if the block device is accessed > before initializing it. This patch would adding the support of probing > block device and initializing block before the block device is accessed by > firmware loader. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > --- > > changes in v4 > - Removed header mmc.h > - Dropped extra blank line > > changes in v3: > - Initializing block device through probing the blk device > > changes in v2: > - Initializing MMC through probing the blk device > --- > drivers/misc/fs_loader.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org> (I'm not sure you need to check for DM being enabled, but OK)
On Fri, 2019-02-01 at 23:06 -0700, Simon Glass wrote: On Thu, 31 Jan 2019 at 04:34, <tien.fong.chee@intel.com<mailto:tien.fong.chee@intel.com>> wrote: > > From: Tien Fong Chee <tien.fong.chee@intel.com<mailto:tien.fong.chee@intel.com>> > > Firmware loader would encounter problem if the block device is accessed > before initializing it. This patch would adding the support of probing > block device and initializing block before the block device is accessed by > firmware loader. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com<mailto:tien.fong.chee@intel.com>> > > --- > > changes in v4 > - Removed header mmc.h > - Dropped extra blank line > > changes in v3: > - Initializing block device through probing the blk device > > changes in v2: > - Initializing MMC through probing the blk device > --- > drivers/misc/fs_loader.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org<mailto:sjg@chromium.org>> (I'm not sure you need to check for DM being enabled, but OK) Thanks. No strong opinion on this :) .
On Thu, Jan 31, 2019 at 07:34:13PM +0800, tien.fong.chee@intel.com wrote: > From: Tien Fong Chee <tien.fong.chee@intel.com> > > Firmware loader would encounter problem if the block device is accessed > before initializing it. This patch would adding the support of probing > block device and initializing block before the block device is accessed by > firmware loader. > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Simon Glass <sjg@chromium.org<mailto:sjg@chromium.org>> Applied to u-boot/master, thanks!
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 57a14a3..a2e3763 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -252,6 +252,29 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) static int fs_loader_probe(struct udevice *dev) { +#if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) + int ret; + struct device_platdata *plat = dev->platdata; + + if (plat->phandlepart.phandle) { + ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); + struct udevice *parent_dev = NULL; + + ret = device_get_global_by_ofnode(node, &parent_dev); + if (!ret) { + struct udevice *dev; + + ret = blk_get_from_parent(parent_dev, &dev); + if (ret) { + debug("fs_loader: No block device: %d\n", + ret); + + return ret; + } + } + } +#endif + return 0; };