diff --git a/projects/rocr-runtime/include/hsakmttypes.h b/projects/rocr-runtime/include/hsakmttypes.h
index 84292a70f0..cebf5ac699 100644
--- a/projects/rocr-runtime/include/hsakmttypes.h
+++ b/projects/rocr-runtime/include/hsakmttypes.h
@@ -301,7 +301,8 @@ typedef struct _HsaNodeProperties
                                        // number hash created by the PSP
     HSAuint32       NumSdmaEngines;    // number of PCIe optimized SDMA engines
     HSAuint32       NumSdmaXgmiEngines;// number of XGMI optimized SDMA engines
-    HSAuint8        Reserved[36];
+    HSAuint32       NumGws;            // number of GWS barriers
+    HSAuint8        Reserved[32];
 } HsaNodeProperties;
 
 
diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c
index 3ce5a83f70..6fde6e588b 100644
--- a/projects/rocr-runtime/src/topology.c
+++ b/projects/rocr-runtime/src/topology.c
@@ -1005,6 +1005,8 @@ HSAKMT_STATUS topology_sysfs_get_node_props(uint32_t node_id,
 			props->NumSdmaEngines = prop_val;
 		else if (strcmp(prop_name, "num_sdma_xgmi_engines") == 0)
 			props->NumSdmaXgmiEngines = prop_val;
+		else if (strcmp(prop_name, "num_gws") == 0)
+			props->NumGws = prop_val;
 	}
 
 	hsa_gfxip = find_hsa_gfxip_device(props->DeviceId);