Commit 1878b736 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme into block-6.4 

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.4

 - More device quirks (Sagi, Hristo, Adrian, Daniel)
 - Controller delete race (Maurizo)
 - Multipath cleanup fix (Christoph)"

* tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme:
  nvme-pci: Add quirk for Teamgroup MP33 SSD
  nvme: do not let the user delete a ctrl before a complete initialization
  nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk
  nvme-pci: clamp max_hw_sectors based on DMA optimized limitation
  nvme-pci: add quirk for missing secondary temperature thresholds
  nvme-pci: add NVME_QUIRK_BOGUS_NID for HS-SSD-FUTURE 2048G
parents ac5902f8 06497281

drivers/nvme/host/core.c

+5 −1
Original line number Diff line number Diff line
@@ -3585,6 +3585,9 @@ static ssize_t nvme_sysfs_delete(struct device *dev, 
{

	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);



	if (!test_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags))

		return -EBUSY;



	if (device_remove_file_self(dev, attr))

		nvme_delete_ctrl_sync(ctrl);

	return count;
@@ -5045,7 +5048,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) 
	 * that were missed. We identify persistent discovery controllers by

	 * checking that they started once before, hence are reconnecting back.

	 */

	if (test_and_set_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags) &&

	if (test_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags) &&

	    nvme_discovery_ctrl(ctrl))

		nvme_change_uevent(ctrl, "NVME_EVENT=rediscover");
@@ -5056,6 +5059,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) 
	}



	nvme_change_uevent(ctrl, "NVME_EVENT=connected");

	set_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags);

}

EXPORT_SYMBOL_GPL(nvme_start_ctrl);

drivers/nvme/host/hwmon.c

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ static umode_t nvme_hwmon_is_visible(const void *_data, 
	case hwmon_temp_max:

	case hwmon_temp_min:

		if ((!channel && data->ctrl->wctemp) ||

		    (channel && data->log->temp_sensor[channel - 1])) {

		    (channel && data->log->temp_sensor[channel - 1] &&

		     !(data->ctrl->quirks &

		       NVME_QUIRK_NO_SECONDARY_TEMP_THRESH))) {

			if (data->ctrl->quirks &

			    NVME_QUIRK_NO_TEMP_THRESH_CHANGE)

				return 0444;

drivers/nvme/host/multipath.c

+0 −1
Original line number Diff line number Diff line
@@ -884,7 +884,6 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) 
{

	if (!head->disk)

		return;

	blk_mark_disk_dead(head->disk);

	/* make sure all pending bios are cleaned up */

	kblockd_schedule_work(&head->requeue_work);

	flush_work(&head->requeue_work);

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ enum nvme_quirks { 
	 * Reports garbage in the namespace identifiers (eui64, nguid, uuid).

	 */

	NVME_QUIRK_BOGUS_NID			= (1 << 18),



	/*

	 * No temperature thresholds for channels other than 0 (Composite).

	 */

	NVME_QUIRK_NO_SECONDARY_TEMP_THRESH	= (1 << 19),

};



/*

drivers/nvme/host/pci.c

+7 −1
Original line number Diff line number Diff line
@@ -2956,7 +2956,7 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct pci_dev *pdev, 
	 * over a single page.

	 */

	dev->ctrl.max_hw_sectors = min_t(u32,

		NVME_MAX_KB_SZ << 1, dma_max_mapping_size(&pdev->dev) >> 9);

		NVME_MAX_KB_SZ << 1, dma_opt_mapping_size(&pdev->dev) >> 9);

	dev->ctrl.max_segments = NVME_MAX_SEGS;



	/*
@@ -3402,6 +3402,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(0x2646, 0x2263),   /* KINGSTON A2000 NVMe SSD  */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(0x2646, 0x5013),   /* Kingston KC3000, Kingston FURY Renegade */

		.driver_data = NVME_QUIRK_NO_SECONDARY_TEMP_THRESH, },

	{ PCI_DEVICE(0x2646, 0x5018),   /* KINGSTON OM8SFP4xxxxP OS21012 NVMe SSD */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x2646, 0x5016),   /* KINGSTON OM3PGP4xxxxP OS21011 NVMe SSD */
@@ -3441,6 +3443,10 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x10ec, 0x5763), /* TEAMGROUP T-FORCE CARDEA ZERO Z330 SSD */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1e4b, 0x1602), /* HS-SSD-FUTURE 2048G  */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x10ec, 0x5765), /* TEAMGROUP MP33 2TB SSD */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),

		.driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),