Skip to contentSkip to conversation

misc: fs_loader: Add support for initializing MMC

PATCH Superseded tien.fong.chee at intel.com 3 participants 5 messages Dec 30, 2018 – Jan 10, 2019 Char and misc drivers

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 misc: fs_loader: Add support for initializing MMC

From: Tien Fong Chee <[email protected]>

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.

---

Changes in v2:
- Initializing MMC through probing the blk device

---
 drivers/misc/fs_loader.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
drivers/misc/fs_loader.c +33 -0
index 57a14a3..5858073 100644
@@ -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,38 @@ 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;
+
+			ret = blk_get_from_parent(mmc->dev, &dev);
+			if (ret) {
+				debug("MMC: No block device: %d\n",
+					ret);
+
+				return ret;
+			}
+		}
+	}
+#endif
+
 	return 0;
 };
 
Signature · 1 line
2.2.0
#1 lore raw

PATCH v2 1/1 misc: fs_loader: Add support for initializing MMC

Quoted 7 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

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.

Quoted 5 lines

---

Changes in v2:
- Initializing MMC through probing the blk device

Any comment for this patch?

Quoted 58 lines

---
 drivers/misc/fs_loader.c | 33 +++++++++++++++++++++++++++++++++

 1 file changed, 33 insertions(+)
drivers/misc/fs_loader.c +1 -0
index 57a14a3..5858073 100644
@@ -12,6 +12,7 @@
  #include <linux/string.h>
  #include <mapmem.h>
  #include <malloc.h>
+#include <mmc.h>
  #include <spl.h>


 DECLARE_GLOBAL_DATA_PTR;

drivers/misc/fs_loader.c +0 -0
@@ -252,6 +253,38 @@ static int fs_loader_ofdata_to_platdata(struct
 udevice *dev)


 static int fs_loader_probe(struct udevice *dev)
 {

drivers/misc/fs_loader.c +7 -0
+#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);

drivers/misc/fs_loader.c +6 -0
+
+		return ret;
+	}
+
+	if (plat->phandlepart.phandle) {
+		ofnode node = ofnode_get_by_phandle(plat-
Quoted 1 line

phandlepart.phandle);

drivers/misc/fs_loader.c +19 -0
+
+		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;
+
+			ret = blk_get_from_parent(mmc->dev, &dev);
+			if (ret) {
+				debug("MMC: No block device: %d\n",
+					ret);
+
+				return ret;
+			}
+		}
+	}
+#endif
+

  return 0;
 };

#2 lore raw

PATCH v2 1/1 misc: fs_loader: Add support for initializing MMC

In reply to tien.fong.chee at intel.com

Hi Tien Fong,

Quoted 29 lines · On Sat, 29 Dec 2018 at 18:36, <[email protected]> wrote:

From: Tien Fong Chee <[email protected]>

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.

---

Changes in v2:
- Initializing MMC through probing the blk device

---
 drivers/misc/fs_loader.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
drivers/misc/fs_loader.c +1 -0
index 57a14a3..5858073 100644
@@ -12,6 +12,7 @@
 #include <linux/string.h>
 #include <mapmem.h>
 #include <malloc.h>
+#include <mmc.h>
 #include <spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 260

Quoted 8 lines
drivers/misc/fs_loader.c +5 -0
@@ -252,6 +253,38 @@ 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);

You should not need this since the MMC device should init itself when probed.

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 272

Quoted 12 lines
drivers/misc/fs_loader.c +12 -0
+       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);

You could use this?

uclass_get_device_by_ofnode(UCLASS_MMC, node, &mmc_dev)

But actually I think you should drop any mention of MMC so that your code can work for any storage uclass.

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 277

Quoted 5 lines
drivers/misc/fs_loader.c +5 -0
+               if (!ret) {
+                       struct mmc *mmc = mmc_get_mmc_dev(mmc_dev);
+                       struct udevice *dev;
+
+                       ret = blk_get_from_parent(mmc->dev, &dev);

You are going from mmc_dev -> mmc -> mmc->dev, but unless I am mistaken, mmc_dev == mmc->dev. So you should be able to simplify this to:

                       ret = blk_get_from_parent(mmc_dev, &dev);

Also you should be able to rename mmc to something more generic, e.g. to make this work with SATA.

Quoted 14 lines
drivers/misc/fs_loader.c +10 -1
+                       if (ret) {
+                               debug("MMC: No block device: %d\n",
+                                       ret);
+
+                               return ret;
+                       }
+               }
+       }
+#endif
+
        return 0;
 };
 
--
Quoted 2 lines

2.2.0

Regards,
Simon

#3 lore raw

PATCH v2 1/1 misc: fs_loader: Add support for initializing MMC

Quoted 38 lines · Simon Glass

Hi Tien Fong,

Quoted 35 lines · On Sat, 29 Dec 2018 at 18:36, <[email protected]> wrote:

From: Tien Fong Chee <[email protected]>

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.

---

Changes in v2:
- Initializing MMC through probing the blk device
---
 drivers/misc/fs_loader.c | 33 +++++++++++++++++++++++++++++++++

 1 file changed, 33 insertions(+)
drivers/misc/fs_loader.c +1 -0
index 57a14a3..5858073 100644
@@ -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,38 @@ static int fs_loader_ofdata_to_platdata(struct
 udevice *dev)
 
Quoted 9 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 260

Quoted 7 lines
drivers/misc/fs_loader.c +5 -0
  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);

You should not need this since the MMC device should init itself when probed.

Noted.

Quoted 11 lines
Quoted 11 lines
drivers/misc/fs_loader.c +8 -0
+       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-
Quoted 8 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 272

Quoted 5 lines
drivers/misc/fs_loader.c +4 -0
 >phandlepart.phandle);
+
+               struct udevice *mmc_dev = NULL;
+
+               ret = device_get_global_by_ofnode(node, &mmc_dev);

You could use this?

uclass_get_device_by_ofnode(UCLASS_MMC, node, &mmc_dev)

Okay.

Quoted 3 lines

But actually I think you should drop any mention of MMC so that your code can work for any storage uclass.

I agree with you, we should made the probing generic to any storage uclass.

But now i'm not familiar with all storage uclass yet, so my strategy is getting one storage uclass in at a time, and restructure the probing if there is commonality for the next storage uclass. With that, we can control the quality and achieving the goal step by step.

What do you think?

Quoted 7 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 277

Quoted 7 lines
drivers/misc/fs_loader.c +5 -0
+               if (!ret) {
+                       struct mmc *mmc = mmc_get_mmc_dev(mmc_dev);
+                       struct udevice *dev;
+
+                       ret = blk_get_from_parent(mmc->dev, &dev);
Quoted 5 lines

You are going from mmc_dev -> mmc -> mmc->dev, but unless I am mistaken, mmc_dev == mmc->dev. So you should be able to simplify this to:

                       ret = blk_get_from_parent(mmc_dev, &dev);

Okay,noted.

Quoted 3 lines

Also you should be able to rename mmc to something more generic, e.g. to make this work with SATA.

Replied in above.

Quoted 20 lines
Quoted 15 lines
drivers/misc/fs_loader.c +10 -0
+                       if (ret) {
+                               debug("MMC: No block device: %d\n",
+                                       ret);
+
+                               return ret;
+                       }
+               }
+       }
+#endif
+

        return 0;
 };

Quoted 3 lines

--
2.2.0

Regards,
Simon

#4 lore raw

PATCH v2 1/1 misc: fs_loader: Add support for initializing MMC

Hi Tien Fong,

Quoted 76 lines · Tien Fong
Quoted 38 lines · Simon Glass

Hi Tien Fong,

Quoted 35 lines · On Sat, 29 Dec 2018 at 18:36, <[email protected]> wrote:

From: Tien Fong Chee <[email protected]>

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.

---

Changes in v2:
- Initializing MMC through probing the blk device

---
 drivers/misc/fs_loader.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
drivers/misc/fs_loader.c +1 -0
index 57a14a3..5858073 100644
@@ -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,38 @@ static int fs_loader_ofdata_to_platdata(struct
 udevice *dev)
 
Quoted 9 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 260

Quoted 7 lines
drivers/misc/fs_loader.c +5 -0
 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);

You should not need this since the MMC device should init itself when probed.

Noted.

Quoted 11 lines
Quoted 11 lines
drivers/misc/fs_loader.c +8 -0
+       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-
Quoted 8 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 272

Quoted 5 lines
drivers/misc/fs_loader.c +4 -0
 >phandlepart.phandle);
+
+               struct udevice *mmc_dev = NULL;
+
+               ret = device_get_global_by_ofnode(node, &mmc_dev);

You could use this?

uclass_get_device_by_ofnode(UCLASS_MMC, node, &mmc_dev)

Okay.

Quoted 3 lines

But actually I think you should drop any mention of MMC so that your code can work for any storage uclass.

I agree with you, we should made the probing generic to any storage uclass.

Quoted 6 lines

But now i'm not familiar with all storage uclass yet, so my strategy is getting one storage uclass in at a time, and restructure the probing if there is commonality for the next storage uclass. With that, we can control the quality and achieving the goal step by step.

What do you think?

Well I don't really like it, sorry.

You can call blk_get_from_parent() to get a block device from any storage device. So if you make your code more generic you can test that it still works for your case (MMC), and then we should be fine.

Does fs_loader have tests?

Quoted 11 lines
Quoted 11 lines

drivers/misc/fs_loader.c static int fs_loader_ofdata_to_platdata(struct udevice *dev) · line 277

Quoted 7 lines
drivers/misc/fs_loader.c +5 -0
+               if (!ret) {
+                       struct mmc *mmc = mmc_get_mmc_dev(mmc_dev);
+                       struct udevice *dev;
+
+                       ret = blk_get_from_parent(mmc->dev, &dev);

You are going from mmc_dev -> mmc -> mmc->dev, but unless I am mistaken, mmc_dev == mmc->dev. So you should be able to simplify this to:

Quoted 26 lines
Quoted 1 line
                       ret = blk_get_from_parent(mmc_dev, &dev);

Okay,noted.

Quoted 3 lines

Also you should be able to rename mmc to something more generic, e.g. to make this work with SATA.

Replied in above.

Quoted 20 lines
Quoted 13 lines
drivers/misc/fs_loader.c +10 -0
+                       if (ret) {
+                               debug("MMC: No block device: %d\n",
+                                       ret);
+
+                               return ret;
+                       }
+               }
+       }
+#endif
+
        return 0;
Quoted 5 lines

};

--
2.2.0

Regards,
Simon

Regards,
Simon