* libata SCSI page 0x83 query
@ 2005-12-23 0:27 Chris Paulson-Ellis
2006-03-06 20:12 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Chris Paulson-Ellis @ 2005-12-23 0:27 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide
Hi,
I have a problem with udev persistent device naming for SATA drives that
is caused by the libata implementation of the page 0x83 SCSI device
identifier query. See this thead from hotplug-devel:
http://marc.theaimsgroup.com/?t=113518947900002&r=1&w=2
I can work around the problem using /etc/scsi_id.config or udev rules
(see the thread), but here is a patch to fix the problem at source. What
do you think?
Regards,
Chris.
--- drivers/scsi/libata-scsi.c.orig 2005-12-22 23:23:55.000000000 +0000
+++ drivers/scsi/libata-scsi.c 2005-12-22 23:56:14.000000000 +0000
@@ -1532,16 +1532,13 @@
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".
+ * Returns ATA device serial number (as for page 80).
*
* LOCKING:
* spin_lock_irqsave(host_set lock)
@@ -1551,13 +1548,14 @@
unsigned int buflen)
{
rbuf[1] = 0x83; /* this page code */
- rbuf[3] = 4 + strlen(inq_83_str); /* page len */
+ rbuf[3] = 4 + ATA_SERNO_LEN; /* page len */
/* our one and only identification descriptor (vendor-specific) */
- if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) {
+ if (buflen > (ATA_SERNO_LEN + 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));
+ rbuf[4 + 3] = ATA_SERNO_LEN;
+ ata_dev_id_string(args->id, (unsigned char *) rbuf + 4 + 4,
+ ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
}
return 0;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: libata SCSI page 0x83 query 2005-12-23 0:27 libata SCSI page 0x83 query Chris Paulson-Ellis @ 2006-03-06 20:12 ` Jeff Garzik 2006-03-06 23:29 ` Douglas Gilbert 0 siblings, 1 reply; 5+ messages in thread From: Jeff Garzik @ 2006-03-06 20:12 UTC (permalink / raw) To: Chris Paulson-Ellis; +Cc: linux-ide, Douglas Gilbert, SCSI Mailing List Chris Paulson-Ellis wrote: > Hi, > > I have a problem with udev persistent device naming for SATA drives that > is caused by the libata implementation of the page 0x83 SCSI device > identifier query. See this thead from hotplug-devel: > > http://marc.theaimsgroup.com/?t=113518947900002&r=1&w=2 > > I can work around the problem using /etc/scsi_id.config or udev rules > (see the thread), but here is a patch to fix the problem at source. What > do you think? > > Regards, > Chris. > > --- drivers/scsi/libata-scsi.c.orig 2005-12-22 23:23:55.000000000 +0000 > +++ drivers/scsi/libata-scsi.c 2005-12-22 23:56:14.000000000 +0000 > @@ -1532,16 +1532,13 @@ > 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". > + * Returns ATA device serial number (as for page 80). > * > * LOCKING: > * spin_lock_irqsave(host_set lock) > @@ -1551,13 +1548,14 @@ > unsigned int buflen) > { > rbuf[1] = 0x83; /* this page code */ > - rbuf[3] = 4 + strlen(inq_83_str); /* page len */ > + rbuf[3] = 4 + ATA_SERNO_LEN; /* page len */ > > /* our one and only identification descriptor (vendor-specific) */ > - if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) { > + if (buflen > (ATA_SERNO_LEN + 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)); > + rbuf[4 + 3] = ATA_SERNO_LEN; > + ata_dev_id_string(args->id, (unsigned char *) rbuf + 4 + 4, > + ATA_ID_SERNO_OFS, ATA_SERNO_LEN); Douglas Gilbert has an improved patch along these lines... Jeff ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: libata SCSI page 0x83 query 2006-03-06 20:12 ` Jeff Garzik @ 2006-03-06 23:29 ` Douglas Gilbert 2006-03-06 23:40 ` Douglas Gilbert 0 siblings, 1 reply; 5+ messages in thread From: Douglas Gilbert @ 2006-03-06 23:29 UTC (permalink / raw) To: Jeff Garzik; +Cc: Chris Paulson-Ellis, linux-ide, SCSI Mailing List [-- Attachment #1: Type: text/plain, Size: 2961 bytes --] Jeff Garzik wrote: > Chris Paulson-Ellis wrote: > >> Hi, >> >> I have a problem with udev persistent device naming for SATA drives >> that is caused by the libata implementation of the page 0x83 SCSI >> device identifier query. See this thead from hotplug-devel: >> >> http://marc.theaimsgroup.com/?t=113518947900002&r=1&w=2 >> >> I can work around the problem using /etc/scsi_id.config or udev rules >> (see the thread), but here is a patch to fix the problem at source. >> What do you think? >> >> Regards, >> Chris. >> >> --- drivers/scsi/libata-scsi.c.orig 2005-12-22 23:23:55.000000000 >> +0000 >> +++ drivers/scsi/libata-scsi.c 2005-12-22 23:56:14.000000000 +0000 >> @@ -1532,16 +1532,13 @@ >> 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". >> + * Returns ATA device serial number (as for page 80). >> * >> * LOCKING: >> * spin_lock_irqsave(host_set lock) >> @@ -1551,13 +1548,14 @@ >> unsigned int buflen) >> { >> rbuf[1] = 0x83; /* this page code */ >> - rbuf[3] = 4 + strlen(inq_83_str); /* page len */ >> + rbuf[3] = 4 + ATA_SERNO_LEN; /* page len */ >> >> /* our one and only identification descriptor (vendor-specific) */ >> - if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) { >> + if (buflen > (ATA_SERNO_LEN + 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)); >> + rbuf[4 + 3] = ATA_SERNO_LEN; >> + ata_dev_id_string(args->id, (unsigned char *) rbuf + 4 >> + 4, >> + ATA_ID_SERNO_OFS, ATA_SERNO_LEN); > > > Douglas Gilbert has an improved patch along these lines... I assume that is a prompt to roll another version of that VPD patch, this time against lk 2.6.16-rc5 as my git tree is unavailable. 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 08 (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). - rename EVPD to VPD in various places. Enable Vital Product Data (EVPD) is a bit in the INQUIRY cdb. Signed-off-by: Douglas Gilbert <dougg@torque.net> [-- Attachment #2: libata_vpd83_2616rc5.diff --] [-- Type: text/x-patch, Size: 3974 bytes --] --- linux/drivers/scsi/libata-scsi.c 2006-02-27 09:46:11.000000000 -0500 +++ linux/drivers/scsi/libata-scsi.c2616rc5vpd 2006-03-06 17:52:40.000000000 -0500 @@ -1445,7 +1445,7 @@ * @buflen: Response buffer length. * * Returns standard device identification data associated - * with non-EVPD INQUIRY command output. + * with non-VPD INQUIRY command output. * * LOCKING: * spin_lock_irqsave(host_set lock) @@ -1496,12 +1496,12 @@ } /** - * ata_scsiop_inq_00 - Simulate INQUIRY EVPD page 0, list of pages + * ata_scsiop_inq_00 - Simulate INQUIRY VPD page 0, list of pages * @args: device IDENTIFY data / SCSI command of interest. * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. * @buflen: Response buffer length. * - * Returns list of inquiry EVPD pages available. + * Returns list of inquiry VPD pages available. * * LOCKING: * spin_lock_irqsave(host_set lock) @@ -1515,7 +1515,7 @@ 0x80, /* page 0x80, unit serial no page */ 0x83 /* page 0x83, device ident page */ }; - rbuf[3] = sizeof(pages); /* number of supported EVPD pages */ + rbuf[3] = sizeof(pages); /* number of supported VPD pages */ if (buflen > 6) memcpy(rbuf + 4, pages, sizeof(pages)); @@ -1524,7 +1524,7 @@ } /** - * ata_scsiop_inq_80 - Simulate INQUIRY EVPD page 80, device serial number + * ata_scsiop_inq_80 - Simulate INQUIRY VPD page 80, device serial number * @args: device IDENTIFY data / SCSI command of interest. * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. * @buflen: Response buffer length. @@ -1553,16 +1553,18 @@ return 0; } -static const char * const inq_83_str = "Linux ATA-SCSI simulator"; - /** - * ata_scsiop_inq_83 - Simulate INQUIRY EVPD page 83, device identity + * ata_scsiop_inq_83 - Simulate INQUIRY VPD 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 logical 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) @@ -1571,16 +1573,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; } ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: libata SCSI page 0x83 query 2006-03-06 23:29 ` Douglas Gilbert @ 2006-03-06 23:40 ` Douglas Gilbert 2006-03-22 1:38 ` Jeff Garzik 0 siblings, 1 reply; 5+ messages in thread From: Douglas Gilbert @ 2006-03-06 23:40 UTC (permalink / raw) To: Jeff Garzik; +Cc: Chris Paulson-Ellis, linux-ide, SCSI Mailing List [-- Attachment #1: Type: text/plain, Size: 3085 bytes --] Douglas Gilbert wrote: > Jeff Garzik wrote: > >>Chris Paulson-Ellis wrote: >> >> >>>Hi, >>> >>>I have a problem with udev persistent device naming for SATA drives >>>that is caused by the libata implementation of the page 0x83 SCSI >>>device identifier query. See this thead from hotplug-devel: >>> >>>http://marc.theaimsgroup.com/?t=113518947900002&r=1&w=2 >>> >>>I can work around the problem using /etc/scsi_id.config or udev rules >>>(see the thread), but here is a patch to fix the problem at source. >>>What do you think? >>> >>>Regards, >>>Chris. >>> >>>--- drivers/scsi/libata-scsi.c.orig 2005-12-22 23:23:55.000000000 >>>+0000 >>>+++ drivers/scsi/libata-scsi.c 2005-12-22 23:56:14.000000000 +0000 >>>@@ -1532,16 +1532,13 @@ >>> 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". >>>+ * Returns ATA device serial number (as for page 80). >>> * >>> * LOCKING: >>> * spin_lock_irqsave(host_set lock) >>>@@ -1551,13 +1548,14 @@ >>> unsigned int buflen) >>>{ >>> rbuf[1] = 0x83; /* this page code */ >>>- rbuf[3] = 4 + strlen(inq_83_str); /* page len */ >>>+ rbuf[3] = 4 + ATA_SERNO_LEN; /* page len */ >>> >>> /* our one and only identification descriptor (vendor-specific) */ >>>- if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) { >>>+ if (buflen > (ATA_SERNO_LEN + 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)); >>>+ rbuf[4 + 3] = ATA_SERNO_LEN; >>>+ ata_dev_id_string(args->id, (unsigned char *) rbuf + 4 >>>+ 4, >>>+ ATA_ID_SERNO_OFS, ATA_SERNO_LEN); >> >> >>Douglas Gilbert has an improved patch along these lines... Oops, a minor documentation malfunction with that patch. Here is a second attempt ... I assume that is a prompt to roll another version of that VPD patch, this time against lk 2.6.16-rc5 as my git tree is unavailable. 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 08 (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). - rename EVPD to VPD in various places. Enable Vital Product Data (EVPD) is a bit in the INQUIRY cdb. Signed-off-by: Douglas Gilbert <dougg@torque.net> [-- Attachment #2: libata_vpd83_2616rc5_2.diff --] [-- Type: text/x-patch, Size: 3975 bytes --] --- linux/drivers/scsi/libata-scsi.c 2006-02-27 09:46:11.000000000 -0500 +++ linux/drivers/scsi/libata-scsi.c2616rc5vpd2 2006-03-06 18:32:28.000000000 -0500 @@ -1445,7 +1445,7 @@ * @buflen: Response buffer length. * * Returns standard device identification data associated - * with non-EVPD INQUIRY command output. + * with non-VPD INQUIRY command output. * * LOCKING: * spin_lock_irqsave(host_set lock) @@ -1496,12 +1496,12 @@ } /** - * ata_scsiop_inq_00 - Simulate INQUIRY EVPD page 0, list of pages + * ata_scsiop_inq_00 - Simulate INQUIRY VPD page 0, list of pages * @args: device IDENTIFY data / SCSI command of interest. * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. * @buflen: Response buffer length. * - * Returns list of inquiry EVPD pages available. + * Returns list of inquiry VPD pages available. * * LOCKING: * spin_lock_irqsave(host_set lock) @@ -1515,7 +1515,7 @@ 0x80, /* page 0x80, unit serial no page */ 0x83 /* page 0x83, device ident page */ }; - rbuf[3] = sizeof(pages); /* number of supported EVPD pages */ + rbuf[3] = sizeof(pages); /* number of supported VPD pages */ if (buflen > 6) memcpy(rbuf + 4, pages, sizeof(pages)); @@ -1524,7 +1524,7 @@ } /** - * ata_scsiop_inq_80 - Simulate INQUIRY EVPD page 80, device serial number + * ata_scsiop_inq_80 - Simulate INQUIRY VPD page 80, device serial number * @args: device IDENTIFY data / SCSI command of interest. * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. * @buflen: Response buffer length. @@ -1553,16 +1553,16 @@ return 0; } -static const char * const inq_83_str = "Linux ATA-SCSI simulator"; - /** - * ata_scsiop_inq_83 - Simulate INQUIRY EVPD page 83, device identity + * ata_scsiop_inq_83 - Simulate INQUIRY VPD 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 logical 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) @@ -1571,16 +1571,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; } ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: libata SCSI page 0x83 query 2006-03-06 23:40 ` Douglas Gilbert @ 2006-03-22 1:38 ` Jeff Garzik 0 siblings, 0 replies; 5+ messages in thread From: Jeff Garzik @ 2006-03-22 1:38 UTC (permalink / raw) To: dougg; +Cc: Chris Paulson-Ellis, linux-ide, SCSI Mailing List Douglas Gilbert wrote: > Douglas Gilbert wrote: > >>Jeff Garzik wrote: >> >> >>>Chris Paulson-Ellis wrote: >>> >>> >>> >>>>Hi, >>>> >>>>I have a problem with udev persistent device naming for SATA drives >>>>that is caused by the libata implementation of the page 0x83 SCSI >>>>device identifier query. See this thead from hotplug-devel: >>>> >>>>http://marc.theaimsgroup.com/?t=113518947900002&r=1&w=2 >>>> >>>>I can work around the problem using /etc/scsi_id.config or udev rules >>>>(see the thread), but here is a patch to fix the problem at source. >>>>What do you think? >>>> >>>>Regards, >>>>Chris. >>>> >>>>--- drivers/scsi/libata-scsi.c.orig 2005-12-22 23:23:55.000000000 >>>>+0000 >>>>+++ drivers/scsi/libata-scsi.c 2005-12-22 23:56:14.000000000 +0000 >>>>@@ -1532,16 +1532,13 @@ >>>> 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". >>>>+ * Returns ATA device serial number (as for page 80). >>>>* >>>>* LOCKING: >>>>* spin_lock_irqsave(host_set lock) >>>>@@ -1551,13 +1548,14 @@ >>>> unsigned int buflen) >>>>{ >>>> rbuf[1] = 0x83; /* this page code */ >>>>- rbuf[3] = 4 + strlen(inq_83_str); /* page len */ >>>>+ rbuf[3] = 4 + ATA_SERNO_LEN; /* page len */ >>>> >>>> /* our one and only identification descriptor (vendor-specific) */ >>>>- if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) { >>>>+ if (buflen > (ATA_SERNO_LEN + 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)); >>>>+ rbuf[4 + 3] = ATA_SERNO_LEN; >>>>+ ata_dev_id_string(args->id, (unsigned char *) rbuf + 4 >>>>+ 4, >>>>+ ATA_ID_SERNO_OFS, ATA_SERNO_LEN); >>> >>> >>>Douglas Gilbert has an improved patch along these lines... > > > Oops, a minor documentation malfunction with that patch. > Here is a second attempt ... > > I assume that is a prompt to roll another version > of that VPD patch, this time against lk 2.6.16-rc5 > as my git tree is unavailable. > > 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 08 (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). > - rename EVPD to VPD in various places. Enable Vital > Product Data (EVPD) is a bit in the INQUIRY cdb. > > Signed-off-by: Douglas Gilbert <dougg@torque.net> after further thought and a spec consult... applied. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-03-22 1:38 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2005-12-23 0:27 libata SCSI page 0x83 query Chris Paulson-Ellis 2006-03-06 20:12 ` Jeff Garzik 2006-03-06 23:29 ` Douglas Gilbert 2006-03-06 23:40 ` Douglas Gilbert 2006-03-22 1:38 ` Jeff Garzik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).