Author: mav
Date: Wed Sep 12 09:20:37 2012
New Revision: 240383
URL: http://svn.freebsd.org/changeset/base/240383
Log:
Fix AHCI 1.2 version checks. This should be mostly cosmetic.
Submitted by: Dmitry Luhtionov <dmitryluhtio...@gmail.com>
MFC after: 1 week
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c Wed Sep 12 07:59:28 2012 (r240382)
+++ head/sys/dev/ahci/ahci.c Wed Sep 12 09:20:37 2012 (r240383)
@@ -403,7 +403,7 @@ ahci_attach(device_t dev)
/* Get the HW capabilities */
version = ATA_INL(ctlr->r_mem, AHCI_VS);
ctlr->caps = ATA_INL(ctlr->r_mem, AHCI_CAP);
- if (version >= 0x00010020)
+ if (version >= 0x00010200)
ctlr->caps2 = ATA_INL(ctlr->r_mem, AHCI_CAP2);
if (ctlr->caps & AHCI_CAP_EMS)
ctlr->capsem = ATA_INL(ctlr->r_mem, AHCI_EM_CTL);
@@ -483,7 +483,7 @@ ahci_attach(device_t dev)
(ctlr->caps & AHCI_CAP_SXS) ? " eSATA":"",
(ctlr->caps & AHCI_CAP_NPMASK) + 1);
}
- if (bootverbose && version >= 0x00010020) {
+ if (bootverbose && version >= 0x00010200) {
device_printf(dev, "Caps2:%s%s%s\n",
(ctlr->caps2 & AHCI_CAP2_APST) ? " APST":"",
(ctlr->caps2 & AHCI_CAP2_NVMP) ? " NVMP":"",
@@ -982,7 +982,7 @@ ahci_ch_attach(device_t dev)
}
ch->chcaps = ATA_INL(ch->r_mem, AHCI_P_CMD);
version = ATA_INL(ctlr->r_mem, AHCI_VS);
- if (version < 0x00010020 && (ctlr->caps & AHCI_CAP_FBSS))
+ if (version < 0x00010200 && (ctlr->caps & AHCI_CAP_FBSS))
ch->chcaps |= AHCI_P_CMD_FBSCP;
if (bootverbose) {
device_printf(dev, "Caps:%s%s%s%s%s\n",
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
