From 34d86ef665114916b34bb25a011c53729307cd70 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Wed, 29 Nov 2017 16:09:30 -0800 Subject: [PATCH] Revert "Avoid data corruption under correctable tag error during flush (#1130)" This reverts commit 44eb4d12b523168f5fcc216fc683d3be9332eb70. --- src/main/scala/rocket/DCache.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/rocket/DCache.scala b/src/main/scala/rocket/DCache.scala index 220b5edd..2565f3e8 100644 --- a/src/main/scala/rocket/DCache.scala +++ b/src/main/scala/rocket/DCache.scala @@ -242,8 +242,8 @@ class DCacheModule(outer: DCache) extends HellaCacheModule(outer) { } val s2_probe_way = RegEnable(s1_hit_way, s1_probe) val s2_probe_state = RegEnable(s1_hit_state, s1_probe) - val s2_hit_way = RegEnable(s1_hit_way, s1_valid_not_nacked || s1_flush_valid) - val s2_hit_state = RegEnable(s1_hit_state, s1_valid_not_nacked || s1_flush_valid) + val s2_hit_way = RegEnable(s1_hit_way, s1_valid_not_nacked) + val s2_hit_state = RegEnable(s1_hit_state, s1_valid_not_nacked) val s2_waw_hazard = RegEnable(s1_waw_hazard, s1_valid_not_nacked) val s2_store_merge = Wire(Bool()) val s2_hit_valid = s2_hit_state.isValid()