diff mbox

[U-Boot] ARM: uniphier: allow DDR function to return more precise error code

Message ID 1450230626-18857-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Delegated to: Masahiro Yamada
Headers show

Commit Message

Masahiro Yamada Dec. 16, 2015, 1:50 a.m. UTC
Return different error code depending on the reason so that the
caller can know the cause of the failure.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/mach-uniphier/ddrphy/ddrphy-training.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada Dec. 22, 2015, 3:14 p.m. UTC | #1
2015-12-16 10:50 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Return different error code depending on the reason so that the
> caller can know the cause of the failure.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

applied to u-boot-uniphier/master.
diff mbox

Patch

diff --git a/arch/arm/mach-uniphier/ddrphy/ddrphy-training.c b/arch/arm/mach-uniphier/ddrphy/ddrphy-training.c
index b4d369a..4852f2d 100644
--- a/arch/arm/mach-uniphier/ddrphy/ddrphy-training.c
+++ b/arch/arm/mach-uniphier/ddrphy/ddrphy-training.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
@@ -117,7 +118,7 @@  int ddrphy_training(struct ddrphy __iomem *phy)
 		if (--timeout < 0) {
 			printf("%s: error: timeout during DDR training\n",
 								__func__);
-			return -1;
+			return -ETIMEDOUT;
 		}
 		udelay(1);
 		pgsr0 = readl(&phy->pgsr[0]);
@@ -127,7 +128,7 @@  int ddrphy_training(struct ddrphy __iomem *phy)
 		if (pgsr0 & init_sequence[i].err_flag) {
 			printf("%s: error: %s failed\n", __func__,
 						init_sequence[i].description);
-			return -1;
+			return -EIO;
 		}
 	}