d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make device initialization sequence shorter when possible. Do not enable/

Browse Source 
disable already enabled/disabled SATA features.
This commit is contained in:
mav 2011-01-26 06:37:51 +00:00
parent a553f5bca5
commit 36a124cfce
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/cam/ata/ata_xpt.c
View File

@ -988,7 +988,9 @@ noerror:
cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS; cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS;
xpt_action((union ccb *)&cts); xpt_action((union ccb *)&cts);
softc->caps = caps; softc->caps = caps;
if (ident_buf->satasupport & ATA_SUPPORT_IFPWRMNGT) { if ((ident_buf->satasupport & ATA_SUPPORT_IFPWRMNGT) &&
(!(softc->caps & CTS_SATA_CAPS_H_PMREQ)) !=
(!(ident_buf->sataenabled & ATA_SUPPORT_IFPWRMNGT))) {
PROBE_SET_ACTION(softc, PROBE_SETPM); PROBE_SET_ACTION(softc, PROBE_SETPM);
xpt_release_ccb(done_ccb); xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority); xpt_schedule(periph, priority);
@ -997,7 +999,9 @@ noerror:
/* FALLTHROUGH */ /* FALLTHROUGH */
case PROBE_SETPM: case PROBE_SETPM:
if (ident_buf->satacapabilities != 0xffff && if (ident_buf->satacapabilities != 0xffff &&
ident_buf->satacapabilities & ATA_SUPPORT_DAPST) { (ident_buf->satacapabilities & ATA_SUPPORT_DAPST) &&
(!(softc->caps & CTS_SATA_CAPS_H_APST)) !=
(!(ident_buf->sataenabled & ATA_ENABLED_DAPST))) {
PROBE_SET_ACTION(softc, PROBE_SETAPST); PROBE_SET_ACTION(softc, PROBE_SETAPST);
xpt_release_ccb(done_ccb); xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority); xpt_schedule(periph, priority);
@ -1005,7 +1009,9 @@ noerror:
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case PROBE_SETAPST: case PROBE_SETAPST:
if (ident_buf->satasupport & ATA_SUPPORT_AUTOACTIVATE) { if ((ident_buf->satasupport & ATA_SUPPORT_AUTOACTIVATE) &&
(!(softc->caps & CTS_SATA_CAPS_H_DMAAA)) !=
(!(ident_buf->sataenabled & ATA_SUPPORT_AUTOACTIVATE))) {
PROBE_SET_ACTION(softc, PROBE_SETDMAAA); PROBE_SET_ACTION(softc, PROBE_SETDMAAA);
xpt_release_ccb(done_ccb); xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority); xpt_schedule(periph, priority);