Author: mav
Date: Wed Apr 24 19:24:53 2013
New Revision: 249851
URL: http://svnweb.freebsd.org/changeset/base/249851
Log:
MFC r248698:
Depending on combination of running commands (NCQ/non-NCQ) try to avoid
extra read from PxCI/PxSACT registers. If only NCQ commands are running, we
don't really need PxCI. If only non-NCQ commands are running we don't need
PxSACT. Mixed set may happen only on controllers with FIS-based switching
when port multiplier is attached, and then we have to read both registers.
Modified:
stable/9/sys/dev/ahci/ahci.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ahci/ahci.c
==============================================================================
--- stable/9/sys/dev/ahci/ahci.c Wed Apr 24 19:22:19 2013
(r249850)
+++ stable/9/sys/dev/ahci/ahci.c Wed Apr 24 19:24:53 2013
(r249851)
@@ -1507,7 +1507,7 @@ ahci_ch_intr(void *data)
{
device_t dev = (device_t)data;
struct ahci_channel *ch = device_get_softc(dev);
- uint32_t istatus, sstatus, cstatus, serr = 0, sntf = 0, ok, err;
+ uint32_t istatus, cstatus, serr = 0, sntf = 0, ok, err;
enum ahci_err_type et;
int i, ccs, port, reset = 0;
@@ -1517,8 +1517,13 @@ ahci_ch_intr(void *data)
return;
ATA_OUTL(ch->r_mem, AHCI_P_IS, istatus);
/* Read command statuses. */
- sstatus = ATA_INL(ch->r_mem, AHCI_P_SACT);
- cstatus = ATA_INL(ch->r_mem, AHCI_P_CI);
+ if (ch->numtslots != 0)
+ cstatus = ATA_INL(ch->r_mem, AHCI_P_SACT);
+ else
+ cstatus = 0;
+ if (ch->numrslots != ch->numtslots)
+ cstatus |= ATA_INL(ch->r_mem, AHCI_P_CI);
+ /* Read SNTF in one of possible ways. */
if (istatus & AHCI_P_IX_SDB) {
if (ch->caps & AHCI_CAP_SSNTF)
sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF);
@@ -1578,14 +1583,14 @@ ahci_ch_intr(void *data)
}
}
}
- err = ch->rslots & (cstatus | sstatus);
+ err = ch->rslots & cstatus;
} else {
ccs = 0;
err = 0;
port = -1;
}
/* Complete all successfull commands. */
- ok = ch->rslots & ~(cstatus | sstatus);
+ ok = ch->rslots & ~cstatus;
for (i = 0; i < ch->numslots; i++) {
if ((ok >> i) & 1)
ahci_end_transaction(&ch->slot[i], AHCI_ERR_NONE);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
