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

Commit c5c2567f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

virtio_scsi: don't select CONFIG_BLK_DEV_INTEGRITY 



T10 PI is just another optional feature, LLDDs should work without
the infrastructure.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent d56dfb41

drivers/scsi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1743,7 +1743,6 @@ config SCSI_BFA_FC 
config SCSI_VIRTIO

	tristate "virtio-scsi support"

	depends on VIRTIO

	select BLK_DEV_INTEGRITY

	help

          This is the virtual HBA driver for virtio.  If the kernel will

          be used in a virtual machine, say Y or M.

drivers/scsi/virtio_scsi.c

+10 −1
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ static void virtio_scsi_init_hdr(struct virtio_device *vdev, 
	cmd->crn = 0;

}



#ifdef CONFIG_BLK_DEV_INTEGRITY

static void virtio_scsi_init_hdr_pi(struct virtio_device *vdev,

				    struct virtio_scsi_cmd_req_pi *cmd_pi,

				    struct scsi_cmnd *sc)
@@ -524,6 +525,7 @@ static void virtio_scsi_init_hdr_pi(struct virtio_device *vdev, 
						       blk_rq_sectors(rq) *

						       bi->tuple_size);

}

#endif



static int virtscsi_queuecommand(struct virtio_scsi *vscsi,

				 struct virtio_scsi_vq *req_vq,
@@ -546,11 +548,14 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, 


	BUG_ON(sc->cmd_len > VIRTIO_SCSI_CDB_SIZE);



#ifdef CONFIG_BLK_DEV_INTEGRITY

	if (virtio_has_feature(vscsi->vdev, VIRTIO_SCSI_F_T10_PI)) {

		virtio_scsi_init_hdr_pi(vscsi->vdev, &cmd->req.cmd_pi, sc);

		memcpy(cmd->req.cmd_pi.cdb, sc->cmnd, sc->cmd_len);

		req_size = sizeof(cmd->req.cmd_pi);

	} else {

	} else

#endif

	{

		virtio_scsi_init_hdr(vscsi->vdev, &cmd->req.cmd, sc);

		memcpy(cmd->req.cmd.cdb, sc->cmnd, sc->cmd_len);

		req_size = sizeof(cmd->req.cmd);
@@ -1002,6 +1007,7 @@ static int virtscsi_probe(struct virtio_device *vdev) 
	shost->max_cmd_len = VIRTIO_SCSI_CDB_SIZE;

	shost->nr_hw_queues = num_queues;



#ifdef CONFIG_BLK_DEV_INTEGRITY

	if (virtio_has_feature(vdev, VIRTIO_SCSI_F_T10_PI)) {

		host_prot = SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION |

			    SHOST_DIF_TYPE3_PROTECTION | SHOST_DIX_TYPE1_PROTECTION |
@@ -1010,6 +1016,7 @@ static int virtscsi_probe(struct virtio_device *vdev) 
		scsi_host_set_prot(shost, host_prot);

		scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);

	}

#endif



	err = scsi_add_host(shost, &vdev->dev);

	if (err)
@@ -1090,7 +1097,9 @@ static struct virtio_device_id id_table[] = { 
static unsigned int features[] = {

	VIRTIO_SCSI_F_HOTPLUG,

	VIRTIO_SCSI_F_CHANGE,

#ifdef CONFIG_BLK_DEV_INTEGRITY

	VIRTIO_SCSI_F_T10_PI,

#endif

};



static struct virtio_driver virtio_scsi_driver = {