Commit 6b0de7d0 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.19-2022-07-07' of git://git.infradead.org/nvme into block-5.19 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - another bogus identifier quirk (Keith Busch)
 - use struct group in the tracer to avoid a gcc warning (Keith Busch)"

* tag 'nvme-5.19-2022-07-07' of git://git.infradead.org/nvme:
  nvme: use struct group for generic command dwords
  nvme-pci: phison e16 has bogus namespace ids
parents f3163d85 5c629dc9

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -3465,7 +3465,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x1987, 0x5012),	/* Phison E12 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1987, 0x5016),	/* Phison E16 */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |

				NVME_QUIRK_BOGUS_NID, },

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

		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

drivers/nvme/host/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ TRACE_EVENT(nvme_setup_cmd, 
		__entry->metadata = !!blk_integrity_rq(req);

		__entry->fctype = cmd->fabrics.fctype;

		__assign_disk_name(__entry->disk, req->q->disk);

		memcpy(__entry->cdw10, &cmd->common.cdw10,

		memcpy(__entry->cdw10, &cmd->common.cdws,

			sizeof(__entry->cdw10));

	    ),

	    TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%x, cmd=(%s %s)",

include/linux/nvme.h

+2 −0
Original line number Diff line number Diff line
@@ -906,12 +906,14 @@ struct nvme_common_command { 
	__le32			cdw2[2];

	__le64			metadata;

	union nvme_data_ptr	dptr;

	struct_group(cdws,

	__le32			cdw10;

	__le32			cdw11;

	__le32			cdw12;

	__le32			cdw13;

	__le32			cdw14;

	__le32			cdw15;

	);

};



struct nvme_rw_command {