Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-5.19-2022-07-08' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"NVMe pull request with another id quirk addition, and a tracing fix"
* tag 'block-5.19-2022-07-08' of git://git.kernel.dk/linux-block:
nvme: use struct group for generic command dwords
nvme-pci: phison e16 has bogus namespace ids
+5
-2
+2
-1
drivers/nvme/host/pci.c
+2
-1
drivers/nvme/host/pci.c
···
3465
3465
{ PCI_DEVICE(0x1987, 0x5012), /* Phison E12 */
3466
3466
.driver_data = NVME_QUIRK_BOGUS_NID, },
3467
3467
{ PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */
3468
-
.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
3468
+
.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |
3469
+
NVME_QUIRK_BOGUS_NID, },
3469
3470
{ PCI_DEVICE(0x1b4b, 0x1092), /* Lexar 256 GB SSD */
3470
3471
.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |
3471
3472
NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+1
-1
drivers/nvme/host/trace.h
+1
-1
drivers/nvme/host/trace.h
···
69
69
__entry->metadata = !!blk_integrity_rq(req);
70
70
__entry->fctype = cmd->fabrics.fctype;
71
71
__assign_disk_name(__entry->disk, req->q->disk);
72
-
memcpy(__entry->cdw10, &cmd->common.cdw10,
72
+
memcpy(__entry->cdw10, &cmd->common.cdws,
73
73
sizeof(__entry->cdw10));
74
74
),
75
75
TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%x, cmd=(%s %s)",
+2
include/linux/nvme.h
+2
include/linux/nvme.h
···
906
906
__le32 cdw2[2];
907
907
__le64 metadata;
908
908
union nvme_data_ptr dptr;
909
+
struct_group(cdws,
909
910
__le32 cdw10;
910
911
__le32 cdw11;
911
912
__le32 cdw12;
912
913
__le32 cdw13;
913
914
__le32 cdw14;
914
915
__le32 cdw15;
916
+
);
915
917
};
916
918
917
919
struct nvme_rw_command {