From e1a03cc9ac70776bc401e348dc816327f45d3f1b Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Thu, 24 Mar 2016 19:52:12 -0700
Subject: [PATCH] fix issue with partial writemasks

---
 groundtest                       | 2 +-
 src/main/scala/TestConfigs.scala | 4 ++++
 uncore                           | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/groundtest b/groundtest
index e711f798..109f29e0 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit e711f7988fe5be7881406eb310501cc0a7efb098
+Subproject commit 109f29e0ae503e6678d0d25213f859339a4f0e33
diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala
index cb1a5978..2fc2ab04 100644
--- a/src/main/scala/TestConfigs.scala
+++ b/src/main/scala/TestConfigs.scala
@@ -35,6 +35,8 @@ class WithGroundTest extends Config(
       }
     }
     case GroundTestMaxXacts => 1
+    case GroundTestCSRs => Nil
+    case RoccNCSRs => site(GroundTestCSRs).size
     case UseFPU => false
   })
 
@@ -101,6 +103,8 @@ class WithDmaStreamTest extends Config(
     case DmaStreamTestSettings => DmaStreamTestConfig(
       source = 0x10, dest = 0x28, len = 0x18,
       size = site(StreamLoopbackWidth) / 8)
+    case GroundTestCSRs =>
+      Seq(DmaCtrlRegNumbers.CSR_BASE + DmaCtrlRegNumbers.OUTSTANDING)
   })
 
 class WithNastiConverterTest extends Config(
diff --git a/uncore b/uncore
index 86f68452..9978139f 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 86f6845288d2d8feaa187331acd5a04d8cb1371e
+Subproject commit 9978139f4f6276db01b2a46b3438ef0fe73d9d59