diff options
| author | Ambroz Bizjak <abizjak.pro@gmail.com> | 2019-04-24 19:18:42 +0200 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-04-25 20:25:14 -0400 |
| commit | 196979ee539bd2ba16e224356be787085e27776a (patch) | |
| tree | 79794bc3a3f4cdbf0000d088a68b9e80c97447d1 | |
| parent | Merge pull request #60074 from flokli/18.09/gitlab-11.9.8 (diff) | |
| download | nixpkgs-196979ee539bd2ba16e224356be787085e27776a.tar.gz | |
Fix kernel oops on boot due to bug in i2c driver.
https://github.com/NixOS/nixpkgs/issues/60126
https://lkml.org/lkml/2019/4/24/1123
The patch should be removed in the next round of stable releases because the fix should be included.
(cherry picked from commit 1e8a0805890fbb1cce1aa751296c82342b0cae7e)
(cherry picked from commit a9c40eef1f9a9824c706e1e38c02be5c054453ec)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/i2c-oops.patch | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/i2c-oops.patch b/pkgs/os-specific/linux/kernel/i2c-oops.patch new file mode 100644 index 000000000000..2d4f25cec68d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/i2c-oops.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +index 1d645c9ab417bf..cac262a912c124 100644 +--- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c ++++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"), + }, + .driver_data = (void *)&sipodev_desc +- } ++ }, ++ { } /* Terminate list */ + }; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c338b37deca..e02cd0545a4c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,8 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; + + # Fix kernel OOPS on boot: https://github.com/NixOS/nixpkgs/issues/60126 + # Remove with the next release. + i2c-oops = { name = "i2c-oops"; patch = ./i2c-oops.patch; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7032ef8ea8d..d09a49abd1ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14097,6 +14097,7 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; @@ -14107,6 +14108,7 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; @@ -14117,6 +14119,7 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.i2c-oops ]; }; |