Author: mav
Date: Fri Mar 13 18:35:38 2015
New Revision: 279960
URL: https://svnweb.freebsd.org/changeset/base/279960

Log:
  Add support for PIO variants of READ/WRITE commands for AHCI disks.
  
  AHCI API hides all PIO specifics, so this functionality is almost free.
  
  MFC after:    2 weeks

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

Modified: head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- head/usr.sbin/bhyve/pci_ahci.c      Fri Mar 13 18:04:07 2015        
(r279959)
+++ head/usr.sbin/bhyve/pci_ahci.c      Fri Mar 13 18:35:38 2015        
(r279960)
@@ -520,12 +520,14 @@ ahci_handle_dma(struct ahci_port *p, int
        readop = 1;
 
        prdt += seek;
-       if (cfis[2] == ATA_WRITE_DMA || cfis[2] == ATA_WRITE_DMA48 ||
-                       cfis[2] == ATA_WRITE_FPDMA_QUEUED)
+       if (cfis[2] == ATA_WRITE || cfis[2] == ATA_WRITE48 ||
+           cfis[2] == ATA_WRITE_MUL || cfis[2] == ATA_WRITE_MUL48 ||
+           cfis[2] == ATA_WRITE_DMA || cfis[2] == ATA_WRITE_DMA48 ||
+           cfis[2] == ATA_WRITE_FPDMA_QUEUED)
                readop = 0;
 
        if (cfis[2] == ATA_WRITE_FPDMA_QUEUED ||
-                       cfis[2] == ATA_READ_FPDMA_QUEUED) {
+           cfis[2] == ATA_READ_FPDMA_QUEUED) {
                lba = ((uint64_t)cfis[10] << 40) |
                        ((uint64_t)cfis[9] << 32) |
                        ((uint64_t)cfis[8] << 24) |
@@ -536,7 +538,9 @@ ahci_handle_dma(struct ahci_port *p, int
                if (!len)
                        len = 65536;
                ncq = 1;
-       } else if (cfis[2] == ATA_READ_DMA48 || cfis[2] == ATA_WRITE_DMA48) {
+       } else if (cfis[2] == ATA_READ48 || cfis[2] == ATA_WRITE48 ||
+           cfis[2] == ATA_READ_MUL48 || cfis[2] == ATA_WRITE_MUL48 ||
+           cfis[2] == ATA_READ_DMA48 || cfis[2] == ATA_WRITE_DMA48) {
                lba = ((uint64_t)cfis[10] << 40) |
                        ((uint64_t)cfis[9] << 32) |
                        ((uint64_t)cfis[8] << 24) |
@@ -1475,6 +1479,14 @@ ahci_handle_cmd(struct ahci_port *p, int
                }
                ahci_write_fis_d2h(p, slot, cfis, p->tfd);
                break;
+       case ATA_READ:
+       case ATA_WRITE:
+       case ATA_READ48:
+       case ATA_WRITE48:
+       case ATA_READ_MUL:
+       case ATA_WRITE_MUL:
+       case ATA_READ_MUL48:
+       case ATA_WRITE_MUL48:
        case ATA_READ_DMA:
        case ATA_WRITE_DMA:
        case ATA_READ_DMA48:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to