From ff02afc3b27dafca4d40be0acce464fb4f52fa4c Mon Sep 17 00:00:00 2001
From: Lyn <39234676+lynatic1337@users.noreply.github.com>
Date: Thu, 24 Oct 2024 06:20:10 +0200
Subject: [PATCH 1/2] maintainers: add lyn

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a3b5a1f2b08..4431ad2c2a66 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13634,6 +13634,12 @@
     githubId = 7910815;
     name = "Alex McGrath";
   };
+  lyn = {
+    name = "Lyn";
+    matrix = "@lynatic:catgirl.cloud";
+    github = "lynatic1337";
+    githubId = 39234676;
+  };
   lyndeno = {
     name = "Lyndon Sanche";
     email = "lsanche@lyndeno.ca";

From e2bcbb198417bee8492afc32f5773f1a737cf6db Mon Sep 17 00:00:00 2001
From: Lyn <39234676+lynatic1337@users.noreply.github.com>
Date: Fri, 25 Oct 2024 03:08:36 +0200
Subject: [PATCH 2/2] linuxPackages.tsme-test: init at
 6.6.68-unstable-2022-12-07

---
 pkgs/os-specific/linux/tsme-test/default.nix | 38 ++++++++++++++++++++
 pkgs/top-level/linux-kernels.nix             |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/os-specific/linux/tsme-test/default.nix

diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix
new file mode 100644
index 000000000000..fc35b49106cc
--- /dev/null
+++ b/pkgs/os-specific/linux/tsme-test/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+}:
+
+stdenv.mkDerivation {
+  pname = "tsme-test";
+  version = "${kernel.version}-unstable-2022-12-07";
+
+  src = fetchFromGitHub {
+    owner = "AMDESE";
+    repo = "mem-encryption-tests";
+    rev = "7abb072ffc50ceb0b4145ae84105ce6c91bd1ff4";
+    hash = "sha256-v0KAGlo6ci0Ij1NAiMUK0vWDHBiFnpQG4Er6ArIKncQ=";
+  };
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = kernel.makeFlags ++ [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 -t $out/lib/modules/${kernel.modDirVersion}/extra tsme-test.ko
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Kernel driver to test the status of AMD TSME (Transparent Secure Memory Encryption)";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lyn ];
+    platforms = lib.platforms.linux;
+    homepage = "https://github.com/AMDESE/mem-encryption-tests";
+  };
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 0eed40c970a8..266909d4dedf 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -615,6 +615,8 @@ in {
 
     msi-ec = callPackage ../os-specific/linux/msi-ec { };
 
+    tsme-test = callPackage ../os-specific/linux/tsme-test { };
+
   } // lib.optionalAttrs config.allowAliases {
     ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
     hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30