Skip to contentSkip to conversation

riscv: Make SiFive HiFive Unleashed board boot again

PATCH Superseded Bin Meng 3 participants 5 messages Jul 20, 2020 – Jul 24, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH v4 1/1 riscv: Make SiFive HiFive Unleashed board boot again

From: Bin Meng <[email protected]>

Commit 40686c394e53 ("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board.

The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet.

It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP.

Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case.

Fixes 40686c394e53 ("riscv: Clean up IPI initialization code")

---

Changes in v4:
- Include Sean's "Reviewed-by" tag

Changes in v3:
- Simply call riscv_init_ipi() in clint timer functions to avoid some duplications

Changes in v2:
- Do the minimal partial revert instead of a complete revert, enough to make HiFive Unleashed board boot again.

 arch/riscv/cpu/cpu.c          |  2 +-
 arch/riscv/lib/sifive_clint.c | 16 ++++++++++++----
 common/spl/spl_opensbi.c      |  5 -----
 3 files changed, 13 insertions(+), 10 deletions(-)
arch/riscv/cpu/cpu.c +1 -1
index bbd6c15..bfa2d4a 100644
@@ -107,7 +107,7 @@ int arch_cpu_init_dm(void)
 #endif
 	}
 
-#ifdef CONFIG_SMP
+#if CONFIG_IS_ENABLED(SMP)
 	ret = riscv_init_ipi();
 	if (ret)
 		return ret;
arch/riscv/lib/sifive_clint.c +12 -4
index 78fc6c8..b9a2c64 100644
@@ -26,6 +26,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int riscv_get_time(u64 *time)
 {
+	/* ensure timer register base has a sane value */
+	riscv_init_ipi();
+
 	*time = readq((void __iomem *)MTIME_REG(gd->arch.clint));
 
 	return 0;
@@ -33,6 +36,9 @@ int riscv_get_time(u64 *time)
 
 int riscv_set_timecmp(int hart, u64 cmp)
 {
+	/* ensure timer register base has a sane value */
+	riscv_init_ipi();
+
 	writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint, hart));
 
 	return 0;
@@ -40,11 +46,13 @@ int riscv_set_timecmp(int hart, u64 cmp)
 
 int riscv_init_ipi(void)
 {
-	long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
+	if (!gd->arch.clint) {
+		long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
 
-	if (IS_ERR(ret))
-		return PTR_ERR(ret);
-	gd->arch.clint = ret;
+		if (IS_ERR(ret))
+			return PTR_ERR(ret);
+		gd->arch.clint = ret;
+	}
 
 	return 0;
 }
common/spl/spl_opensbi.c +0 -5
index 3440bc0..14f335f 100644
@@ -79,11 +79,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
 	invalidate_icache_all();
 
 #ifdef CONFIG_SPL_SMP
-	/* Initialize the IPI before we use it */
-	ret = riscv_init_ipi();
-	if (ret)
-		hang();
-
 	/*
 	 * Start OpenSBI on all secondary harts and wait for acknowledgment.
 	 *
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v4 1/1 riscv: Make SiFive HiFive Unleashed board boot again

Hi Rick,

Quoted 33 lines · Bin Meng

From: Bin Meng <[email protected]>

Commit 40686c394e53 ("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board.

The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet.

It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP.

Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case.

Fixes 40686c394e53 ("riscv: Clean up IPI initialization code")

---

Changes in v4:
- Include Sean's "Reviewed-by" tag

Changes in v3:
- Simply call riscv_init_ipi() in clint timer functions to avoid some duplications

Quoted 9 lines

Changes in v2:
- Do the minimal partial revert instead of a complete revert, enough to make HiFive Unleashed board boot again.

 arch/riscv/cpu/cpu.c          |  2 +-
 arch/riscv/lib/sifive_clint.c | 16 ++++++++++++----
 common/spl/spl_opensbi.c      |  5 -----
 3 files changed, 13 insertions(+), 10 deletions(-)

Since currently FU540 is broken, could you please adjust the patch order to make this patch show up at the very beginning of the u-boot-riscv/master tree?

Regards,
Bin

#2 lore raw

PATCH v4 1/1 riscv: Make SiFive HiFive Unleashed board boot again

In reply to Bin Meng
Quoted 115 lines · Bin Meng

From: Bin Meng <[email protected]>

Commit 40686c394e53 ("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board.

The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet.

It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP.

Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case.

Fixes 40686c394e53 ("riscv: Clean up IPI initialization code")

---

Changes in v4:
- Include Sean's "Reviewed-by" tag

Changes in v3:
- Simply call riscv_init_ipi() in clint timer functions to avoid some duplications

Changes in v2:
- Do the minimal partial revert instead of a complete revert, enough to make HiFive Unleashed board boot again.

 arch/riscv/cpu/cpu.c          |  2 +-
 arch/riscv/lib/sifive_clint.c | 16 ++++++++++++----
 common/spl/spl_opensbi.c      |  5 -----
 3 files changed, 13 insertions(+), 10 deletions(-)
arch/riscv/cpu/cpu.c +1 -1
index bbd6c15..bfa2d4a 100644
@@ -107,7 +107,7 @@ int arch_cpu_init_dm(void)
 #endif
 	}
 
-#ifdef CONFIG_SMP
+#if CONFIG_IS_ENABLED(SMP)
 	ret = riscv_init_ipi();
 	if (ret)
 		return ret;
arch/riscv/lib/sifive_clint.c +12 -4
index 78fc6c8..b9a2c64 100644
@@ -26,6 +26,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int riscv_get_time(u64 *time)
 {
+	/* ensure timer register base has a sane value */
+	riscv_init_ipi();
+
 	*time = readq((void __iomem *)MTIME_REG(gd->arch.clint));
 
 	return 0;
@@ -33,6 +36,9 @@ int riscv_get_time(u64 *time)
 
 int riscv_set_timecmp(int hart, u64 cmp)
 {
+	/* ensure timer register base has a sane value */
+	riscv_init_ipi();
+
 	writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint, hart));
 
 	return 0;
@@ -40,11 +46,13 @@ int riscv_set_timecmp(int hart, u64 cmp)
 
 int riscv_init_ipi(void)
 {
-	long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
+	if (!gd->arch.clint) {
+		long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
 
-	if (IS_ERR(ret))
-		return PTR_ERR(ret);
-	gd->arch.clint = ret;
+		if (IS_ERR(ret))
+			return PTR_ERR(ret);
+		gd->arch.clint = ret;
+	}
 
 	return 0;
 }
common/spl/spl_opensbi.c +0 -5
index 3440bc0..14f335f 100644
@@ -79,11 +79,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
 	invalidate_icache_all();
 
 #ifdef CONFIG_SPL_SMP
-	/* Initialize the IPI before we use it */
-	ret = riscv_init_ipi();
-	if (ret)
-		hang();
-
 	/*
 	 * Start OpenSBI on all secondary harts and wait for acknowledgment.
 	 *
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH v4 1/1 riscv: Make SiFive HiFive Unleashed board boot again

Hi Rick,

Quoted 105 lines · Leo Liang
Quoted 103 lines · Bin Meng

From: Bin Meng <[email protected]>

Commit 40686c394e53 ("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board.

The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet.

It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP.

Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case.

Fixes 40686c394e53 ("riscv: Clean up IPI initialization code")

---

Changes in v4:
- Include Sean's "Reviewed-by" tag

Changes in v3:
- Simply call riscv_init_ipi() in clint timer functions to avoid some duplications

Changes in v2:
- Do the minimal partial revert instead of a complete revert, enough to make HiFive Unleashed board boot again.

 arch/riscv/cpu/cpu.c          |  2 +-
 arch/riscv/lib/sifive_clint.c | 16 ++++++++++++----
 common/spl/spl_opensbi.c      |  5 -----
 3 files changed, 13 insertions(+), 10 deletions(-)
arch/riscv/cpu/cpu.c +1 -1
index bbd6c15..bfa2d4a 100644
@@ -107,7 +107,7 @@ int arch_cpu_init_dm(void)
 #endif
      }
 
-#ifdef CONFIG_SMP
+#if CONFIG_IS_ENABLED(SMP)
      ret = riscv_init_ipi();
      if (ret)
              return ret;
arch/riscv/lib/sifive_clint.c +12 -4
index 78fc6c8..b9a2c64 100644
@@ -26,6 +26,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int riscv_get_time(u64 *time)
 {
+     /* ensure timer register base has a sane value */
+     riscv_init_ipi();
+
      *time = readq((void __iomem *)MTIME_REG(gd->arch.clint));
 
      return 0;
@@ -33,6 +36,9 @@ int riscv_get_time(u64 *time)
 
 int riscv_set_timecmp(int hart, u64 cmp)
 {
+     /* ensure timer register base has a sane value */
+     riscv_init_ipi();
+
      writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint, hart));
 
      return 0;
@@ -40,11 +46,13 @@ int riscv_set_timecmp(int hart, u64 cmp)
 
 int riscv_init_ipi(void)
 {
-     long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
+     if (!gd->arch.clint) {
+             long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
 
-     if (IS_ERR(ret))
-             return PTR_ERR(ret);
-     gd->arch.clint = ret;
+             if (IS_ERR(ret))
+                     return PTR_ERR(ret);
+             gd->arch.clint = ret;
+     }
 
      return 0;
 }
common/spl/spl_opensbi.c +0 -0
index 3440bc0..14f335f 100644
@@ -79,11 +79,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
      invalidate_icache_all();
 
Quoted 14 lines
Quoted 10 lines
common/spl/spl_opensbi.c +0 -6
 #ifdef CONFIG_SPL_SMP
-     /* Initialize the IPI before we use it */
-     ret = riscv_init_ipi();
-     if (ret)
-             hang();
-
      /*
       * Start OpenSBI on all secondary harts and wait for acknowledgment.
       *
--
Quoted 2 lines

2.7.4

Could we get this applied soon, since it's broken in u-boot/master?

Regards,
Bin

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw

PATCH v4 1/1 riscv: Make SiFive HiFive Unleashed board boot again

Hi Bin

Quoted 129 lines

From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Friday, July 24, 2020 11:26 AM
To: Leo Yu-Chi Liang(???); Rick Jian-Zhi Chen(???)
Cc: U-Boot Mailing List
Subject: Re: [PATCH v4] riscv: Make SiFive HiFive Unleashed board boot again

Hi Rick,

Quoted 105 lines · Leo Liang
Quoted 103 lines · Bin Meng

From: Bin Meng <[email protected]>

Commit 40686c394e53 ("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board.

The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet.

It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP.

Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case.

Fixes 40686c394e53 ("riscv: Clean up IPI initialization code")

---

Changes in v4:
- Include Sean's "Reviewed-by" tag

Changes in v3:
- Simply call riscv_init_ipi() in clint timer functions to avoid some duplications

Changes in v2:
- Do the minimal partial revert instead of a complete revert, enough to make HiFive Unleashed board boot again.

 arch/riscv/cpu/cpu.c          |  2 +-
 arch/riscv/lib/sifive_clint.c | 16 ++++++++++++----
 common/spl/spl_opensbi.c      |  5 -----
 3 files changed, 13 insertions(+), 10 deletions(-)
arch/riscv/cpu/cpu.c index renamed from arch/riscv/cpu/cpu.c +0 -0

bbd6c15..bfa2d4a 100644

arch/riscv/cpu/cpu.c +1 -1
@@ -107,7 +107,7 @@ int arch_cpu_init_dm(void)  #endif
      }
 
-#ifdef CONFIG_SMP
+#if CONFIG_IS_ENABLED(SMP)
      ret = riscv_init_ipi();
      if (ret)
              return ret;
(quoted diff) +0 -0

b/arch/riscv/lib/sifive_clint.c index 78fc6c8..b9a2c64 100644

arch/riscv/lib/sifive_clint.c +13 -4
@@ -26,6 +26,9 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int riscv_get_time(u64 *time)
 {
+     /* ensure timer register base has a sane value */
+     riscv_init_ipi();
+
      *time = readq((void __iomem *)MTIME_REG(gd->arch.clint));
 
      return 0;
@@ -33,6 +36,9 @@ int riscv_get_time(u64 *time)
 
 int riscv_set_timecmp(int hart, u64 cmp)  {
+     /* ensure timer register base has a sane value */
+     riscv_init_ipi();
+
      writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint,
 hart));
 
      return 0;
@@ -40,11 +46,13 @@ int riscv_set_timecmp(int hart, u64 cmp)
 
 int riscv_init_ipi(void)
 {
-     long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
+     if (!gd->arch.clint) {
+             long *ret =
+ syscon_get_first_range(RISCV_SYSCON_CLINT);
 
-     if (IS_ERR(ret))
-             return PTR_ERR(ret);
-     gd->arch.clint = ret;
+             if (IS_ERR(ret))
+                     return PTR_ERR(ret);
+             gd->arch.clint = ret;
+     }
 
      return 0;
 }
common/spl/spl_opensbi.c +0 -0
index 3440bc0..14f335f 100644
@@ -79,11 +79,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
      invalidate_icache_all();
 
Quoted 14 lines
Quoted 10 lines
common/spl/spl_opensbi.c +0 -6
 #ifdef CONFIG_SPL_SMP
-     /* Initialize the IPI before we use it */
-     ret = riscv_init_ipi();
-     if (ret)
-             hang();
-
      /*
       * Start OpenSBI on all secondary harts and wait for acknowledgment.
       *
--
Quoted 2 lines

2.7.4

Quoted 1 line

Could we get this applied soon, since it's broken in u-boot/master?

OK. I am preparing to send a PR later today.

Thanks,
Rick

Quoted 3 lines

Regards,
Bin