aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Kuznetsov <vkuznets@redhat.com>2015-11-19 08:17:06 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2015-11-19 12:12:16 -0500
commita35bb4458e5e5c9dc19a0daa0629409285f3b25e (patch)
tree89a7b95f484abe44f3381d69ef8346eb9fedaeb7
parent757b22f9d56fb4e510782b29da752824daddf3c8 (diff)
scsi: report 'INQUIRY result too short' once per host
Some host adapters (e.g. Hyper-V storvsc) are known for not respecting the SPC-2/3/4 requirement for 'INQUIRY data (see table ...) shall contain at least 36 bytes'. As a result we get tons on 'scsi 0:7:1:1: scsi scan: INQUIRY result too short (5), using 36' messages on console. This can be problematic for slow consoles. Introduce short_inquiry flag in struct Scsi_Host to print the message once per host. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/scsi_scan.c9
-rw-r--r--include/scsi/scsi_host.h3
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index d01e423ef44b..403a63310fb1 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -702,9 +702,12 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
702 * strings. 702 * strings.
703 */ 703 */
704 if (sdev->inquiry_len < 36) { 704 if (sdev->inquiry_len < 36) {
705 sdev_printk(KERN_INFO, sdev, 705 if (!sdev->host->short_inquiry) {
706 "scsi scan: INQUIRY result too short (%d)," 706 shost_printk(KERN_INFO, sdev->host,
707 " using 36\n", sdev->inquiry_len); 707 "scsi scan: INQUIRY result too short (%d),"
708 " using 36\n", sdev->inquiry_len);
709 sdev->host->short_inquiry = 1;
710 }
708 sdev->inquiry_len = 36; 711 sdev->inquiry_len = 36;
709 } 712 }
710 713
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index e113c757d555..3a22da73d59a 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -673,6 +673,9 @@ struct Scsi_Host {
673 unsigned use_blk_mq:1; 673 unsigned use_blk_mq:1;
674 unsigned use_cmd_list:1; 674 unsigned use_cmd_list:1;
675 675
676 /* Host responded with short (<36 bytes) INQUIRY result */
677 unsigned short_inquiry:1;
678
676 /* 679 /*
677 * Optional work queue to be utilized by the transport 680 * Optional work queue to be utilized by the transport
678 */ 681 */