Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba36c21b authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by Jens Axboe
Browse files

nvme/host: Add missing blk_integrity tag_size + flags assignments 



While doing recent bring-up of nvme/host with target-core T10-PI,
I noticed /sys/block/nvme*/integrity/device_is_integrity_capable
was false, and /sys/block/nvme*/integrity/tag_size contained
a bogus value.

AFAICT outside of blk_integrity_compare() for DM + MD these
are informational values, but go ahead and add the missing
assignments for nvme/host to match what SCSI does within
sd_dif_config_host() for consistency's sake.

Cc: Keith Busch <keith.busch@intel.com>
Cc: Jay Freyensee <james.p.freyensee@intel.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 99466e70

drivers/nvme/host/core.c

+4 −0
Original line number Diff line number Diff line
@@ -729,10 +729,14 @@ static void nvme_init_integrity(struct nvme_ns *ns) 
	switch (ns->pi_type) {

	case NVME_NS_DPS_PI_TYPE3:

		integrity.profile = &t10_pi_type3_crc;

		integrity.tag_size = sizeof(u16) + sizeof(u32);

		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;

		break;

	case NVME_NS_DPS_PI_TYPE1:

	case NVME_NS_DPS_PI_TYPE2:

		integrity.profile = &t10_pi_type1_crc;

		integrity.tag_size = sizeof(u16);

		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;

		break;

	default:

		integrity.profile = NULL;