Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Commit 1cc2fcc

Browse files
committed
Fix an issue with a Lexar NVMe SSD that fails to resume on wake.
1 parent 1e901f3 commit 1cc2fcc

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -rupN linux-6.12.orig/drivers/nvme/host/pci.c linux-6.12/drivers/nvme/host/pci.c
2+
--- linux-6.12.orig/drivers/nvme/host/pci.c 2024-11-17 22:15:08.000000000 +0000
3+
+++ linux-6.12/drivers/nvme/host/pci.c 2024-11-21 16:09:07.019822707 +0000
4+
@@ -3442,6 +3442,8 @@ static const struct pci_device_id nvme_i
5+
NVME_QUIRK_DISABLE_WRITE_ZEROES, },
6+
{ PCI_VDEVICE(INTEL, 0xf1a6), /* Intel 760p/Pro 7600p */
7+
.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
8+
+ { PCI_DEVICE(0x1d97, 1602), /* Lexar NM790 */
9+
+ .driver_data = NVME_QUIRK_BROKEN_MSI },
10+
{ PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */
11+
.driver_data = NVME_QUIRK_IDENTIFY_CNS |
12+
NVME_QUIRK_DISABLE_WRITE_ZEROES |

PKGBUILD/linux/PKGBUILD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
pkgbase=linux
99
pkgver=6.12
10-
pkgrel=3
10+
pkgrel=4
1111
pkgdesc="Linux Stable"
1212
arch=(x86_64)
1313
url="https://kernel.org/"
@@ -60,6 +60,7 @@ source=(
6060
0041-air-amdgpu-quirks.patch
6161
0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
6262
0060-asus-patch-series.patch
63+
0070-lexar-nvme-broken-msi.patch
6364
0099-add-external-device-drivers.patch
6465
)
6566
validpgpkeys=(
@@ -88,6 +89,7 @@ sha256sums=('SKIP'
8889
'ab8a6dccf67cee7d924ee2e3d4690285d404bcb9bab70eced09b05fa2853b288' # 0041-air-amdgpu-quirks.patch
8990
'7c7df8d4427c807e2cea0f1e147efcdfb1e7c1c5271823cc6bb49f10b1846d19' # 0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
9091
'ee4bda8ed96baa79475d98720e85c67b6a8dcf82a98c41d9860883c407f9a6fb' # 0060-asus-patch-series.patch
92+
'b048068eeee69bf0f600d2ea390c8f681f9708776ff45a4b871e1e51136af33a' # 0070-lexar-nvme-broken-msi.patch
9193
'3b1dabc168e4884c6586720538014d6ef8955a0b783d6436dd4937af6622ee42' # 0099-add-external-device-drivers.patch
9294
)
9395

0 commit comments

Comments
 (0)