tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Switch to linux-zen kernel

Browse source 
- the kernel patch is needed to make the my m2 SSDs work in older 6.x
kernels, should be fixed ~ 6.6
This commit is contained in:
Tristan D. 2023-11-03 23:52:30 +01:00
parent 7b70408842
commit 127439bee2
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
systems/nixos-pulse/default.nix
View file

@ -20,7 +20,13 @@
nixpkgs.hostPlatform = lib.mkDefault system;
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_zen;
kernelPatches = [
{
name = "lexar";
patch = ./lexar.patch;
}
];
loader = {
systemd-boot = {
enable = true;

31
systems/nixos-pulse/lexar.patch Normal file
View file

@ -0,0 +1,31 @@
@@ -, +, @@
----------
----------
---
drivers/nvme/host/core.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
--- a/drivers/nvme/host/core.c
+++ a/drivers/nvme/host/core.c
@@ -2255,11 +2255,17 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl)
return ret;
}
- if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {
- ctrl->ctrl_config |= NVME_CC_CRIME;
- timeout = NVME_CRTO_CRIMT(crto);
+ if (crto == 0) {
+ timeout = NVME_CAP_TIMEOUT(ctrl->cap);
+ dev_warn(ctrl->device, "Ignoring bogus CRTO (0), falling back to NVME_CAP_TIMEOUT (%u)\n",
+ timeout);
} else {
- timeout = NVME_CRTO_CRWMT(crto);
+ if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {
+ ctrl->ctrl_config |= NVME_CC_CRIME;
+ timeout = NVME_CRTO_CRIMT(crto);
+ } else {
+ timeout = NVME_CRTO_CRWMT(crto);
+ }
}
} else {
timeout = NVME_CAP_TIMEOUT(ctrl->cap);
--