Author: mav
Date: Mon Mar 1 19:36:19 2010
New Revision: 204531
URL: http://svn.freebsd.org/changeset/base/204531
Log:
MFC r204354:
Make PUIS detection more strict. Previous implementation caused false
positives on VMWare's virtual CD-ROMs.
Modified:
stable/8/sys/cam/ata/ata_xpt.c
stable/8/sys/sys/ata.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/cam/ata/ata_xpt.c
==============================================================================
--- stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:32:34 2010
(r204530)
+++ stable/8/sys/cam/ata/ata_xpt.c Mon Mar 1 19:36:19 2010
(r204531)
@@ -788,11 +788,10 @@ noerror:
ata_btrim(ident_buf->serial, sizeof(ident_buf->serial));
ata_bpack(ident_buf->serial, ident_buf->serial,
sizeof(ident_buf->serial));
/* Device may need spin-up before IDENTIFY become valid. */
- if ((ident_buf->config & ATA_RESP_INCOMPLETE) ||
- ((ident_buf->support.command2 & ATA_SUPPORT_STANDBY) &&
- (ident_buf->enabled.command2 & ATA_SUPPORT_STANDBY) &&
- (ident_buf->support.command2 & ATA_SUPPORT_SPINUP) &&
- softc->spinup == 0)) {
+ if ((ident_buf->specconf == 0x37c8 ||
+ ident_buf->specconf == 0x738c) &&
+ ((ident_buf->config & ATA_RESP_INCOMPLETE) ||
+ softc->spinup == 0)) {
PROBE_SET_ACTION(softc, PROBE_SPINUP);
xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
Modified: stable/8/sys/sys/ata.h
==============================================================================
--- stable/8/sys/sys/ata.h Mon Mar 1 19:32:34 2010 (r204530)
+++ stable/8/sys/sys/ata.h Mon Mar 1 19:36:19 2010 (r204531)
@@ -51,7 +51,7 @@ struct ata_params {
#define ATA_RESP_INCOMPLETE 0x0004
/*001*/ u_int16_t cylinders; /* # of cylinders */
- u_int16_t reserved2;
+/*002*/ u_int16_t specconf; /* specific configuration */
/*003*/ u_int16_t heads; /* # heads */
u_int16_t obsolete4;
u_int16_t obsolete5;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
