ot1200: Fix error handling in board_mmc_init()

PATCH New Fabio Estevam 4 participants 9 messages Nov 21, 2014 – Dec 22, 2014

lore

Share & tools

lore

Fabio Estevam

author

2014-11-21 18:42 UTC #0 lore raw

PATCH 1/3 ot1200: Fix error handling in board_mmc_init()

From: Fabio Estevam <[email protected]>

When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Cc Christian Gmeiner <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/bachmann/ot1200/ot1200.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

board/bachmann/ot1200/ot1200.c +6 -4

index 007c1ef..93f3d65 100644
@@ -173,7 +173,7 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
 
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	u32 index = 0;
 
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);

@@ -196,13 +196,15 @@ int board_mmc_init(bd_t *bis)
 			printf("Warning: you configured more USDHC controllers"
 				"(%d) then supported by the board (%d)\n",
 				index + 1, CONFIG_SYS_FSL_USDHC_NUM);
-			return status;
+			return -EINVAL;
 		}
 
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		if (ret)
+			return ret;
 	}
 
-	return status;
+	return 0;
 }
 
 #define PC MUX_PAD_CTRL(I2C_PAD_CTRL)

Signature · 1 line

1.9.1

Fabio Estevam

author

2014-11-21 18:42 UTC #1 lore raw

PATCH 2/3 nitrogen6x: Fix error handling in board_mmc_init()

From: Fabio Estevam <[email protected]>

When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Cc Eric Nelson <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/boundary/nitrogen6x/nitrogen6x.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

board/boundary/nitrogen6x/nitrogen6x.c +6 -4

index fcd4d82..e8ea256 100644
@@ -302,7 +302,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	u32 index = 0;
 
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);

@@ -325,13 +325,15 @@ int board_mmc_init(bd_t *bis)
 		       printf("Warning: you configured more USDHC controllers"
 			       "(%d) then supported by the board (%d)\n",
 			       index + 1, CONFIG_SYS_FSL_USDHC_NUM);
-		       return status;
+		       return -EINVAL;
 		}
 
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		if (ret)
+			return ret;
 	}
 
-	return status;
+	return 0;
 }
 #endif

Signature · 1 line

1.9.1

Stefano Babic

2014-11-24 11:06 UTC #2 lore raw

PATCH 2/3 nitrogen6x: Fix error handling in board_mmc_init()

Quoted 9 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
When an invalid USDHC port is passed we should return -EINVAL instead of 0.
Also, return the error immediately on fsl_esdhc_initialize() failure.
Cc Eric Nelson <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Fabio Estevam

author

2014-11-21 18:42 UTC #3 lore raw

PATCH 3/3 mx6boards: Fix error handling in board_mmc_init()

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Cc Eric Benard <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 board/embest/mx6boards/mx6boards.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

board/embest/mx6boards/mx6boards.c +6 -4

index 02fb3fa..f8c7468 100644
@@ -216,7 +216,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	int i;
 
 	/*

@@ -268,13 +268,15 @@ int board_mmc_init(bd_t *bis)
 			printf("Warning: you configured more USDHC controllers"
 			       "(%d) then supported by the board (%d)\n",
 			       i + 1, CONFIG_SYS_FSL_USDHC_NUM);
-			return status;
+			return -EINVAL;
 		}
 
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		if (ret)
+			return ret;
 	}
 
-	return status;
+	return 0;
 }
 #endif

Signature · 1 line

1.9.1

Stefano Babic

2014-11-24 11:06 UTC #4 lore raw

PATCH 3/3 mx6boards: Fix error handling in board_mmc_init()

Quoted 9 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
When an invalid USDHC port is passed we should return -EINVAL instead of 0.
Also, return the error immediately on fsl_esdhc_initialize() failure.
Cc Eric Benard <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Nikolay Dimitrov

2014-12-22 16:32 UTC #5 lore raw

PATCH 3/3 mx6boards: Fix error handling in board_mmc_init()

In reply to Fabio Estevam

Hi Fabio,

Quoted 33 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Cc Eric Benard <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
  board/embest/mx6boards/mx6boards.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

board/embest/mx6boards/mx6boards.c +2 -2

index 02fb3fa..f8c7468 100644
@@ -216,7 +216,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
  int board_mmc_init(bd_t *bis)
  {
-	s32 status = 0;
+	int ret;
  	int i;
 
  	/*

@@ -268,13 +268,15 @@ int board_mmc_init(bd_t *bis)
  			printf("Warning: you configured more USDHC controllers"
  			       "(%d) then supported by the board (%d)\n",
  			       i + 1, CONFIG_SYS_FSL_USDHC_NUM);
-			return status;
+			return -EINVAL;
  		}

board/embest/mx6boards/mx6boards.c int board_mmc_init(bd_t *bis) · line 281

Quoted 10 lines

board/embest/mx6boards/mx6boards.c +4 -2

-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		if (ret)
+			return ret;
  	}
 
-	return status;
+	return 0;
  }
  #endif

Excuse me for the (very) late question, but just stumbled upon this patch.

Isn't it possible to continue the initialization of the next ESDHC module when the current one fails?

Even if there's a case of common initialization failure across all ESDHC interfaces, isn't it better to continue the initialization and preserve the interface abstraction, as if we don't know the implementation details, e.g. pretend we don't know there's a common failure mechanism across all ESDHCs and still try to init them 1 by 1.

Please don't consider this as NACK, I'm just sharing my thoughts.

Kind regards,
Nikolay

Fabio Estevam

author

2014-12-22 16:38 UTC #6 lore raw

PATCH 3/3 mx6boards: Fix error handling in board_mmc_init()

Quoted 5 lines · Nikolay Dimitrov

Excuse me for the (very) late question, but just stumbled upon this patch.
Isn't it possible to continue the initialization of the next ESDHC module when the current one fails?

If the initialization of any esdhc port failed, it means that something very bad happened, so better to return the error immediately.

Regards,

Fabio Estevam

Stefano Babic

2014-11-24 11:05 UTC #7 lore raw

PATCH 1/3 ot1200: Fix error handling in board_mmc_init()

In reply to Fabio Estevam

Quoted 9 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
When an invalid USDHC port is passed we should return -EINVAL instead of 0.
Also, return the error immediately on fsl_esdhc_initialize() failure.
Cc Christian Gmeiner <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Christian Gmeiner

2014-11-24 11:07 UTC #8 lore raw

PATCH 1/3 ot1200: Fix error handling in board_mmc_init()

2014-11-24 12:05 GMT+01:00 Stefano Babic <[email protected]>:

Quoted 5 lines · Fabio Estevam

Quoted 4 lines
From: Fabio Estevam <[email protected]>
When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Quoted 9 lines

Quoted 5 lines
Also, return the error immediately on fsl_esdhc_initialize() failure.
Cc Christian Gmeiner <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
Applied to u-boot-imx, thanks !

Thanks Fabio for the patch!

greets
--
Christian Gmeiner, MSc

https://soundcloud.com/christian-gmeiner