isp: Handle high mapped VAs for t602x

This is similar to some of the other hardware we've seen on this SoC...

Signed-off-by: Asahi Lina <[email protected]>

Author: hoshinolina

src/isp.c

@@ -94,6 +94,8 @@ int isp_init(void)
 
     pmgr_set_mode(pmgr_base + pmgr_off, PMGR_PS_PWRGATE);
 
+    bool remap = false;
+
     /* TODO: confirm versions */
     switch (ver_rev) {
         case ISP_VER_T8103:
@@ -124,9 +126,11 @@ int isp_init(void)
             }
             break;
         case ISP_VER_T6020:
+            remap = true;
+
             switch (os_firmware.version) {
                 case V13_5:
-                    heap_top = 0xf00000;
+                    heap_top = 0x10000f00000;
                     break;
                 default:
                     printf("isp: unsupported firmware\n");
@@ -144,7 +148,10 @@ int isp_init(void)
     seg = adt_getprop(adt, isp_node, "segment-ranges", &segments_len);
     unsigned int count = segments_len / sizeof(*seg);
 
-    heap_iova = seg[count - 1].iova + seg[count - 1].size;
+    if (remap)
+        heap_iova = seg[count - 1].remap + seg[count - 1].size;
+    else
+        heap_iova = seg[count - 1].iova + seg[count - 1].size;
     heap_size = heap_top - heap_iova;
     heap_phys = top_of_memory_alloc(heap_size);
 

src/kboot.c

@@ -2223,7 +2223,7 @@ int kboot_prepare_dt(void *fdt)
         return -1;
     if (dt_set_sio_fwdata())
         return -1;
-    if (dt_reserve_asc_firmware("/arm-io/isp", "/arm-io/isp0", "isp", false))
+    if (dt_reserve_asc_firmware("/arm-io/isp", "/arm-io/isp0", "isp", chip_id > 0x6020))
         return -1;
     if (dt_set_isp_fwdata())
         return -1;