leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes

Browse Source
This commit is contained in:
James Bottomley 2017-03-12 09:02:56 -07:00
commit a11be42a27
2 changed files with 18 additions and 10 deletions
drivers/scsi
lpfc
lpfc_init.c
storvsc_drv.c

1
drivers/scsi/lpfc/lpfc_init.c
View File

@ -12059,6 +12059,7 @@ static struct pci_driver lpfc_driver = {
.id_table = lpfc_id_table, .id_table = lpfc_id_table,
.probe = lpfc_pci_probe_one, .probe = lpfc_pci_probe_one,
.remove = lpfc_pci_remove_one, .remove = lpfc_pci_remove_one,
.shutdown = lpfc_pci_remove_one,
.suspend = lpfc_pci_suspend_one, .suspend = lpfc_pci_suspend_one,
.resume = lpfc_pci_resume_one, .resume = lpfc_pci_resume_one,
.err_handler = &lpfc_err_handler, .err_handler = &lpfc_err_handler,

27
drivers/scsi/storvsc_drv.c
View File

@ -400,8 +400,6 @@ MODULE_PARM_DESC(storvsc_vcpus_per_sub_channel, "Ratio of VCPUs to subchannels")
*/ */
static int storvsc_timeout = 180; static int storvsc_timeout = 180;
static int msft_blist_flags = BLIST_TRY_VPD_PAGES;
#if IS_ENABLED(CONFIG_SCSI_FC_ATTRS) #if IS_ENABLED(CONFIG_SCSI_FC_ATTRS)
static struct scsi_transport_template *fc_transport_template; static struct scsi_transport_template *fc_transport_template;
#endif #endif
@ -1383,6 +1381,22 @@ static int storvsc_do_io(struct hv_device *device,
return ret; return ret;
} }
static int storvsc_device_alloc(struct scsi_device *sdevice)
{
/*
* Set blist flag to permit the reading of the VPD pages even when
* the target may claim SPC-2 compliance. MSFT targets currently
* claim SPC-2 compliance while they implement post SPC-2 features.
* With this flag we can correctly handle WRITE_SAME_16 issues.
*
* Hypervisor reports SCSI_UNKNOWN type for DVD ROM device but
* still supports REPORT LUN.
*/
sdevice->sdev_bflags = BLIST_REPORTLUN2 | BLIST_TRY_VPD_PAGES;
return 0;
}
static int storvsc_device_configure(struct scsi_device *sdevice) static int storvsc_device_configure(struct scsi_device *sdevice)
{ {
@ -1395,14 +1409,6 @@ static int storvsc_device_configure(struct scsi_device *sdevice)
sdevice->no_write_same = 1; sdevice->no_write_same = 1;
/*
* Add blist flags to permit the reading of the VPD pages even when
* the target may claim SPC-2 compliance. MSFT targets currently
* claim SPC-2 compliance while they implement post SPC-2 features.
* With this patch we can correctly handle WRITE_SAME_16 issues.
*/
sdevice->sdev_bflags |= msft_blist_flags;
/* /*
* If the host is WIN8 or WIN8 R2, claim conformance to SPC-3 * If the host is WIN8 or WIN8 R2, claim conformance to SPC-3
* if the device is a MSFT virtual device. If the host is * if the device is a MSFT virtual device. If the host is
@ -1661,6 +1667,7 @@ static struct scsi_host_template scsi_driver = {
.eh_host_reset_handler = storvsc_host_reset_handler, .eh_host_reset_handler = storvsc_host_reset_handler,
.proc_name = "storvsc_host", .proc_name = "storvsc_host",
.eh_timed_out = storvsc_eh_timed_out, .eh_timed_out = storvsc_eh_timed_out,
.slave_alloc = storvsc_device_alloc,
.slave_configure = storvsc_device_configure, .slave_configure = storvsc_device_configure,
.cmd_per_lun = 255, .cmd_per_lun = 255,
.this_id = -1, .this_id = -1,