svn commit: r303139 - stable/10/usr.sbin/bhyve

[Alexander Motin]

Author: mav
Date: Thu Jul 21 11:58:47 2016
New Revision: 303139
URL: https://svnweb.freebsd.org/changeset/base/303139

Log:
  MFC r302957: Fix NCQ TRIM emulation.
  
  When this code was written, there was no guests using it to test.

Modified:
  stable/10/usr.sbin/bhyve/pci_ahci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- stable/10/usr.sbin/bhyve/pci_ahci.c	Thu Jul 21 11:57:41 2016	(r303138)
+++ stable/10/usr.sbin/bhyve/pci_ahci.c	Thu Jul 21 11:58:47 2016	(r303139)
@@ -788,7 +788,15 @@ next:
 	done += 8;
 	if (elen == 0) {
 		if (done >= len) {
-			ahci_write_fis_d2h(p, slot, cfis, ATA_S_READY | ATA_S_DSC);
+			if (ncq) {
+				if (first)
+					ahci_write_fis_d2h_ncq(p, slot);
+				ahci_write_fis_sdb(p, slot, cfis,
+				    ATA_S_READY | ATA_S_DSC);
+			} else {
+				ahci_write_fis_d2h(p, slot, cfis,
+				    ATA_S_READY | ATA_S_DSC);
+			}
 			p->pending &= ~(1 << slot);
 			ahci_check_stopped(p);
 			if (!first)
@@ -1672,7 +1680,7 @@ ahci_handle_cmd(struct ahci_port *p, int
 	case ATA_SEND_FPDMA_QUEUED:
 		if ((cfis[13] & 0x1f) == ATA_SFPDMA_DSM &&
 		    cfis[17] == 0 && cfis[16] == ATA_DSM_TRIM &&
-		    cfis[11] == 0 && cfis[13] == 1) {
+		    cfis[11] == 0 && cfis[3] == 1) {
 			ahci_handle_dsm_trim(p, slot, cfis, 0);
 			break;
 		}