From: Andrew Morton Breaks ydl-4.1 userspace tools (at least). Cc: Matthew Wilcox Cc: James Bottomley Signed-off-by: Andrew Morton --- drivers/block/cciss_scsi.c | 14 ++++--- drivers/scsi/fcal.c | 3 + drivers/scsi/g_NCR5380.c | 3 + drivers/scsi/megaraid.c | 4 +- drivers/scsi/scsi.c | 36 +++++-------------- drivers/scsi/scsi_proc.c | 4 +- drivers/scsi/scsi_scan.c | 66 ++++++++++++++++++++++++++++++----- include/scsi/scsi.h | 10 +++-- 8 files changed, 94 insertions(+), 46 deletions(-) diff -puN drivers/block/cciss_scsi.c~revert-scsi-improve-inquiry-printing drivers/block/cciss_scsi.c --- a/drivers/block/cciss_scsi.c~revert-scsi-improve-inquiry-printing +++ a/drivers/block/cciss_scsi.c @@ -251,6 +251,10 @@ scsi_cmd_stack_free(int ctlr) stk->pool = NULL; } +/* scsi_device_types comes from scsi.h */ +#define DEVICETYPE(n) (n<0 || n>MAX_SCSI_DEVICE_CODE) ? \ + "Unknown" : scsi_device_types[n] + #if 0 static int xmargin=8; static int amargin=60; @@ -385,7 +389,7 @@ cciss_scsi_add_entry(int ctlr, int hostn time anyway (the scsi layer's inquiries will show that info) */ if (hostno != -1) printk("cciss%d: %s device c%db%dt%dl%d added.\n", - ctlr, scsi_device_type(sd->devtype), hostno, + ctlr, DEVICETYPE(sd->devtype), hostno, sd->bus, sd->target, sd->lun); return 0; } @@ -403,7 +407,7 @@ cciss_scsi_remove_entry(int ctlr, int ho ccissscsi[ctlr].dev[i] = ccissscsi[ctlr].dev[i+1]; ccissscsi[ctlr].ndevices--; printk("cciss%d: %s device c%db%dt%dl%d removed.\n", - ctlr, scsi_device_type(sd.devtype), hostno, + ctlr, DEVICETYPE(sd.devtype), hostno, sd.bus, sd.target, sd.lun); } @@ -454,7 +458,7 @@ adjust_cciss_scsi_table(int ctlr, int ho if (found == 0) { /* device no longer present. */ changes++; /* printk("cciss%d: %s device c%db%dt%dl%d removed.\n", - ctlr, scsi_device_type(csd->devtype), hostno, + ctlr, DEVICETYPE(csd->devtype), hostno, csd->bus, csd->target, csd->lun); */ cciss_scsi_remove_entry(ctlr, hostno, i); /* note, i not incremented */ @@ -464,7 +468,7 @@ adjust_cciss_scsi_table(int ctlr, int ho printk("cciss%d: device c%db%dt%dl%d type changed " "(device type now %s).\n", ctlr, hostno, csd->bus, csd->target, csd->lun, - scsi_device_type(csd->devtype)); + DEVICETYPE(csd->devtype)); csd->devtype = sd[j].devtype; i++; /* so just move along. */ } else /* device is same as it ever was, */ @@ -1094,7 +1098,7 @@ cciss_update_non_disk_devices(int cntl_n if (ncurrent >= CCISS_MAX_SCSI_DEVS_PER_HBA) { printk(KERN_INFO "cciss%d: %s ignored, " "too many devices.\n", cntl_num, - scsi_device_type(devtype)); + DEVICETYPE(devtype)); break; } memcpy(¤tsd[ncurrent].scsi3addr[0], diff -puN drivers/scsi/fcal.c~revert-scsi-improve-inquiry-printing drivers/scsi/fcal.c --- a/drivers/scsi/fcal.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/fcal.c @@ -248,7 +248,8 @@ int fcal_proc_info (struct Scsi_Host *ho if (scd->id == target) { SPRINTF (" [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x] ", alpa, target, u1[0], u1[1], u2[0], u2[1]); - SPRINTF ("%s ", scsi_device_type(scd->type)); + SPRINTF ("%s ", (scd->type < MAX_SCSI_DEVICE_CODE) ? + scsi_device_types[(short) scd->type] : "Unknown device"); for (j = 0; (j < 8) && (scd->vendor[j] >= 0x20); j++) SPRINTF ("%c", scd->vendor[j]); diff -puN drivers/scsi/g_NCR5380.c~revert-scsi-improve-inquiry-printing drivers/scsi/g_NCR5380.c --- a/drivers/scsi/g_NCR5380.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/g_NCR5380.c @@ -811,6 +811,7 @@ static int generic_NCR5380_proc_info(str struct NCR5380_hostdata *hostdata; #ifdef NCR5380_STATS struct scsi_device *dev; + extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; #endif NCR5380_setup(scsi_ptr); @@ -850,7 +851,7 @@ static int generic_NCR5380_proc_info(str long tr = hostdata->time_read[dev->id] / HZ; long tw = hostdata->time_write[dev->id] / HZ; - PRINTP(" T:%d %s " ANDP dev->id ANDP scsi_device_type(dev->type)); + PRINTP(" T:%d %s " ANDP dev->id ANDP(dev->type < MAX_SCSI_DEVICE_CODE) ? scsi_device_types[(int) dev->type] : "Unknown"); for (i = 0; i < 8; i++) if (dev->vendor[i] >= 0x20) *(buffer + (len++)) = dev->vendor[i]; diff -puN drivers/scsi/megaraid.c~revert-scsi-improve-inquiry-printing drivers/scsi/megaraid.c --- a/drivers/scsi/megaraid.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/megaraid.c @@ -2822,7 +2822,9 @@ mega_print_inquiry(char *page, char *scs i = scsi_inq[0] & 0x1f; - len += sprintf(page+len, " Type: %s ", scsi_device_type(i)); + len += sprintf(page+len, " Type: %s ", + i < MAX_SCSI_DEVICE_CODE ? scsi_device_types[i] : + "Unknown "); len += sprintf(page+len, " ANSI SCSI revision: %02x", scsi_inq[2] & 0x07); diff -puN drivers/scsi/scsi.c~revert-scsi-improve-inquiry-printing drivers/scsi/scsi.c --- a/drivers/scsi/scsi.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/scsi.c @@ -96,40 +96,24 @@ unsigned int scsi_logging_level; EXPORT_SYMBOL(scsi_logging_level); #endif -static const char *const scsi_device_types[] = { - "Direct access ", - "Sequential access", +const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE] = { + "Direct-Access ", + "Sequential-Access", "Printer ", "Processor ", "WORM ", - "CD/DVD ", + "CD-ROM ", "Scanner ", - "Optical memory ", - "Media changer ", + "Optical Device ", + "Medium Changer ", "Communications ", - "ASC IT8 ", - "ASC IT8 ", + "Unknown ", + "Unknown ", "RAID ", "Enclosure ", - "Direct access RBC", - "Optical card ", - "Bridge controller", - "Object storage ", - "Automation/Drive ", + "Direct-Access-RBC", }; - -const char * scsi_device_type(unsigned type) -{ - if (type == 0x1e) - return "Well-known LUN "; - if (type == 0x1f) - return "No Device "; - if (type > ARRAY_SIZE(scsi_device_types)) - return "Unknown "; - return scsi_device_types[type]; -} - -EXPORT_SYMBOL(scsi_device_type); +EXPORT_SYMBOL(scsi_device_types); struct scsi_host_cmd_pool { kmem_cache_t *slab; diff -puN drivers/scsi/scsi_proc.c~revert-scsi-improve-inquiry-printing drivers/scsi/scsi_proc.c --- a/drivers/scsi/scsi_proc.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/scsi_proc.c @@ -178,7 +178,9 @@ static int proc_print_scsidevice(struct seq_printf(s, "\n"); - seq_printf(s, " Type: %s ", scsi_device_type(sdev->type)); + seq_printf(s, " Type: %s ", + sdev->type < MAX_SCSI_DEVICE_CODE ? + scsi_device_types[(int) sdev->type] : "Unknown "); seq_printf(s, " ANSI" " SCSI revision: %02x", (sdev->scsi_level - 1) ? sdev->scsi_level - 1 : 1); diff -puN drivers/scsi/scsi_scan.c~revert-scsi-improve-inquiry-printing drivers/scsi/scsi_scan.c --- a/drivers/scsi/scsi_scan.c~revert-scsi-improve-inquiry-printing +++ a/drivers/scsi/scsi_scan.c @@ -134,6 +134,59 @@ static void scsi_unlock_floptical(struct } /** + * print_inquiry - printk the inquiry information + * @inq_result: printk this SCSI INQUIRY + * + * Description: + * printk the vendor, model, and other information found in the + * INQUIRY data in @inq_result. + * + * Notes: + * Remove this, and replace with a hotplug event that logs any + * relevant information. + **/ +static void print_inquiry(unsigned char *inq_result) +{ + int i; + + printk(KERN_NOTICE " Vendor: "); + for (i = 8; i < 16; i++) + if (inq_result[i] >= 0x20 && i < inq_result[4] + 5) + printk("%c", inq_result[i]); + else + printk(" "); + + printk(" Model: "); + for (i = 16; i < 32; i++) + if (inq_result[i] >= 0x20 && i < inq_result[4] + 5) + printk("%c", inq_result[i]); + else + printk(" "); + + printk(" Rev: "); + for (i = 32; i < 36; i++) + if (inq_result[i] >= 0x20 && i < inq_result[4] + 5) + printk("%c", inq_result[i]); + else + printk(" "); + + printk("\n"); + + i = inq_result[0] & 0x1f; + + printk(KERN_NOTICE " Type: %s ", + i < + MAX_SCSI_DEVICE_CODE ? scsi_device_types[i] : + "Unknown "); + printk(" ANSI SCSI revision: %02x", + inq_result[2] & 0x07); + if ((inq_result[2] & 0x07) == 1 && (inq_result[3] & 0x0f) == 1) + printk(" CCS\n"); + else + printk("\n"); +} + +/** * scsi_alloc_sdev - allocate and setup a scsi_Device * * Description: @@ -600,8 +653,9 @@ static int scsi_add_lun(struct scsi_devi if (*bflags & BLIST_ISROM) { /* * It would be better to modify sdev->type, and set - * sdev->removable; this can now be done since - * print_inquiry has gone away. + * sdev->removable, but then the print_inquiry() output + * would not show TYPE_ROM; if print_inquiry() is removed + * the issue goes away. */ inq_result[0] = TYPE_ROM; inq_result[1] |= 0x80; /* removable */ @@ -630,6 +684,8 @@ static int scsi_add_lun(struct scsi_devi printk(KERN_INFO "scsi: unknown device type %d\n", sdev->type); } + print_inquiry(inq_result); + /* * For a peripheral qualifier (PQ) value of 1 (001b), the SCSI * spec says: The device server is capable of supporting the @@ -659,12 +715,6 @@ static int scsi_add_lun(struct scsi_devi if (inq_result[7] & 0x10) sdev->sdtr = 1; - sdev_printk(KERN_NOTICE, sdev, "%s %.8s %.16s %.4s PQ: %d " - "ANSI: %d%s\n", scsi_device_type(sdev->type), - sdev->vendor, sdev->model, sdev->rev, - sdev->inq_periph_qual, inq_result[2] & 0x07, - (inq_result[3] & 0x0f) == 1 ? " CCS" : ""); - /* * End sysfs code. */ diff -puN include/scsi/scsi.h~revert-scsi-improve-inquiry-printing include/scsi/scsi.h --- a/include/scsi/scsi.h~revert-scsi-improve-inquiry-printing +++ a/include/scsi/scsi.h @@ -25,6 +25,13 @@ extern const unsigned char scsi_command_ #define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7] /* + * SCSI device types + */ + +#define MAX_SCSI_DEVICE_CODE 15 +extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; + +/* * Special value for scanning to specify scanning or rescanning of all * possible channels, (target) ids, or luns on a given shost. */ @@ -218,9 +225,6 @@ static inline int scsi_status_is_good(in #define TYPE_RBC 0x0e #define TYPE_NO_LUN 0x7f -/* Returns a human-readable name for the device */ -extern const char * scsi_device_type(unsigned type); - /* * standard mode-select header prepended to all mode-select commands */ _