Skip to contentSkip to conversation

spl: mmc: Fix warning and unify spl_mmc_find_device()

PATCH Superseded Simon Glass 4 participants 12 messages Nov 30, 2015 – Dec 2, 2015

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Simon Glass

author
#0 lore raw

cover spl: mmc: Fix warning and unify spl_mmc_find_device()

This little series fixes a compiler warning in SPL MMC which affects Rockchip. It also joins up the spl_mmc_find_device() function again. I feel that splitting the function was the wrong approach as discussed here:

https://patchwork.ozlabs.org/patch/537276/

The first patch fixes the warning. The other two are suggested improvements but are separate from that problem.

Simon Glass (3):
spl: mmc: Fix compiler warning with CONFIG_DM_MMC
spl: mmc: Rename 'mmc' variable to 'mmcp'
spl: mmc: Unify non/driver model spl_mmc_find_device()

 common/spl/spl_mmc.c | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
author
#1 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Correct this by move the variable init earlier.

Signed-off-by Simon Glass <[email protected]>

---

 common/spl/spl_mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/spl/spl_mmc.c +1 -1
index b3c2c64..9df4786 100644
@@ -84,6 +84,7 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 	struct udevice *dev;
 	int err, mmc_dev;
 
+	*mmc = NULL;
 	mmc_dev = spl_mmc_get_device_index(boot_device);
 	if (mmc_dev < 0)
 		return mmc_dev;

@@ -104,7 +105,6 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 		return err;
 	}
 
-	*mmc = NULL;
 	*mmc = mmc_get_mmc_dev(dev);
 	return *mmc != NULL ? 0 : -ENODEV;
 }
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#2 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Hi Simon,

Quoted 5 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

Quoted 30 lines
Signed-off-by Simon Glass <[email protected]>

---

 common/spl/spl_mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/spl/spl_mmc.c +1 -1
index b3c2c64..9df4786 100644
@@ -84,6 +84,7 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 	struct udevice *dev;
 	int err, mmc_dev;
 
+	*mmc = NULL;
 	mmc_dev = spl_mmc_get_device_index(boot_device);
 	if (mmc_dev < 0)
 		return mmc_dev;

@@ -104,7 +105,6 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 		return err;
 	}
 
-	*mmc = NULL;
 	*mmc = mmc_get_mmc_dev(dev);
 	return *mmc != NULL ? 0 : -ENODEV;
 }
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#3 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Quoted 7 lines · Nikita Kiryanov

Hi Simon,

Quoted 4 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Quoted 8 lines
Quoted 1 line

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

It's strange, yes. With gcc-5.x we get an uninitalized warning which I posted a patch for, on rockchip. I'm not sure how on earth it would show up as undeclared, but at least the uninitalized is just over-zealous checking.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151201/c2bcd6a2/attachment.sig>
author
#4 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

In reply to Nikita Kiryanov

Hi Nikita,

Quoted 7 lines · Nikita Kiryanov

Hi Simon,

Quoted 4 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Quoted 9 lines
Quoted 1 line

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

Well I just tried again and the warning is:

common/spl/spl_mmc.c: In function ?spl_mmc_load_image?:
common/spl/spl_mmc.c:31:24: warning: ?mmc? may be used uninitialized in this function [-Wmaybe-uninitialized]

  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ?mmc? was declared here
  struct mmc *mmc;
              ^

I'll fix the commit message. I'm not sure what I was looking at there...

Quoted 23 lines
Quoted 23 lines
Signed-off-by Simon Glass <[email protected]>

---

 common/spl/spl_mmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/spl/spl_mmc.c +1 -0
index b3c2c64..9df4786 100644
@@ -84,6 +84,7 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
      struct udevice *dev;
      int err, mmc_dev;
 
+     *mmc = NULL;
      mmc_dev = spl_mmc_get_device_index(boot_device);
      if (mmc_dev < 0)
              return mmc_dev;

@@ -104,7 +105,6 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
              return err;
      }
Quoted 7 lines
Quoted 7 lines
common/spl/spl_mmc.c +0 -2
-     *mmc = NULL;
      *mmc = mmc_get_mmc_dev(dev);
      return *mmc != NULL ? 0 : -ENODEV;
 }
--

2.6.0.rc2.230.g3dd15c0

Regards,
Simon

#5 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Quoted 25 lines · Simon Glass

Hi Nikita,

Quoted 7 lines · Nikita Kiryanov

Hi Simon,

Quoted 4 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Quoted 9 lines
Quoted 1 line

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

Well I just tried again and the warning is:

common/spl/spl_mmc.c: In function ?spl_mmc_load_image?:
common/spl/spl_mmc.c:31:24: warning: ?mmc? may be used uninitialized in this function [-Wmaybe-uninitialized]

Quoted 7 lines
  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ?mmc? was declared here
  struct mmc *mmc;
              ^

I'll fix the commit message. I'm not sure what I was looking at there...

While you're in there, please just change to setting this to NULL in the declaration instead of right above the call.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151201/b9a59b9b/attachment.sig>
author
#6 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Hi Tom,

Quoted 32 lines · Tom Rini
Quoted 31 lines · Simon Glass

Hi Nikita,

Quoted 7 lines · Nikita Kiryanov

Hi Simon,

Quoted 4 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Quoted 9 lines
Quoted 1 line

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

Well I just tried again and the warning is:

common/spl/spl_mmc.c: In function ?spl_mmc_load_image?:
common/spl/spl_mmc.c:31:24: warning: ?mmc? may be used uninitialized in this function [-Wmaybe-uninitialized]

  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ?mmc? was declared here
  struct mmc *mmc;
              ^
Quoted 4 lines
Quoted 1 line

I'll fix the commit message. I'm not sure what I was looking at there...

While you're in there, please just change to setting this to NULL in the declaration instead of right above the call.

I don't think I can do this, as it is a parameter to a function call.

Regards,
Simon

#7 lore raw

PATCH 1/3 spl: mmc: Fix compiler warning with CONFIG_DM_MMC

Quoted 35 lines · Simon Glass

Hi Tom,

Quoted 32 lines · Tom Rini
Quoted 31 lines · Simon Glass

Hi Nikita,

Quoted 7 lines · Nikita Kiryanov

Hi Simon,

Quoted 4 lines · Simon Glass

Since commit 4188ba3 we get the following warning on rockchip boards:

common/spl/spl_mmc.c:111:10: error: 'mmc' undeclared (first use in this function)

Quoted 9 lines
Quoted 1 line

Correct this by move the variable init earlier.

This looks suspicious. If the problem is that the variable is undeclared, the only way to fix it is to declare the variable, which is not what this patch does. I would expect this error to persist with the patch applied. Also, mmc is clearly declared in the function parameter list. It sounds to me like the source of the compile error is somewhere earlier in the code.

Well I just tried again and the warning is:

common/spl/spl_mmc.c: In function ?spl_mmc_load_image?:
common/spl/spl_mmc.c:31:24: warning: ?mmc? may be used uninitialized in this function [-Wmaybe-uninitialized]

  count = mmc->block_dev.block_read(0, sector, 1, header);
                        ^
common/spl/spl_mmc.c:251:14: note: ?mmc? was declared here
  struct mmc *mmc;
              ^
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

I'll fix the commit message. I'm not sure what I was looking at there...

While you're in there, please just change to setting this to NULL in the declaration instead of right above the call.

I don't think I can do this, as it is a parameter to a function call.

Yes you can. I fixed (and lost, blarg, got side-tracked and blew away my changes) by making the declartion on 251 be initalized to NULL.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151201/22da393e/attachment.sig>
author
#8 lore raw

PATCH 2/3 spl: mmc: Rename 'mmc' variable to 'mmcp'

In reply to Simon Glass

The 'p' suffix makes it more obvious that we are dealing with a pointer to a (pointer) value that will be returned to its caller.

Signed-off-by Simon Glass <[email protected]>

---

 common/spl/spl_mmc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
common/spl/spl_mmc.c +7 -7
index 9df4786..8d47059 100644
@@ -79,12 +79,12 @@ int spl_mmc_get_device_index(u32 boot_device)
 }
 
 #ifdef CONFIG_DM_MMC
-static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
+static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 {
 	struct udevice *dev;
 	int err, mmc_dev;
 
-	*mmc = NULL;
+	*mmcp = NULL;
 	mmc_dev = spl_mmc_get_device_index(boot_device);
 	if (mmc_dev < 0)
 		return mmc_dev;

@@ -105,11 +105,11 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 		return err;
 	}
 
-	*mmc = mmc_get_mmc_dev(dev);
-	return *mmc != NULL ? 0 : -ENODEV;
+	*mmcp = mmc_get_mmc_dev(dev);
+	return *mmcp != NULL ? 0 : -ENODEV;
 }
 #else
-static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
+static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 {
 	int err, mmc_dev;
 

@@ -126,8 +126,8 @@ static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
 	}
 
 	/* We register only one device. So, the dev id is always 0 */
-	*mmc = find_mmc_device(mmc_dev);
-	if (!*mmc) {
+	*mmcp = find_mmc_device(mmc_dev);
+	if (!*mmcp) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 		puts("spl: mmc device not found\n");
 #endif
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
author
#10 lore raw

PATCH 3/3 spl: mmc: Unify non/driver model spl_mmc_find_device()

In reply to Simon Glass

It is risky to have two different functions with much the same code. Future authors may update one but not the other. It is hard to see which parts are the same and which are different.

Unify the functions and drop the differences that are not really needed.

Note that one puts() becomes printf() as Tom mentioned that this does not affect image size:

https://patchwork.ozlabs.org/patch/537276/

Note: It would be better to have an empty printf() and avoid the #ifdef for CONFIG_SPL_LIBCOMMON_SUPPORT.

Signed-off-by Simon Glass <[email protected]>

---

 common/spl/spl_mmc.c | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)
common/spl/spl_mmc.c +9 -31
index 8d47059..d9416a8 100644
@@ -78,10 +78,11 @@ int spl_mmc_get_device_index(u32 boot_device)
 	return -ENODEV;
 }
 
-#ifdef CONFIG_DM_MMC
 static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 {
+#ifdef CONFIG_DM_MMC
 	struct udevice *dev;
+#endif
 	int err, mmc_dev;
 
 	*mmcp = NULL;

@@ -97,46 +98,23 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 		return err;
 	}
 
+#ifdef CONFIG_DM_MMC
 	err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev);
-	if (err) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-		printf("spl: could not find mmc device. error: %d\n", err);
-#endif
-		return err;
-	}
-
-	*mmcp = mmc_get_mmc_dev(dev);
-	return *mmcp != NULL ? 0 : -ENODEV;
-}
+	if (!err)
+		*mmcp = mmc_get_mmc_dev(dev);
 #else
-static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
-{
-	int err, mmc_dev;
-
-	mmc_dev = spl_mmc_get_device_index(boot_device);
-	if (mmc_dev < 0)
-		return mmc_dev;
-
-	err = mmc_initialize(gd->bd);
+	*mmcp = find_mmc_device(mmc_dev);
+	err = *mmcp ? 0 : -ENODEV;
+#endif
 	if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-		printf("spl: could not initialize mmc. error: %d\n", err);
+		printf("spl: could not find mmc device. error: %d\n", err);
 #endif
 		return err;
 	}
 
-	/* We register only one device. So, the dev id is always 0 */
-	*mmcp = find_mmc_device(mmc_dev);
-	if (!*mmcp) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-		puts("spl: mmc device not found\n");
-#endif
-		return -ENODEV;
-	}
-
 	return 0;
 }
-#endif
 
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
 static int mmc_load_image_raw_partition(struct mmc *mmc, int partition)
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#11 lore raw

cover spl: mmc: Fix warning and unify spl_mmc_find_device()

In reply to Simon Glass
Quoted 10 lines · Simon Glass

This little series fixes a compiler warning in SPL MMC which affects Rockchip. It also joins up the spl_mmc_find_device() function again. I feel that splitting the function was the wrong approach as discussed here:

https://patchwork.ozlabs.org/patch/537276/

The first patch fixes the warning. The other two are suggested improvements but are separate from that problem.

Quoted 8 lines

Simon Glass (3):
spl: mmc: Fix compiler warning with CONFIG_DM_MMC
spl: mmc: Rename 'mmc' variable to 'mmcp'
spl: mmc: Unify non/driver model spl_mmc_find_device()

 common/spl/spl_mmc.c | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

For whole series:

Tested-by Michal Simek <[email protected]>

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151202/83517739/attachment.sig>