From owner-svn-soc-all@FreeBSD.ORG  Wed Sep 18 15:00:02 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7CDFF2B2
 for <svn-soc-all@FreeBSD.org>; Wed, 18 Sep 2013 15:00:02 +0000 (UTC)
 (envelope-from zcore@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A57A2FAD
 for <svn-soc-all@FreeBSD.org>; Wed, 18 Sep 2013 15:00:02 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8IF02o4010483
 for <svn-soc-all@FreeBSD.org>; Wed, 18 Sep 2013 15:00:02 GMT
 (envelope-from zcore@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8IF02SV010474
 for svn-soc-all@FreeBSD.org; Wed, 18 Sep 2013 15:00:02 GMT
 (envelope-from zcore@FreeBSD.org)
Date: Wed, 18 Sep 2013 15:00:02 GMT
Message-Id: <201309181500.r8IF02SV010474@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zcore@FreeBSD.org using -f
From: zcore@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r257458 - soc2013/zcore/head/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Sep 2013 15:00:02 -0000

Author: zcore
Date: Wed Sep 18 15:00:02 2013
New Revision: 257458
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257458

Log:
  fix SLOTs setting if blockif queue size is larger than 32

Modified:
  soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c

Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Wed Sep 18 11:07:32 2013	(r257457)
+++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Wed Sep 18 15:00:02 2013	(r257458)
@@ -1305,7 +1305,10 @@
 	pthread_mutex_init(&sc->mtx, NULL);
 
 	/* Intel Cougar Point AHCI */
-	slots = sc->port[0].ioqsz - 1;
+	slots = sc->port[0].ioqsz;
+	if (slots > 32)
+		slots = 32;
+	--slots;
 	sc->cap = AHCI_CAP_64BIT | AHCI_CAP_SNCQ | AHCI_CAP_SSNTF |
 		AHCI_CAP_SMPS | AHCI_CAP_SSS | AHCI_CAP_SALP |
 		AHCI_CAP_SAL | AHCI_CAP_SCLO | (0x3 << AHCI_CAP_ISS_SHIFT)|