Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-5.6-2020-02-22' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Just a set of NVMe fixes via Keith"
* tag 'block-5.6-2020-02-22' of git://git.kernel.dk/linux-block:
nvme-multipath: Fix memory leak with ana_log_buf
nvme: Fix uninitialized-variable warning
nvme-pci: Use single IRQ vector for old Apple models
nvme/pci: Add sleep quirk for Samsung and Toshiba drives
+16
-2
+1
-1
drivers/nvme/host/core.c
+1
-1
drivers/nvme/host/core.c
···
1165
1165
static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
1166
1166
unsigned int dword11, void *buffer, size_t buflen, u32 *result)
1167
1167
{
1168
+
union nvme_result res = { 0 };
1168
1169
struct nvme_command c;
1169
-
union nvme_result res;
1170
1170
int ret;
1171
1171
1172
1172
memset(&c, 0, sizeof(c));
+1
drivers/nvme/host/multipath.c
+1
drivers/nvme/host/multipath.c
+14
-1
drivers/nvme/host/pci.c
+14
-1
drivers/nvme/host/pci.c
···
2747
2747
(dmi_match(DMI_BOARD_NAME, "PRIME B350M-A") ||
2748
2748
dmi_match(DMI_BOARD_NAME, "PRIME Z370-A")))
2749
2749
return NVME_QUIRK_NO_APST;
2750
+
} else if ((pdev->vendor == 0x144d && (pdev->device == 0xa801 ||
2751
+
pdev->device == 0xa808 || pdev->device == 0xa809)) ||
2752
+
(pdev->vendor == 0x1e0f && pdev->device == 0x0001)) {
2753
+
/*
2754
+
* Forcing to use host managed nvme power settings for
2755
+
* lowest idle power with quick resume latency on
2756
+
* Samsung and Toshiba SSDs based on suspend behavior
2757
+
* on Coffee Lake board for LENOVO C640
2758
+
*/
2759
+
if ((dmi_match(DMI_BOARD_VENDOR, "LENOVO")) &&
2760
+
dmi_match(DMI_BOARD_NAME, "LNVNB161216"))
2761
+
return NVME_QUIRK_SIMPLE_SUSPEND;
2750
2762
}
2751
2763
2752
2764
return 0;
···
3121
3109
.driver_data = NVME_QUIRK_NO_DEEPEST_PS |
3122
3110
NVME_QUIRK_IGNORE_DEV_SUBNQN, },
3123
3111
{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
3124
-
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
3112
+
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),
3113
+
.driver_data = NVME_QUIRK_SINGLE_VECTOR },
3125
3114
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
3126
3115
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005),
3127
3116
.driver_data = NVME_QUIRK_SINGLE_VECTOR |