|
@@ -19,6 +19,7 @@
|
|
|
#include <linux/blk-mq-pci.h>
|
|
|
#include <linux/cpu.h>
|
|
|
#include <linux/delay.h>
|
|
|
+#include <linux/dmi.h>
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/fs.h>
|
|
|
#include <linux/genhd.h>
|
|
@@ -1943,10 +1944,31 @@ static int nvme_dev_map(struct nvme_dev *dev)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
+static unsigned long check_dell_samsung_bug(struct pci_dev *pdev)
|
|
|
+{
|
|
|
+ if (pdev->vendor == 0x144d && pdev->device == 0xa802) {
|
|
|
+ /*
|
|
|
+ * Several Samsung devices seem to drop off the PCIe bus
|
|
|
+ * randomly when APST is on and uses the deepest sleep state.
|
|
|
+ * This has been observed on a Samsung "SM951 NVMe SAMSUNG
|
|
|
+ * 256GB", a "PM951 NVMe SAMSUNG 512GB", and a "Samsung SSD
|
|
|
+ * 950 PRO 256GB", but it seems to be restricted to two Dell
|
|
|
+ * laptops.
|
|
|
+ */
|
|
|
+ if (dmi_match(DMI_SYS_VENDOR, "Dell Inc.") &&
|
|
|
+ (dmi_match(DMI_PRODUCT_NAME, "XPS 15 9550") ||
|
|
|
+ dmi_match(DMI_PRODUCT_NAME, "Precision 5510")))
|
|
|
+ return NVME_QUIRK_NO_DEEPEST_PS;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
{
|
|
|
int node, result = -ENOMEM;
|
|
|
struct nvme_dev *dev;
|
|
|
+ unsigned long quirks = id->driver_data;
|
|
|
|
|
|
node = dev_to_node(&pdev->dev);
|
|
|
if (node == NUMA_NO_NODE)
|
|
@@ -1978,8 +2000,10 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
if (result)
|
|
|
goto put_pci;
|
|
|
|
|
|
+ quirks |= check_dell_samsung_bug(pdev);
|
|
|
+
|
|
|
result = nvme_init_ctrl(&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops,
|
|
|
- id->driver_data);
|
|
|
+ quirks);
|
|
|
if (result)
|
|
|
goto release_pools;
|
|
|
|