Allow USB access to TC1 from Gitlab Runner

m/common/base/boot.nix

@@ -4,6 +4,13 @@
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
 
+  # Enable GRUB2 serial console
+  boot.loader.grub.extraConfig = ''
+    serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+    terminal_input --append serial
+    terminal_output --append serial
+  '';
+
   boot.kernel.sysctl = {
     "kernel.perf_event_paranoid" = lib.mkDefault "-1";
 

m/common/xeon/console.nix

@@ -11,11 +11,4 @@
     "console=tty1"
     "console=ttyS0,115200"
   ];
-
-  # Enable GRUB2 serial console
-  boot.loader.grub.extraConfig = ''
-    serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
-    terminal_input --append serial
-    terminal_output --append serial
-  '';
 }

m/fox/configuration.nix

@@ -3,13 +3,13 @@
 {
   imports = [
     ../common/base.nix
+    ../common/xeon/console.nix
     ../module/amd-uprof.nix
     ../module/emulation.nix
     ../module/nvidia.nix
     ../module/slurm-client.nix
     ../module/hut-substituter.nix
     ./wireguard.nix
-    ./serial-console.nix
   ];
 
   # Don't turn off on August as UPC has different dates.
@@ -19,9 +19,6 @@
   # Select the this using the ID to avoid mismatches
   boot.loader.grub.device = "/dev/disk/by-id/wwn-0x500a07514b0c1103";
 
-  # Increase time so we can boot other entries
-  boot.loader.timeout = 60;
-
   # No swap, there is plenty of RAM
   swapDevices = lib.mkForce [];
 
@@ -34,10 +31,7 @@
   # Use performance for benchmarks
   powerManagement.cpuFreqGovernor = "performance";
 
-  # Enable amd-uprof in >= 6.15 kernels only
-  services.amd-uprof.enable =
-    let ver = config.boot.kernelPackages.kernel.version;
-    in (lib.strings.compareVersions ver "6.15") >= 0;
+  services.amd-uprof.enable = true;
 
   # Disable NUMA balancing
   boot.kernel.sysctl."kernel.numa_balancing" = 0;
@@ -48,11 +42,6 @@
   # Disable NMI watchdog to save one hw counter (for AMD uProf)
   boot.kernel.sysctl."kernel.nmi_watchdog" = 0;
 
-  specialisation.oldKernel.configuration = {
-    system.nixos.tags = [ "old-kernel" ];
-    boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
-  };
-
   services.openssh.settings.X11Forwarding = true;
 
   services.fail2ban.enable = true;

m/fox/serial-console.nix

@@ -1,21 +0,0 @@
-{
-  # Restart the serial console
-  systemd.services."serial-getty@ttyS1" = {
-    enable = true;
-    wantedBy = [ "getty.target" ];
-    serviceConfig.Restart = "always";
-  };
-
-  # Enable serial console
-  boot.kernelParams = [
-    "console=tty1"
-    "console=ttyS1,115200"
-  ];
-
-  # Enable GRUB2 serial console
-  boot.loader.grub.extraConfig = ''
-    serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1
-    terminal_input --append serial
-    terminal_output --append serial
-  '';
-}

m/module/tc1-board.nix

@@ -0,0 +1,27 @@
+{ lib, pkgs, ... }:
+
+{
+  # Allow user access to FTDI USB device
+  services.udev.packages = lib.singleton (pkgs.writeTextFile {
+    # Needs to be < 73
+    name = "60-ftdi-tc1.rules";
+    text = ''
+      # Bus 003 Device 003: ID 0403:6011 Future Technology Devices International, Ltd FT4232H Quad HS USB-UART/FIFO IC
+      # Use := to make sure it doesn't get changed later
+      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", MODE:="0666", TAG+="uaccess"
+    '';
+    destination = "/etc/udev/rules.d/60-ftdi-tc1.rules";
+  });
+
+  # Allow access to USB for docker in GitLab runner
+  services.gitlab-runner = {
+    services.gitlab-bsc-docker = {
+      registrationFlags = [
+        # We need raw access to the USB port to reboot the board
+        "--docker-devices /dev/bus/usb/003/003"
+        # And TTY access for the serial port
+        "--docker-devices /dev/ttyUSB2"
+      ];
+    };
+  };
+}

m/raccoon/configuration.nix

@@ -4,7 +4,6 @@
   imports = [
     ../common/base.nix
     ../common/ssf/hosts.nix
-    ../common/xeon/console.nix
     ../module/emulation.nix
     ../module/debuginfod.nix
     ../module/nvidia.nix

m/tent/configuration.nix

@@ -16,6 +16,7 @@
     ../module/p.nix
     ../module/vpn-dac.nix
     ../module/hut-substituter.nix
+    ../module/tc1-board.nix
   ];
 
   # Select the this using the ID to avoid mismatches

pkgs/bench6/default.nix

@@ -9,15 +9,13 @@
 , nanos6
 , nodes
 , nosv
-, mkl
 , mpi
 , tampi
 , openblas
 , ovni
 , gitBranch ? "master"
 , gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
-, gitCommit ? "fe30c2cfe36b535ef26a0054e010bc005e88ba04"
-, useMkl ? true
+, gitCommit ? "bf29a53113737c3aa74d2fe3d55f59868faea7b4"
 }:
 
 stdenv.mkDerivation rec {
@@ -44,13 +42,10 @@ stdenv.mkDerivation rec {
     nosv
     mpi
     tampi
-    ovni
-  ] ++ (if (useMkl) then [
-    mkl
-  ] else [
     openblas
     openblas.dev
-  ]);
+    ovni
+  ];
 
   env = {
     NANOS6_HOME = nanos6;