Skip to contentSkip to conversation

arm: dra7xx: Fix error path in iodelay recalibration

PATCH New Lokesh Vutla 2 participants 4 messages Oct 1, 2019 – Oct 12, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm: dra7xx: Fix error path in iodelay recalibration

When an error is reported in __recalibrate_iodelay_start(), de-isolation of IO doesn't happen. Because of this, undefined behaviour is observed on many peripherals without any error. So make sure io is out of isolation at the end of iodelay recalibration.

---
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +3 -2
index e2abb7d058..9bd7051786 100644
@@ -202,8 +202,9 @@ void __recalibrate_iodelay_end(int ret)
 		return;
 	}
 
-	if (!ret)
-		ret = isolate_io(DEISOLATE_IO);
+	/* Deisolate IO if it is already isolated */
+	if (readl((*ctrl)->ctrl_core_sma_sw_0) & CTRL_ISOLATE_MASK)
+		isolate_io(DEISOLATE_IO);
 
 	/* lock IODELAY CONFIG registers */
 	writel(CFG_IODELAY_LOCK_KEY, (*ctrl)->iodelay_config_base +
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 arm: dra7xx: Hang on any failure during IOdelay recalibration

If there is any failure during IOdelay recalibration sequence, IOs are not guaranteed to behave as expected. So hang on any failure during the sequence.

---
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +6 -0
index 9bd7051786..9eda57c450 100644
@@ -241,6 +241,12 @@ void __recalibrate_iodelay_end(int ret)
 		debug("IODELAY: IO delay recalibration successfully completed\n");
 	}
 
+	/* If there is an error during iodelay recalibration, SoC is in a bad
+	 * state. Do not progress any further.
+	 */
+	if (ret)
+		hang();
+
 	return;
 }
 
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/2 arm: dra7xx: Hang on any failure during IOdelay recalibration

Quoted 5 lines · Lokesh Vutla

If there is any failure during IOdelay recalibration sequence, IOs are not guaranteed to behave as expected. So hang on any failure during the sequence.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/e41a5336/attachment.sig>
#3 lore raw

PATCH 1/2 arm: dra7xx: Fix error path in iodelay recalibration

In reply to Lokesh Vutla
Quoted 7 lines · Lokesh Vutla

When an error is reported in __recalibrate_iodelay_start(), de-isolation of IO doesn't happen. Because of this, undefined behaviour is observed on many peripherals without any error. So make sure io is out of isolation at the end of iodelay recalibration.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/88d96e01/attachment.sig>