Date: Sat, 13 Jun 2009 21:34:18 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 164296 for review Message-ID: <200906132134.n5DLYISk079922@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164296 Change 164296 by mav@mav_mavbook on 2009/06/13 21:33:25 Fix probing when PM supported, but absent. Reduce PM reset timeout and retries. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#17 (text+ko) ==== @@ -349,13 +349,13 @@ switch (softc->action) { case PROBE_RESET: cam_fill_ataio(ataio, - 1, + 0, probedone, /*flags*/CAM_DIR_NONE, MSG_SIMPLE_Q_TAG, /*data_ptr*/NULL, /*dxfer_len*/0, - 10 * 1000); + (done_ccb->ccb_h.target_id == 15 ? 3 : 15) * 1000); ata_reset_cmd(ataio); break; case PROBE_IDENTIFY: @@ -1202,7 +1202,8 @@ * Free the current request path- we're done with it. */ xpt_free_path(work_ccb->ccb_h.path); - if (scan_info->counter == 15) + if (scan_info->counter == 15 && + work_ccb->ccb_h.ppriv_field1 != 0) scan_info->found = work_ccb->ccb_h.ppriv_field1; take_next: /* Take next device. Wrap from 15 (PM) to 0. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906132134.n5DLYISk079922>