Commit f6c69b7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b98b809c ae7bbc09

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1165,8 +1165,8 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, 
static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,

		unsigned int dword11, void *buffer, size_t buflen, u32 *result)

{

	union nvme_result res = { 0 };

	struct nvme_command c;

	union nvme_result res;

	int ret;



	memset(&c, 0, sizeof(c));

drivers/nvme/host/multipath.c

+1 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
	}



	INIT_WORK(&ctrl->ana_work, nvme_ana_work);

	kfree(ctrl->ana_log_buf);

	ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);

	if (!ctrl->ana_log_buf) {

		error = -ENOMEM;

drivers/nvme/host/pci.c

+14 −1
Original line number Diff line number Diff line
@@ -2747,6 +2747,18 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) 
		    (dmi_match(DMI_BOARD_NAME, "PRIME B350M-A") ||

		     dmi_match(DMI_BOARD_NAME, "PRIME Z370-A")))

			return NVME_QUIRK_NO_APST;

	} else if ((pdev->vendor == 0x144d && (pdev->device == 0xa801 ||

		    pdev->device == 0xa808 || pdev->device == 0xa809)) ||

		   (pdev->vendor == 0x1e0f && pdev->device == 0x0001)) {

		/*

		 * Forcing to use host managed nvme power settings for

		 * lowest idle power with quick resume latency on

		 * Samsung and Toshiba SSDs based on suspend behavior

		 * on Coffee Lake board for LENOVO C640

		 */

		if ((dmi_match(DMI_BOARD_VENDOR, "LENOVO")) &&

		     dmi_match(DMI_BOARD_NAME, "LNVNB161216"))

			return NVME_QUIRK_SIMPLE_SUSPEND;

	}



	return 0;
@@ -3109,7 +3121,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR |

CRA Git | Maintained and supported by SUSTech CRA and CCSE