From e7a21b627e8bbaccce4133e4eb2966d60a15a247 Mon Sep 17 00:00:00 2001
From: Johannes Wirth <wirth@esa.tu-darmstadt.de>
Date: Tue, 18 Mar 2025 13:44:11 +0100
Subject: [PATCH] Update cluster info for new address map

---
 include/ehrenberg/devices/fki_cluster_info.h | 73 ++++++++------------
 1 file changed, 28 insertions(+), 45 deletions(-)

diff --git a/include/ehrenberg/devices/fki_cluster_info.h b/include/ehrenberg/devices/fki_cluster_info.h
index 406cce6..cf522f7 100644
--- a/include/ehrenberg/devices/fki_cluster_info.h
+++ b/include/ehrenberg/devices/fki_cluster_info.h
@@ -20,7 +20,6 @@ static uint64_t fki_addr_aes_adapter(uint8_t cluster);
 static uint64_t fki_addr_ut_adapter(uint8_t cluster);
 static uint64_t fki_addr_sram0(uint8_t cluster);
 static uint64_t fki_addr_sram3(uint8_t cluster);
-static uint64_t fki_addr_hide_adapter(uint8_t cluster);
 
 #define Compute0 2
 #define Compute0_ccc 2,0
@@ -33,14 +32,13 @@ static uint64_t fki_addr_hide_adapter(uint8_t cluster);
 #define ADDR_Compute0_ccc_configMem 0x80000000
 #define ADDR_Compute0_ccc_peMapping 0x80006000
 #define ADDR_Compute0_aes_adapter 0x80007000
-#define ADDR_Compute0_hide_adapter 0x80008000
-#define ADDR_Compute0_cntrl_cva5 0x80009000
-#define ADDR_Compute0_cntrl_tgc 0x8000a000
-#define ADDR_Compute0_ut_adapter 0x8000b000
-#define ADDR_Compute0_sram0 0x8000c000
-#define ADDR_Compute0_sram1 0x8010c000
-#define ADDR_Compute0_sram2 0x8018c000
-#define ADDR_Compute0_sram3 0x8020c000
+#define ADDR_Compute0_cntrl_cva5 0x80008000
+#define ADDR_Compute0_cntrl_tgc 0x80009000
+#define ADDR_Compute0_ut_adapter 0x8000a000
+#define ADDR_Compute0_sram0 0x8000b000
+#define ADDR_Compute0_sram1 0x8008b000
+#define ADDR_Compute0_sram2 0x800cb000
+#define ADDR_Compute0_sram3 0x8010b000
 #define Compute1 3
 #define Compute1_ccc 3,0
 #define Compute1_stream2axi 3,1
@@ -52,14 +50,13 @@ static uint64_t fki_addr_hide_adapter(uint8_t cluster);
 #define ADDR_Compute1_ccc_configMem 0x90000000
 #define ADDR_Compute1_ccc_peMapping 0x90006000
 #define ADDR_Compute1_aes_adapter 0x90007000
-#define ADDR_Compute1_hide_adapter 0x90008000
-#define ADDR_Compute1_cntrl_cva5 0x90009000
-#define ADDR_Compute1_cntrl_tgc 0x9000a000
-#define ADDR_Compute1_ut_adapter 0x9000b000
-#define ADDR_Compute1_sram0 0x9000c000
-#define ADDR_Compute1_sram1 0x9010c000
-#define ADDR_Compute1_sram2 0x9018c000
-#define ADDR_Compute1_sram3 0x9020c000
+#define ADDR_Compute1_cntrl_cva5 0x90008000
+#define ADDR_Compute1_cntrl_tgc 0x90009000
+#define ADDR_Compute1_ut_adapter 0x9000a000
+#define ADDR_Compute1_sram0 0x9000b000
+#define ADDR_Compute1_sram1 0x9008b000
+#define ADDR_Compute1_sram2 0x900cb000
+#define ADDR_Compute1_sram3 0x9010b000
 
 static uint8_t fki_ccc(uint8_t cluster) {
 	switch(cluster) {
@@ -148,10 +145,10 @@ static uint64_t fki_addr_ccc_peMapping(uint8_t cluster) {
 static uint64_t fki_addr_sram1(uint8_t cluster) {
 	switch(cluster) {
 		case 3: {
-			return 0x9010c000;
+			return 0x9008b000;
 		}
 		case 2: {
-			return 0x8010c000;
+			return 0x8008b000;
 		}
 		default: {
 			return -1;
@@ -176,10 +173,10 @@ static uint64_t fki_addr_ccc_configMem(uint8_t cluster) {
 static uint64_t fki_addr_sram2(uint8_t cluster) {
 	switch(cluster) {
 		case 2: {
-			return 0x8018c000;
+			return 0x800cb000;
 		}
 		case 3: {
-			return 0x9018c000;
+			return 0x900cb000;
 		}
 		default: {
 			return -1;
@@ -190,10 +187,10 @@ static uint64_t fki_addr_sram2(uint8_t cluster) {
 static uint64_t fki_addr_cntrl_cva5(uint8_t cluster) {
 	switch(cluster) {
 		case 2: {
-			return 0x80009000;
+			return 0x80008000;
 		}
 		case 3: {
-			return 0x90009000;
+			return 0x90008000;
 		}
 		default: {
 			return -1;
@@ -204,10 +201,10 @@ static uint64_t fki_addr_cntrl_cva5(uint8_t cluster) {
 static uint64_t fki_addr_cntrl_tgc(uint8_t cluster) {
 	switch(cluster) {
 		case 2: {
-			return 0x8000a000;
+			return 0x80009000;
 		}
 		case 3: {
-			return 0x9000a000;
+			return 0x90009000;
 		}
 		default: {
 			return -1;
@@ -260,10 +257,10 @@ static uint64_t fki_addr_aes_adapter(uint8_t cluster) {
 static uint64_t fki_addr_ut_adapter(uint8_t cluster) {
 	switch(cluster) {
 		case 3: {
-			return 0x9000b000;
+			return 0x9000a000;
 		}
 		case 2: {
-			return 0x8000b000;
+			return 0x8000a000;
 		}
 		default: {
 			return -1;
@@ -274,10 +271,10 @@ static uint64_t fki_addr_ut_adapter(uint8_t cluster) {
 static uint64_t fki_addr_sram0(uint8_t cluster) {
 	switch(cluster) {
 		case 2: {
-			return 0x8000c000;
+			return 0x8000b000;
 		}
 		case 3: {
-			return 0x9000c000;
+			return 0x9000b000;
 		}
 		default: {
 			return -1;
@@ -288,24 +285,10 @@ static uint64_t fki_addr_sram0(uint8_t cluster) {
 static uint64_t fki_addr_sram3(uint8_t cluster) {
 	switch(cluster) {
 		case 2: {
-			return 0x8020c000;
+			return 0x8010b000;
 		}
 		case 3: {
-			return 0x9020c000;
-		}
-		default: {
-			return -1;
-		}
-	}
-}
-
-static uint64_t fki_addr_hide_adapter(uint8_t cluster) {
-	switch(cluster) {
-		case 2: {
-			return 0x80008000;
-		}
-		case 3: {
-			return 0x90008000;
+			return 0x9010b000;
 		}
 		default: {
 			return -1;