Updated to release v2.1.

Intended to be the basis for the VSM development.

1 files changed, 24 insertions, 16 deletions

diff --git a/big-little/virtualisor/cache_geom.c b/big-little/virtualisor/cache_geom.c
index 4c0307c..4138eeb 100644
--- a/big-little/virtualisor/cache_geom.c
+++ b/big-little/virtualisor/cache_geom.c
@@ -1,18 +1,24 @@
 /*
- * $Copyright:
- * ----------------------------------------------------------------
- * This confidential and proprietary software may be used only as
- * authorised by a licensing agreement from ARM Limited
- *  (C) COPYRIGHT 2008-2011 ARM Limited
- *       ALL RIGHTS RESERVED
- * The entire notice above must be reproduced on all authorised
- * copies and copies may only be made to the extent permitted
- * by a licensing agreement from ARM Limited.
- * ----------------------------------------------------------------
- * File:     cache_geom.c
- * ----------------------------------------------------------------
- * $
- */
+ * Copyright (c) 2011, ARM Limited. All rights reserved.
+ *       
+ * Redistribution and use in source and binary forms, with
+ * or without modification, are permitted provided that the
+ * following conditions are met:
+ *     
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the 
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and 
+ * the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *      
+ * Neither the name of ARM nor the names of its
+ * contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.                        
+ */ 
 
 #include "virtualisor.h"
 #include "virt_helpers.h"
@@ -159,7 +165,7 @@ void find_cache_diff(cache_geometry *hcg_ptr, cache_geometry *tcg_ptr, cache_dif
 
 unsigned map_cache_geometries(cache_geometry *hcg_ptr, cache_geometry *tcg_ptr, cache_diff *cd_ptr)
 {
-        unsigned rc = 0, cpu_no = read_midr(), cpu_id = read_cpuid();
+        unsigned rc = 0, cpu_id = read_cpuid();
         unsigned hcr = 0, cluster_id = read_clusterid(), sibling_cpuid = 0;
         unsigned abs_cpuid = 0;
 
@@ -208,7 +214,9 @@ unsigned map_cache_geometries(cache_geometry *hcg_ptr, cache_geometry *tcg_ptr,
                 hcr = read_hcr();
                 hcr |= HCR_TSW | HCR_TID2;
                 write_hcr(hcr);
-                
+                dsb();
+                isb();
+
         } else {
                 
                 /* Find the cache geometry on the target cpu */