diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index faf686c..52c0bd84 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -917,6 +917,16 @@ static int icm_firmware_reset(struct tb *tb, struct tb_nhi *nhi)
 	struct icm *icm = tb_priv(tb);
 	u32 val;
 
+	if (!icm->upstream_port) {
+		/* Re-start ARC */
+		val = ioread32(nhi->iobase + REG_FW_STS);
+		val |= REG_FW_STS_ICM_EN_INVERT;
+		val |= REG_FW_STS_ICM_EN_CPU;
+		iowrite32(val, nhi->iobase + REG_FW_STS);
+
+		return 0;
+	}
+
 	/* Put ARC to wait for CIO reset event to happen */
 	val = ioread32(nhi->iobase + REG_FW_STS);
 	val |= REG_FW_STS_CIO_RESET_REQ;