Imported Upstream version 1.9.0.4.1.1 (ARMHF)upstream/1.9.0.4.1.1

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

1 files changed, 243 insertions, 409 deletions

diff --git a/sgx/services4/srvkm/hwdefs/sgxerrata.h b/sgx/services4/srvkm/hwdefs/sgxerrata.h
index ccfafd5..36d8b30 100644
--- a/sgx/services4/srvkm/hwdefs/sgxerrata.h
+++ b/sgx/services4/srvkm/hwdefs/sgxerrata.h
@@ -1,215 +1,200 @@
-/**********************************************************************
- *
- * Copyright (C) Imagination Technologies Ltd. All rights reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope it will be useful but, except 
- * as otherwise stated in writing, without any warranty; without even the 
- * implied warranty of merchantability or fitness for a particular purpose. 
- * See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * 
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Contact Information:
- * Imagination Technologies Ltd. <gpl-support@imgtec.com>
- * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
- *
- ******************************************************************************/
+/*************************************************************************/ /*!
+@Title          SGX HW errata definitions
+@Copyright      Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+@Description    Specifies associations between SGX core revisions
+                and SW workarounds required to fix HW errata that exist
+                in specific core revisions
+@License        Dual MIT/GPLv2
 
+The contents of this file are subject to the MIT license as set out below.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+Alternatively, the contents of this file may be used under the terms of
+the GNU General Public License Version 2 ("GPL") in which case the provisions
+of GPL are applicable instead of those above.
+
+If you wish to allow use of your version of this file only under the terms of
+GPL, and not to allow others to use your version of this file under the terms
+of the MIT license, indicate your decision by deleting the provisions above
+and replace them with the notice and other provisions required by GPL as set
+out in the file called "GPL-COPYING" included in this distribution. If you do
+not delete the provisions above, a recipient may use your version of this file
+under the terms of either the MIT license or GPL.
+
+This License is also included in this distribution in the file called
+"MIT-COPYING".
+
+EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+*/ /**************************************************************************/
 #ifndef _SGXERRATA_KM_H_
 #define _SGXERRATA_KM_H_
 
+/* ignore warnings about unrecognised preprocessing directives in conditional inclusion directives */
+/* PRQA S 3115 ++ */
+
 #if defined(SGX520) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX520 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 100
-		#define FIX_HW_BRN_28889
-	#else
 	#if SGX_CORE_REV == 111
-		#define FIX_HW_BRN_28889
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX520 Core Revision unspecified"
 	#endif
 	#endif
-	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX530) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX530 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 110
-		#define FIX_HW_BRN_22934
-		#define FIX_HW_BRN_28889
-	#else
-	#if SGX_CORE_REV == 111
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
-	#else
-	#if SGX_CORE_REV == 1111
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
-	#else
 	#if SGX_CORE_REV == 120
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
+		#define FIX_HW_BRN_28889/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 121
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
+		#define FIX_HW_BRN_28889/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 125
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
+		#define FIX_HW_BRN_28889/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 130
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_28889
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
+		#define FIX_HW_BRN_28889/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX530 Core Revision unspecified"
 	#endif
 	#endif
 	#endif
-	#endif
-	#endif
-	#endif
 #endif
         #endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX531) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX531 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
 	#if SGX_CORE_REV == 101
-		#define FIX_HW_BRN_26620
-		#define FIX_HW_BRN_28011
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 110
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX531 Core Revision unspecified"
 	#endif
 	#endif
 	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if (defined(SGX535) || defined(SGX535_V1_1)) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX535 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 112
-		#define FIX_HW_BRN_23281
-		#define FIX_HW_BRN_23410 
-		#define FIX_HW_BRN_22693
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_22997
-		#define FIX_HW_BRN_23030
-	#else
-	#if SGX_CORE_REV == 113
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_23281
-		#define FIX_HW_BRN_23944
-		#define FIX_HW_BRN_23410
-	#else
 	#if SGX_CORE_REV == 121
-		#define FIX_HW_BRN_22934	
-		#define FIX_HW_BRN_23944
-		#define FIX_HW_BRN_23410
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
+		#define FIX_HW_BRN_23944/* Workaround in code (services) */
+		#define FIX_HW_BRN_23410/* Workaround in code (services) and ucode */
 	#else
 	#if SGX_CORE_REV == 126
-		#define FIX_HW_BRN_22934	
+		#define FIX_HW_BRN_22934/* Workaround in sgx featuredefs */	
 	#else	
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX535 Core Revision unspecified"
 
 	#endif
 	#endif
 	#endif
-	#endif
-	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX540) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX540 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
 	#if SGX_CORE_REV == 101
-		#define FIX_HW_BRN_25499
-		#define FIX_HW_BRN_25503
-		#define FIX_HW_BRN_26620
-		#define FIX_HW_BRN_28011
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_25499/* Workaround in sgx featuredefs */
+		#define FIX_HW_BRN_25503/* Workaround in code (services) */
+		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 110
-		#define FIX_HW_BRN_25503
-		#define FIX_HW_BRN_26620
-		#define FIX_HW_BRN_28011
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_25503/* Workaround in code (services) */
+		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 120
-		#define FIX_HW_BRN_26620
-		#define FIX_HW_BRN_28011
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 121
-		#define FIX_HW_BRN_28011
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == 130
-		#define FIX_HW_BRN_34028
+		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX540 Core Revision unspecified"
 	#endif
@@ -218,243 +203,145 @@
 	#endif
 	#endif
 	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
-#if defined(SGX541) && !defined(SGX_CORE_DEFINED)
-	#if defined(SGX_FEATURE_MP)
-		
-		#define SGX_CORE_REV_HEAD	0
-		#if defined(USE_SGX_CORE_REV_HEAD)
-			
-			#define SGX_CORE_REV	SGX_CORE_REV_HEAD
-		#endif
-
-		#if SGX_CORE_REV == 100
-			#define FIX_HW_BRN_27270
-			#define FIX_HW_BRN_28011
-			#define FIX_HW_BRN_27510
-			
-		#else
-		#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-			
-		#else
-			#error "sgxerrata.h: SGX541 Core Revision unspecified"
-		#endif
-		#endif
-		
-		#define SGX_CORE_DEFINED
-	#else 
-		#error "sgxerrata.h: SGX541 only supports MP configs (SGX_FEATURE_MP)"
-	#endif 
-#endif
 
 #if defined(SGX543) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX543 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 113
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_29997
-		#define FIX_HW_BRN_30954
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
- 		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
-		#endif
-		#define FIX_HW_BRN_31620
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_32044 
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
-	#else
 	#if SGX_CORE_REV == 122
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_29997
-		#define FIX_HW_BRN_30954
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
+		#define FIX_HW_BRN_29954/* turns off regbank split feature */
+		#define FIX_HW_BRN_29997/* workaround in services */
+		#define FIX_HW_BRN_30954/* workaround in services */
+		#define FIX_HW_BRN_31093/* workaround in services */
+		#define FIX_HW_BRN_31195/* workaround in services */
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */
  		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31620
-		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
+		#define FIX_HW_BRN_31620/* workaround in services */
+		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */
+		#define FIX_HW_BRN_32044 /* workaround in uKernel, services and client drivers */
+		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		#define FIX_HW_BRN_33920
-			
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 1221
-		#define FIX_HW_BRN_29954
-        #define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
- 		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
-		#endif
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_31671		
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32044
-		#define FIX_HW_BRN_32085 
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
-			
-	#else
-	#if SGX_CORE_REV == 140
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_30954
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
- 		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
-		#endif
-		#define FIX_HW_BRN_31620
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
-		#define FIX_HW_BRN_33920
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-			
-	#else
-	#if SGX_CORE_REV == 1401
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_30954
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
+		#define FIX_HW_BRN_29954/* turns off regbank split feature */
+        #define FIX_HW_BRN_31195/* workaround in services */
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */
  		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31620
-		#define FIX_HW_BRN_31542
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
-		#define FIX_HW_BRN_33920
+		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */
+		#define FIX_HW_BRN_31671/* workaround in uKernel */		
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#define FIX_HW_BRN_32044/* workaround in uKernel, services and client drivers */
+		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-			
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 141
-		#define FIX_HW_BRN_29954
+		#define FIX_HW_BRN_29954/* turns off regbank split feature */
  		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31671 
- 		#define FIX_HW_BRN_31780
+		#define FIX_HW_BRN_31671 /* workaround in uKernel */
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-			
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 142
-		#define FIX_HW_BRN_29954
+		#define FIX_HW_BRN_29954/* turns off regbank split feature */
  		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31671 
- 		#define FIX_HW_BRN_31780
+		#define FIX_HW_BRN_31671 /* workaround in uKernel */
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-			
-	#else
-	#if SGX_CORE_REV == 211
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
- 		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
-		#endif
-		#define FIX_HW_BRN_31620
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
-			
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 2111
-		#define FIX_HW_BRN_30982 
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
+		#define FIX_HW_BRN_30982 /* workaround in uKernel and services */
+		#define FIX_HW_BRN_31093/* workaround in services */
+		#define FIX_HW_BRN_31195/* workaround in services */
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */
  		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31620
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_31542
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
+		#define FIX_HW_BRN_31620/* workaround in services */
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */
+		#define FIX_HW_BRN_32044 /* workaround in uKernel, services and client drivers */
+		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		#define FIX_HW_BRN_33920
-			
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 213
-		#define FIX_HW_BRN_31272
-		#if defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_31425
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+ 		#if defined(SGX_FEATURE_MP)
+			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
 		#endif
-		#define FIX_HW_BRN_31671 
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32085 
+		#define FIX_HW_BRN_31671 /* workaround in uKernel */
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		#define FIX_HW_BRN_33920
-			
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+			/* add BRNs here */
 	#else
 	#if SGX_CORE_REV == 216
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
 	#else
 	#if SGX_CORE_REV == 302
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
+//	FIXME		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services : incomplete for CS and MP1 */
 	#else
 	#if SGX_CORE_REV == 303
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
+//	FIXME		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services : incomplete for CS and MP1 */
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
 	#else
 		#error "sgxerrata.h: SGX543 Core Revision unspecified"
@@ -468,124 +355,84 @@
 	#endif
 	#endif
 	#endif
-	#endif
-	#endif
-	#endif
-	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX544) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX544 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 100
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
-	#else
-	#if SGX_CORE_REV == 102
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_31272
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32085 
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
-	#else
-	#if SGX_CORE_REV == 103
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_31272
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32085 
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
-	#else
 	#if SGX_CORE_REV == 104
-		#define FIX_HW_BRN_29954
-		#define FIX_HW_BRN_31093
-		#define FIX_HW_BRN_31195
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_31278
+		#define FIX_HW_BRN_29954/* turns off regbank split feature */
+		#define FIX_HW_BRN_31093/* workaround in services */
+		#define FIX_HW_BRN_31195/* workaround in services */
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */
  		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
+ 			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
  		#endif
-		#define FIX_HW_BRN_31542 
- 		#define FIX_HW_BRN_31620
-		#define FIX_HW_BRN_31671 
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_32044 
-		#define FIX_HW_BRN_32085 
+		#define FIX_HW_BRN_31542 /* workaround in uKernel and Services */
+ 		#define FIX_HW_BRN_31620/* workaround in services */
+		#define FIX_HW_BRN_31671 /* workaround in uKernel */
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#define FIX_HW_BRN_32044 /* workaround in uKernel, services and client drivers */
+		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		#define FIX_HW_BRN_33920
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
 	#else	
 	#if SGX_CORE_REV == 105
  		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
+ 			#define FIX_HW_BRN_31559/* workaround in services and uKernel */
  		#endif
- 		#define FIX_HW_BRN_31780
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		#define FIX_HW_BRN_33920
-	#else
-	#if SGX_CORE_REV == 106
-		#define FIX_HW_BRN_31272
- 		#define FIX_HW_BRN_31780
-		#define FIX_HW_BRN_33920
-	#else
-	#if SGX_CORE_REV == 110
-		#define FIX_HW_BRN_31272
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
- 		#define FIX_HW_BRN_31780
-		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
-		#endif
-		#define FIX_HW_BRN_33920
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
 	#else
 	#if SGX_CORE_REV == 112
-		#define FIX_HW_BRN_31272
-		#define FIX_HW_BRN_33920
+		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */
+		#define FIX_HW_BRN_33920/* workaround in ukernel */
+//	FIXME		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services : incomplete for CS and MP1 */
 	#else
 	#if SGX_CORE_REV == 114
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
- 		#define FIX_HW_BRN_31780
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
+//	FIXME		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services : incomplete for CS and MP1 */
 	#else
 	#if SGX_CORE_REV == 115
- 		#if defined(SGX_FEATURE_MP)
- 			#define FIX_HW_BRN_31425
- 		#endif
- 		#define FIX_HW_BRN_31780
+ 		#define FIX_HW_BRN_31780/* workaround in uKernel */
+		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
+		#endif
+//	FIXME	BRN_36513  incomplete for CS and MP1 */
+		#if defined(SGX_FEATURE_MP)
+			#if SGX_FEATURE_MP_CORE_COUNT > 1
+				#define FIX_HW_BRN_36513 /* workaround in uKernel and Services : incomplete for CS and MP1 */
+			#endif
+		#endif
+	#else
+	#if SGX_CORE_REV == 116
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel */
 		#endif
+		#define FIX_HW_BRN_33809/* workaround in kernel (enable burst combiner) */
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
 	#else
 		#error "sgxerrata.h: SGX544 Core Revision unspecified"
@@ -596,39 +443,22 @@
 	#endif
 	#endif
 	#endif
-	#endif
-	#endif
-	#endif
-	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX545) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX545 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
-	#if SGX_CORE_REV == 100
-		#define FIX_HW_BRN_26620
-		#define FIX_HW_BRN_27266
-		#define FIX_HW_BRN_27456
-		#define FIX_HW_BRN_29702
-		#define FIX_HW_BRN_29823
-	#else
 	#if SGX_CORE_REV == 109
-		#define FIX_HW_BRN_29702
-		#define FIX_HW_BRN_29823
-		#define FIX_HW_BRN_31939
-	#else
-	#if SGX_CORE_REV == 1012
-		#define FIX_HW_BRN_31939
-	#else
-	#if SGX_CORE_REV == 1013
-		#define FIX_HW_BRN_31939
+		#define FIX_HW_BRN_29702/* Workaround in services */
+		#define FIX_HW_BRN_29823/* Workaround in services */
+		#define FIX_HW_BRN_31939/* workaround in uKernel */
 	#else
 	#if SGX_CORE_REV == 10131
 	#else
@@ -637,7 +467,7 @@
 	#if SGX_CORE_REV == 10141
 	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
-		
+		/* RTL head - no BRNs to apply */
 	#else
 		#error "sgxerrata.h: SGX545 Core Revision unspecified"
 	#endif
@@ -645,36 +475,34 @@
 	#endif
 	#endif
 	#endif
-	#endif
-	#endif
-	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
 #if defined(SGX554) && !defined(SGX_CORE_DEFINED)
-	
+	/* define the _current_ SGX554 RTL head revision */
 	#define SGX_CORE_REV_HEAD	0
 	#if defined(USE_SGX_CORE_REV_HEAD)
-		
+		/* build config selects Core Revision to be the Head */
 		#define SGX_CORE_REV	SGX_CORE_REV_HEAD
 	#endif
 
 	#if SGX_CORE_REV == 1251
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
-		
+		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */
+		/* add BRNs here */
 	#else	
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
 		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)
-			#define FIX_HW_BRN_33657
+			#define FIX_HW_BRN_33657/* workaround in ukernel*/
 		#endif
 	#else
 		#error "sgxerrata.h: SGX554 Core Revision unspecified"
 	#endif
 	#endif
-	
+	/* signal that the Core Version has a valid definition */
 	#define SGX_CORE_DEFINED
 #endif
 
@@ -686,5 +514,11 @@
 #endif
 #endif
 
-#endif 
+/* restore warning */
+/* PRQA S 3115 -- */
+
+#endif /* _SGXERRATA_KM_H_ */
 
+/******************************************************************************
+ End of file (sgxerrata.h)
+******************************************************************************/