Commit 7bc6e90d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.0-2022-09-29' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "A single NVMe pull request via Christoph with a few fixes that should
  go into the 6.0 release:

   - Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
     (Michael Kelley)

   - Disable Write Zeroes on Phison E3C/E4C (Tina Hsu)"

* tag 'block-6.0-2022-09-29' of git://git.kernel.dk/linux:
  nvme-pci: disable Write Zeroes on Phison E3C/E4C
  nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
parents a0debc4c 6c84501a

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -2162,14 +2162,14 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new, 


static int nvme_pr_clear(struct block_device *bdev, u64 key)

{

	u32 cdw10 = 1 | (key ? 1 << 3 : 0);

	u32 cdw10 = 1 | (key ? 0 : 1 << 3);



	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);

	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);

}



static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)

{

	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);

	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 0 : 1 << 3);



	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);

}

drivers/nvme/host/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -3470,6 +3470,10 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x1987, 0x5016),	/* Phison E16 */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |

				NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1987, 0x5019),  /* phison E19 */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1987, 0x5021),   /* Phison E21 */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1b4b, 0x1092),	/* Lexar 256 GB SSD */

		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },