Merge pull request fbelavenuto#4 from fbelavenuto/master

Pull latest
jimmyGALLAND · Sep 22, 2022 · 66caf6c · 66caf6c
2 parents a6b4ae9 + 5c26235
commit 66caf6c
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 31 deletions.
diff --git a/compile-lkms.sh b/compile-lkms.sh
@@ -7,15 +7,27 @@ DEST_PATH="output"
 
 mkdir -p "${DEST_PATH}"
 
-curl -LO "https://github.com/fbelavenuto/arpl/raw/main/PLATFORMS"
+curl -sLO "https://github.com/fbelavenuto/arpl/raw/main/PLATFORMS"
 
-# Main
-while read PLATFORM KVER; do
-# Compile using docker
-  docker run --rm -t --user `id -u` -v "${TMP_PATH}":/output \
+function compileLkm() {
+  PLATFORM=$1
+  KVER=$2
+  OUT_PATH="${TMP_PATH}/${PLATFORM}"
+  mkdir -p "${OUT_PATH}"
+  # Compile using docker
+  docker run --rm -t --user `id -u` -v "${OUT_PATH}":/output \
     -v "${PWD}":/input fbelavenuto/syno-compiler compile-lkm ${PLATFORM}
-  mv "${TMP_PATH}/redpill-dev.ko" "${DEST_PATH}/rp-${PLATFORM}-${KVER}-dev.ko"
+  mv "${OUT_PATH}/redpill-dev.ko" "${DEST_PATH}/rp-${PLATFORM}-${KVER}-dev.ko"
+  rm -f "${DEST_PATH}/rp-${PLATFORM}-${KVER}-dev.ko.gz"
   gzip "${DEST_PATH}/rp-${PLATFORM}-${KVER}-dev.ko"
-  mv "${TMP_PATH}/redpill-prod.ko" "${DEST_PATH}/rp-${PLATFORM}-${KVER}-prod.ko"
+  mv "${OUT_PATH}/redpill-prod.ko" "${DEST_PATH}/rp-${PLATFORM}-${KVER}-prod.ko"
+  rm -f "${DEST_PATH}/rp-${PLATFORM}-${KVER}-prod.ko.gz"
   gzip "${DEST_PATH}/rp-${PLATFORM}-${KVER}-prod.ko"
+  rm -rf "${OUT_PATH}"
+}
+
+# Main
+while read PLATFORM KVER; do
+  compileLkm "${PLATFORM}" "${KVER}" &
 done < PLATFORMS
+wait
diff --git a/config/platforms.h b/config/platforms.h
@@ -60,6 +60,88 @@ const struct hw_config supported_platforms[] = {
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
+    {
+        .name = "DS1520+",
+        .pci_stubs = {
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x01, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = true,
+        .swap_serial = false,
+        .reinit_ttyS0 = true,
+        .fix_disk_led_ctrl = true,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_NULL_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_NULL_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN_NULL_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_DETECT_ID, HWMON_SYS_HDD_BP_ENABLE_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
+    {
+        .name = "DS1621+",
+        .pci_stubs = {
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = false,
+        .swap_serial = false,
+        .reinit_ttyS0 = true,
+        .fix_disk_led_ctrl = true,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
+                             HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
+            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
+    {
+        .name = "DS1621xs+",
+        .pci_stubs = {
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x09, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x0c, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = false,
+        .swap_serial = false,
+        .reinit_ttyS0 = true,
+        .fix_disk_led_ctrl = true,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
+                             HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
+    {
+        .name = "DS2422+",
+        .pci_stubs = {
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = false,
+        .swap_serial = false,
+        .reinit_ttyS0 = true,
+        .fix_disk_led_ctrl = true,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
+                             HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
     {
         .name = "DS3615xs",
         .pci_stubs = {
@@ -78,7 +160,7 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
@@ -101,7 +183,7 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
@@ -123,14 +205,34 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
     {
-        .name = "DS1621+",
+        .name = "DVA1622",
+        .pci_stubs = {
+            { .type = VPD_MARVELL_88SE9235,    .bus = 0x01, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = true,
+        .swap_serial = false,
+        .reinit_ttyS0 = true,
+        .fix_disk_led_ctrl = true,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_NULL_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_NULL_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN_NULL_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_DETECT_ID, HWMON_SYS_HDD_BP_ENABLE_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
+	{
+        .name = "DVA3219",
         .pci_stubs = {
             { .type = __VPD_TERMINATOR__ }
         },
@@ -143,14 +245,14 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
     {
-        .name = "DS2422+",
+        .name = "DVA3221",
         .pci_stubs = {
             { .type = __VPD_TERMINATOR__ }
         },
@@ -163,55 +265,82 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
     {
-        .name = "DVA1622",
+        .name = "FS2500",
         .pci_stubs = {
-            { .type = VPD_MARVELL_88SE9235,    .bus = 0x01, .dev = 0x00, .fn = 0x00, .multifunction = false },
             { .type = __VPD_TERMINATOR__ }
         },
-        .emulate_rtc = true,
+        .emulate_rtc = false,
         .swap_serial = false,
         .reinit_ttyS0 = true,
         .fix_disk_led_ctrl = true,
         .has_cpu_temp = true,
         .hwmon = {
-            .sys_thermal = { HWMON_SYS_TZONE_NULL_ID },
-            .sys_voltage = { HWMON_SYS_VSENS_NULL_ID },
-            .sys_fan_speed_rpm = { HWMON_SYS_FAN_NULL_ID },
-            .hdd_backplane = { HWMON_SYS_HDD_BP_DETECT_ID, HWMON_SYS_HDD_BP_ENABLE_ID },
+            .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
+                             HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
-	{
-        .name = "DVA3221",
+    {
+        .name = "FS6400",
         .pci_stubs = {
             { .type = __VPD_TERMINATOR__ }
         },
         .emulate_rtc = false,
         .swap_serial = false,
         .reinit_ttyS0 = true,
-        .fix_disk_led_ctrl = true,
+        .fix_disk_led_ctrl = false,
         .has_cpu_temp = true,
         .hwmon = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
-/*    {
-        .name = "FS6400",
+{
+        .name = "RS3413xs+",
+        .pci_stubs = {
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x07, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x08, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x09, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x0a, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = __VPD_TERMINATOR__ }
+        },
+        .emulate_rtc = false,
+        .swap_serial = true,
+        .reinit_ttyS0 = false,
+        .fix_disk_led_ctrl = false,
+        .has_cpu_temp = true,
+        .hwmon = {
+            .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
+            .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
+                             HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
+            .psu_status = { HWMON_PSU_NULL_ID },
+            .sys_current = { HWMON_SYS_CURR_NULL_ID },
+        }
+    },
+    {
+        .name = "RS3618xs",
         .pci_stubs = {
+            { .type = VPD_MARVELL_88SE9215, .bus = 0x01, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9215, .bus = 0x02, .dev = 0x00, .fn = 0x00, .multifunction = false },
+            { .type = VPD_MARVELL_88SE9235, .bus = 0x08, .dev = 0x00, .fn = 0x00, .multifunction = false },
             { .type = __VPD_TERMINATOR__ }
         },
         .emulate_rtc = false,
@@ -223,13 +352,13 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
     },
-	{
+    {
         .name = "RS4021xs+",
         .pci_stubs = {
             { .type = __VPD_TERMINATOR__ }
@@ -243,12 +372,12 @@ const struct hw_config supported_platforms[] = {
             .sys_thermal = { HWMON_SYS_TZONE_REMOTE1_ID, HWMON_SYS_TZONE_LOCAL_ID, HWMON_SYS_TZONE_REMOTE2_ID },
             .sys_voltage = { HWMON_SYS_VSENS_VCC_ID, HWMON_SYS_VSENS_VPP_ID, HWMON_SYS_VSENS_V33_ID,
                              HWMON_SYS_VSENS_V5_ID, HWMON_SYS_VSENS_V12_ID },
-            .sys_fan_speed_rpm = {HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
+            .sys_fan_speed_rpm = { HWMON_SYS_FAN1_ID, HWMON_SYS_FAN2_ID },
             .hdd_backplane = { HWMON_SYS_HDD_BP_NULL_ID },
             .psu_status = { HWMON_PSU_NULL_ID },
             .sys_current = { HWMON_SYS_CURR_NULL_ID },
         }
-    },*/
+    },
 };
 
 #endif //REDPILLLKM_PLATFORMS_H
diff --git a/output/rp-apollolake-4.4.180-dev.ko.gz b/output/rp-apollolake-4.4.180-dev.ko.gz
diff --git a/output/rp-apollolake-4.4.180-prod.ko.gz b/output/rp-apollolake-4.4.180-prod.ko.gz
diff --git a/output/rp-broadwell-4.4.180-dev.ko.gz b/output/rp-broadwell-4.4.180-dev.ko.gz
diff --git a/output/rp-broadwell-4.4.180-prod.ko.gz b/output/rp-broadwell-4.4.180-prod.ko.gz
diff --git a/output/rp-broadwellnk-4.4.180-dev.ko.gz b/output/rp-broadwellnk-4.4.180-dev.ko.gz
diff --git a/output/rp-broadwellnk-4.4.180-prod.ko.gz b/output/rp-broadwellnk-4.4.180-prod.ko.gz
diff --git a/output/rp-bromolow-3.10.108-dev.ko.gz b/output/rp-bromolow-3.10.108-dev.ko.gz
diff --git a/output/rp-bromolow-3.10.108-prod.ko.gz b/output/rp-bromolow-3.10.108-prod.ko.gz
diff --git a/output/rp-denverton-4.4.180-dev.ko.gz b/output/rp-denverton-4.4.180-dev.ko.gz
diff --git a/output/rp-denverton-4.4.180-prod.ko.gz b/output/rp-denverton-4.4.180-prod.ko.gz
diff --git a/output/rp-geminilake-4.4.180-dev.ko.gz b/output/rp-geminilake-4.4.180-dev.ko.gz
diff --git a/output/rp-geminilake-4.4.180-prod.ko.gz b/output/rp-geminilake-4.4.180-prod.ko.gz
diff --git a/output/rp-v1000-4.4.180-dev.ko.gz b/output/rp-v1000-4.4.180-dev.ko.gz
diff --git a/output/rp-v1000-4.4.180-prod.ko.gz b/output/rp-v1000-4.4.180-prod.ko.gz