svn commit: r199452 - stable/8/sys/dev/ahci
Alexander Motin
mav at FreeBSD.org
Tue Nov 17 21:27:22 UTC 2009
Author: mav
Date: Tue Nov 17 21:27:21 2009
New Revision: 199452
URL: http://svn.freebsd.org/changeset/base/199452
Log:
MFC r199278:
Check SNCQ HBA capability bit when reporting NCQ support to CAM.
Modified:
stable/8/sys/dev/ahci/ahci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c Tue Nov 17 21:26:05 2009 (r199451)
+++ stable/8/sys/dev/ahci/ahci.c Tue Nov 17 21:27:21 2009 (r199452)
@@ -734,7 +734,9 @@ ahci_ch_attach(device_t dev)
/* Construct SIM entry */
ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch,
device_get_unit(dev), &ch->mtx,
- min(2, ch->numslots), ch->numslots, devq);
+ min(2, ch->numslots),
+ (ch->caps & AHCI_CAP_SNCQ) ? ch->numslots : 0,
+ devq);
if (ch->sim == NULL) {
device_printf(dev, "unable to allocate sim\n");
error = ENOMEM;
@@ -2119,7 +2121,9 @@ ahciaction(struct cam_sim *sim, union cc
struct ccb_pathinq *cpi = &ccb->cpi;
cpi->version_num = 1; /* XXX??? */
- cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE;
+ cpi->hba_inquiry = PI_SDTR_ABLE;
+ if (ch->caps & AHCI_CAP_SNCQ)
+ cpi->hba_inquiry |= PI_TAG_ABLE;
if (ch->caps & AHCI_CAP_SPM)
cpi->hba_inquiry |= PI_SATAPM;
cpi->target_sprt = 0;
More information about the svn-src-all
mailing list