From 1254b6802fb8d9fffdb76f312407dadf2a74a3d7 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Fri, 26 Feb 2010 10:42:46 +0000 Subject: [PATCH] Make PUIS detection more strict. Previous implementation caused false positives on VMWare's virtual CD-ROMs. --- sys/cam/ata/ata_xpt.c | 9 ++++----- sys/sys/ata.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 0c2bf32f8a0..d5e0b32a49b 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -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); diff --git a/sys/sys/ata.h b/sys/sys/ata.h index e8a04dbbbfd..cacb1ea0277 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -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;