Commit c9fdf7b4 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.19-2022-06-02' of git://git.infradead.org/nvme into for-5.19/drivers 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - set controller enable bit in a separate write (Niklas Cassel)
 - disable namespace identifiers for the MAXIO MAP1001 (me)
 - fix a comment typo (Julia Lawall)"

* tag 'nvme-5.19-2022-06-02' of git://git.infradead.org/nvme:
  nvmet: fix typo in comment
  nvme: set controller enable bit in a separate write
  nvme-pci: disable namespace identifiers for the MAXIO MAP1001
parents a1a2d8f0 cbf84dbf

drivers/nvme/host/core.c

+9 −1
Original line number Diff line number Diff line
@@ -2227,8 +2227,16 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) 
	ctrl->ctrl_config |= (NVME_CTRL_PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT;

	ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE;

	ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;

	ctrl->ctrl_config |= NVME_CC_ENABLE;

	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);

	if (ret)

		return ret;



	/* Flush write to device (required if transport is PCI) */

	ret = ctrl->ops->reg_read32(ctrl, NVME_REG_CC, &ctrl->ctrl_config);

	if (ret)

		return ret;



	ctrl->ctrl_config |= NVME_CC_ENABLE;

	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ctrl->ctrl_config);

	if (ret)

		return ret;

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3453,6 +3453,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(0x1e4B, 0x1001),   /* MAXIO MAP1001 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1e4B, 0x1002),   /* MAXIO MAP1002 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1e4B, 0x1202),   /* MAXIO MAP1202 */

drivers/nvme/target/passthru.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req) 
		id->sgls |= cpu_to_le32(1 << 20);



	/*

	 * When passsthru controller is setup using nvme-loop transport it will

	 * When passthru controller is setup using nvme-loop transport it will

	 * export the passthru ctrl subsysnqn (PCIe NVMe ctrl) and will fail in

	 * the nvme/host/core.c in the nvme_init_subsystem()->nvme_active_ctrl()

	 * code path with duplicate ctr subsynqn. In order to prevent that we