Author: mav
Date: Sun Jul 17 14:13:47 2016
New Revision: 302957
URL: https://svnweb.freebsd.org/changeset/base/302957
Log:
Fix NCQ TRIM emulation.
When this code was written, there was no guests using it to test.
Modified:
head/usr.sbin/bhyve/pci_ahci.c
Modified: head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- head/usr.sbin/bhyve/pci_ahci.c Sun Jul 17 14:12:34 2016
(r302956)
+++ head/usr.sbin/bhyve/pci_ahci.c Sun Jul 17 14:13:47 2016
(r302957)
@@ -837,7 +837,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)
@@ -1718,7 +1726,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;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
