Jeff Garzik wrote:
> Douglas Gilbert wrote:
>
>> Changelog:
>> - make existing libata VPD device identification page (0x83)
>> supply the ATA serial number in the libata "vendor
>> specific" designator (from Chris Paulson-Ellis)
>> - add a "t10 vendor id based" designator as defined in
>> SAT rev 07a (section 10.3.4.2.3) that supplies ATA
>> model and serial numbers
>> - make the libata VPD page 0x83 more extensible (for
>> adding more designators in the future).
>>
>> Signed-off-by: Douglas Gilbert <dougg@xxxxxxxxxx>
>
>
>> ------------------------------------------------------------------------
>>
>> --- linux/drivers/scsi/libata-scsi.c 2006-01-04 08:50:42.000000000
>> +1000
>> +++ linux/drivers/scsi/libata-scsi.c2615vpd 2006-01-06
>> 20:16:25.000000000 +1000
>> @@ -1532,16 +1532,16 @@
>> return 0;
>> }
>>
>> -static const char *inq_83_str = "Linux ATA-SCSI simulator";
>> -
>> /**
>> * ata_scsiop_inq_83 - Simulate INQUIRY EVPD page 83, device identity
>> * @args: device IDENTIFY data / SCSI command of interest.
>> * @rbuf: Response buffer, to which simulated SCSI cmd output is
>> sent.
>> * @buflen: Response buffer length.
>> *
>> - * Returns device identification. Currently hardcoded to
>> - * return "Linux ATA-SCSI simulator".
>> + * Yields two logocal unit device identification designators:
>> + * - vendor specific ASCII containing the ATA serial number
>> + * - SAT defined "t10 vendor id based" containing ASCII vendor
>> + * name ("ATA "), model and serial numbers.
>> *
>> * LOCKING:
>> * spin_lock_irqsave(host_set lock)
>> @@ -1550,16 +1550,39 @@
>> unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
>> unsigned int buflen)
>> {
>> + int num;
>> + const int sat_model_serial_desc_len = 68;
>> + const int ata_model_byte_len = 40;
>> +
>> rbuf[1] = 0x83; /* this page code */
>> - rbuf[3] = 4 + strlen(inq_83_str); /* page len */
>> + num = 4;
>>
>> - /* our one and only identification descriptor (vendor-specific) */
>> - if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) {
>> - rbuf[4 + 0] = 2; /* code set: ASCII */
>> - rbuf[4 + 3] = strlen(inq_83_str);
>> - memcpy(rbuf + 4 + 4, inq_83_str, strlen(inq_83_str));
>> + if (buflen > (ATA_SERNO_LEN + num + 3)) {
>> + /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */
>> + rbuf[num + 0] = 2;
>> + rbuf[num + 3] = ATA_SERNO_LEN;
>> + num += 4;
>> + ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
>> + ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
>> + num += ATA_SERNO_LEN;
>> }
>> -
>> + if (buflen > (sat_model_serial_desc_len + num + 3)) {
>> + /* SAT defined lu model and serial numbers descriptor */
>> + /* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */
>> + rbuf[num + 0] = 2;
>> + rbuf[num + 1] = 1;
>> + rbuf[num + 3] = sat_model_serial_desc_len;
>> + num += 4;
>> + strncpy(rbuf + num, "ATA ", 8);
>> + num += 8;
>> + ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
>> + ATA_ID_PROD_OFS, ata_model_byte_len);
>> + num += ata_model_byte_len;
>> + ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
>> + ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
>> + num += ATA_SERNO_LEN;
>> + }
>> + rbuf[3] = num - 4; /* page len (assume less than 256 bytes) */
>> return 0;
>
>
>
> This removes the identifier that has existed since libata was created,
> which could break something.
Jeff,
That patch was sent on 6th January 2006. That is a long
time to respond.
The existing "Linux ATA-SCSI simulator" has assoc=lu and
designator_type=vendor. That claims to be the device identifier
for the SATA disk (i.e. the logical unit) in vendor format.
That is just plain wrong. Chris Paulson-Ellis was correct to
replace it with identification information related to the SATA
disk. I then went a step further and added the SAT defined
way of doing a similar thing. In the future when SATA disks
start supporting a naa-5 world wide unique identifier (word 108
to 111 in a IDENTIFY DEVICE response) then a third designator
can be added (assoc=lu designator_type=naa).
> At the very least, update the existing code to indicate assoc=port, and
> then append the other descriptor data you wish to add after that.
So change it (i.e. assoc=lu -> assoc=port) and keep the
"Linux ATA-SCSI simulator" string for (partial) backward
compatibility. Hmmmm.
A SAT layer identifiers itself generically with "ATA "
in the vendor string. It could also use a version descriptor
in the standard INQUIRY response to identify which level
of SAT it supported. As for identifying that this was
the linux libata implementation of SAT, I'm not sure where
that should go. VPD page 0x83 for device identification
doesn't seem appropriate. If a linux box was being used
as a FC to SATA bridge then the bridge should be putting
FC related stuff in assoc=port and assoc=device while
keeping what libata put in assoc=lu.
Doug Gilbert
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
