firmware: Add support for 12.3.1 firmware.

This includes mapping it to 12.3.0 for compat in both DCP and GPU.

Added for machines with replaced logic boards that trigger the 12.3
bootloop issue.

Also fix the 12.5/12.6 version arrays which were wrong.

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

src/firmware.c

@@ -17,10 +17,11 @@ const struct fw_version_info fw_versions[NUM_FW_VERSIONS] = {
     [V12_1] = {V12_1, "12.1", {12, 1, 0}, 3, "iBoot-7429.61.2"},
     [V12_2] = {V12_2, "12.2", {12, 2, 0}, 3, "iBoot-7429.81.3"},
     [V12_3] = {V12_3, "12.3", {12, 3, 0}, 3, "iBoot-7459.101.2"},
+    [V12_3_1] = {V12_3_1, "12.3.1", {12, 3, 1}, 3, "iBoot-7459.101.3"},
     [V12_4] = {V12_4, "12.4", {12, 4, 0}, 3, "iBoot-7459.121.3"},
-    [V12_5] = {V12_5, "12.5", {12, 4, 0}, 3, "iBoot-7459.141.1"},
+    [V12_5] = {V12_5, "12.5", {12, 5, 0}, 3, "iBoot-7459.141.1"},
     // Same as 12.5
-    // {V12_6, "12.6", {12, 4, 0}, 3, "iBoot-7459.141.1"},
+    // {V12_6, "12.6", {12, 6, 0}, 3, "iBoot-7459.141.1"},
     [V13_0B4] = {V13_0B4, "13.0 beta4", {12, 99, 4}, 3, "iBoot-8419.0.151.0.1"},
     [V13_0] = {V13_0, "13.0", {13, 0, 0}, 3, "iBoot-8419.41.10"},
 };

src/firmware.h

@@ -10,6 +10,7 @@ enum fw_version {
     V12_1,
     V12_2,
     V12_3,
+    V12_3_1,
     V12_4,
     V12_5,
     // V12_6,

src/kboot.c

@@ -1043,6 +1043,7 @@ static int dt_set_dcp_firmware(const char *alias)
     const struct fw_version_info *compat;
 
     switch (os_firmware.version) {
+        case V12_3_1:
         case V12_4:
             compat = &fw_versions[V12_3];
             break;

src/kboot_gpu.c

@@ -398,7 +398,18 @@ int dt_set_gpu(void *dt)
     if (firmware_set_fdt(dt, gpu, "apple,firmware-version", &os_firmware))
         return -1;
 
-    if (firmware_set_fdt(dt, gpu, "apple,firmware-compat", &os_firmware))
+    const struct fw_version_info *compat;
+
+    switch (os_firmware.version) {
+        case V12_3_1:
+            compat = &fw_versions[V12_3];
+            break;
+        default:
+            compat = &os_firmware;
+            break;
+    }
+
+    if (firmware_set_fdt(dt, gpu, "apple,firmware-compat", compat))
         return -1;
 
     u32 i = 0;