Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Update to the device framework.
[palacios.git] / palacios / src / devices / ide.c
index 86d2b73..23b2291 100644 (file)
@@ -159,7 +159,6 @@ struct ide_drive {
     uint8_t data_buf[DATA_BUFFER_SIZE];
 
 
-
     uint32_t num_cylinders;
     uint32_t num_heads;
     uint32_t num_sectors;
@@ -355,7 +354,7 @@ static void ide_abort_command(struct vm_device * dev, struct ide_channel * chann
 
 
 static int dma_read(struct vm_device * dev, struct ide_channel * channel);
-
+static int dma_write(struct vm_device * dev, struct ide_channel * channel);
 
 
 /* ATAPI functions */
@@ -365,6 +364,37 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel);
 #include "ata.h"
 
 
+#ifdef DEBUG_IDE
+static void print_prd_table(struct vm_device * dev, struct ide_channel * channel) {
+    struct ide_dma_prd prd_entry;
+    int index = 0;
+
+    PrintDebug("Dumping PRD table\n");
+
+    while (1) {
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index);
+       int ret;
+
+       ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+       
+       if (ret != sizeof(struct ide_dma_prd)) {
+           PrintError("Could not read PRD\n");
+           return;
+       }
+
+       PrintDebug("\tPRD Addr: %x, PRD Len: %d, EOT: %d\n", 
+                  prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+
+       if (prd_entry.end_of_table) {
+           break;
+       }
+
+       index++;
+    }
+
+    return;
+}
+#endif
 
 /* IO Operations */
 static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
@@ -376,94 +406,107 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
     // Read in the data buffer....
     // Read a sector/block at a time until the prd entry is full.
 
+#ifdef DEBUG_IDE
+    print_prd_table(dev, channel);
+#endif
 
     PrintDebug("DMA read for %d bytes\n", bytes_left);
 
     // Loop through the disk data
     while (bytes_left > 0) {
-       
-       uint32_t prd_entry_addr =  channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
        uint_t prd_bytes_left = 0;
        uint_t prd_offset = 0;
        int ret;
-           
+
        PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
-       
+
        ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
-       
+
        if (ret != sizeof(struct ide_dma_prd)) {
            PrintError("Could not read PRD\n");
            return -1;
        }
-       
-       PrintDebug("PRD Addr: %x, PDR Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
-       
+
+       PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", 
+                  prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+
        // loop through the PRD data....
-       
+
        prd_bytes_left = prd_entry.size;
-       
-       
+
+
        while (prd_bytes_left > 0) {
            uint_t bytes_to_write = 0;
-           
+
            if (drive->drive_type == IDE_DISK) {
                bytes_to_write = (prd_bytes_left > IDE_SECTOR_SIZE) ? IDE_SECTOR_SIZE : prd_bytes_left;
-               
-               
+
+
                if (ata_read(dev, channel, drive->data_buf, 1) == -1) {
                    PrintError("Failed to read next disk sector\n");
                    return -1;
                }
            } else if (drive->drive_type == IDE_CDROM) {
-               bytes_to_write = (prd_bytes_left > ATAPI_BLOCK_SIZE) ? ATAPI_BLOCK_SIZE : prd_bytes_left;
-               
-               if (atapi_read_chunk(dev, channel) == -1) {
-                   PrintError("Failed to read next disk sector\n");
+               if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) {
+                   bytes_to_write = (prd_bytes_left > ATAPI_BLOCK_SIZE) ? ATAPI_BLOCK_SIZE : prd_bytes_left;
+
+                   if (atapi_read_chunk(dev, channel) == -1) {
+                       PrintError("Failed to read next disk sector\n");
+                       return -1;
+                   }
+               } else {
+                   PrintDebug("DMA of command packet\n");
+                   PrintError("How does this work???\n");
                    return -1;
+                   bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left;
+                   prd_bytes_left = bytes_to_write;
                }
            }
-           
+
            PrintDebug("Writing DMA data to guest Memory ptr=%p, len=%d\n", 
                       (void *)(addr_t)(prd_entry.base_addr + prd_offset), bytes_to_write);
 
            drive->current_lba++;
-           
+
            ret = write_guest_pa_memory(dev->vm, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); 
-           
+
            if (ret != bytes_to_write) {
                PrintError("Failed to copy data into guest memory... (ret=%d)\n", ret);
                return -1;
            }
 
            PrintDebug("\t DMA ret=%d, (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left);
-           
+
            drive->transfer_index += ret;
            prd_bytes_left -= ret;
            prd_offset += ret;
            bytes_left -= ret;
-
        }
-       
-       channel->dma_tbl_index++;       
-       
+
+       channel->dma_tbl_index++;
+
        if (drive->drive_type == IDE_DISK) {
            if (drive->transfer_index % IDE_SECTOR_SIZE) {
                PrintError("We currently don't handle sectors that span PRD descriptors\n");
                return -1;
            }
        } else if (drive->drive_type == IDE_CDROM) {
-           if (drive->transfer_index % ATAPI_BLOCK_SIZE) {
-               PrintError("We currently don't handle ATAPI BLOCKS that span PRD descriptors\n");
-               return -1;
+           if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) {
+               if (drive->transfer_index % ATAPI_BLOCK_SIZE) {
+                   PrintError("We currently don't handle ATAPI BLOCKS that span PRD descriptors\n");
+                   PrintError("transfer_index=%d, transfer_length=%d\n", 
+                              drive->transfer_index, drive->transfer_length);
+                   return -1;
+               }
            }
        }
-       
-       
+
+
        if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) {
            PrintError("DMA table not large enough for data transfer...\n");
            return -1;
        }
-       
     }
 
     /*
@@ -495,9 +538,92 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
 
 
 static int dma_write(struct vm_device * dev, struct ide_channel * channel) {
-    // unsupported
-    PrintError("DMA writes currently not supported\n");
-    return -1;
+    struct ide_drive * drive = get_selected_drive(channel);
+    // This is at top level scope to do the EOT test at the end
+    struct ide_dma_prd prd_entry;
+    uint_t bytes_left = drive->transfer_length;
+
+
+    PrintDebug("DMA write from %d bytes\n", bytes_left);
+
+    // Loop through disk data
+    while (bytes_left > 0) {
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
+       uint_t prd_bytes_left = 0;
+       uint_t prd_offset = 0;
+       int ret;
+       
+       PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr);
+
+       ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+
+       if (ret != sizeof(struct ide_dma_prd)) {
+           PrintError("Could not read PRD\n");
+           return -1;
+       }
+
+       PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", 
+                  prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+
+       prd_bytes_left = prd_entry.size;
+
+       while (prd_bytes_left > 0) {
+           uint_t bytes_to_write = 0;
+
+
+           bytes_to_write = (prd_bytes_left > IDE_SECTOR_SIZE) ? IDE_SECTOR_SIZE : prd_bytes_left;
+
+
+           ret = read_guest_pa_memory(dev->vm, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf);
+
+           if (ret != bytes_to_write) {
+               PrintError("Faild to copy data from guest memory... (ret=%d)\n", ret);
+               return -1;
+           }
+
+           PrintDebug("\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left);
+
+
+           if (ata_write(dev, channel, drive->data_buf, 1) == -1) {
+               PrintError("Failed to write data to disk\n");
+               return -1;
+           }
+           
+           drive->current_lba++;
+
+           drive->transfer_index += ret;
+           prd_bytes_left -= ret;
+           prd_offset += ret;
+           bytes_left -= ret;
+       }
+
+       channel->dma_tbl_index++;
+
+       if (drive->transfer_index % IDE_SECTOR_SIZE) {
+           PrintError("We currently don't handle sectors that span PRD descriptors\n");
+           return -1;
+       }
+
+       if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) {
+           PrintError("DMA table not large enough for data transfer...\n");
+           return -1;
+       }
+    }
+
+    if (prd_entry.end_of_table) {
+       channel->status.busy = 0;
+       channel->status.ready = 1;
+       channel->status.data_req = 0;
+       channel->status.error = 0;
+       channel->status.seek_complete = 1;
+
+       channel->dma_status.active = 0;
+       channel->dma_status.err = 0;
+    }
+
+    ide_raise_irq(dev, channel);
+
+    return 0;
 }
 
 
@@ -755,7 +881,28 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
            break;
        }
 
+       case 0xca: { // Write DMA
+           uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count;
+
+           if (ata_get_lba(dev, channel, &(drive->current_lba)) == -1) {
+               ide_abort_command(dev, channel);
+               return 0;
+           }
+
+           drive->hd_state.cur_sector_num = 1;
 
+           drive->transfer_length = sect_cnt * IDE_SECTOR_SIZE;
+           drive->transfer_index = 0;
+
+           if (channel->dma_status.active == 1) {
+               // DMA Write
+               if (dma_write(dev, channel) == -1) {
+                   PrintError("Failed DMA Write\n");
+                   return -1;
+               }
+           }
+           break;
+       }
        case 0xe0: // Standby Now 1
        case 0xe1: // Set Idle Immediate
        case 0xe2: // Standby
@@ -1287,16 +1434,71 @@ static int init_ide_state(struct vm_device * dev) {
 
 
 
-static int init_ide(struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
 
+static int ide_free(struct vm_device * dev) {
+    // unhook io ports....
+    // deregister from PCI?
+    return 0;
+}
+
+
+static struct v3_device_ops dev_ops = {
+    .free = ide_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
+};
+
+
+
+static int ide_init(struct guest_info * vm, void * cfg_data) {
+    struct ide_internal * ide  = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));  
+    struct ide_cfg * cfg = (struct ide_cfg *)(cfg_data);
+    
     PrintDebug("IDE: Initializing IDE\n");
+    memset(ide, 0, sizeof(struct ide_internal));
+
+
+    if (cfg->pci != NULL) {
+       if (cfg->southbridge == NULL) {
+           PrintError("PCI Enabled BUT southbridge is NULL\n");
+           return -1;
+       }
+
+       ide->pci_bus = v3_find_dev(vm, (char *)cfg->pci);
+       
+       if (ide->pci_bus == NULL) {
+           PrintError("Could not find PCI device\n");
+           return -1;
+       }
+
+       struct vm_device * southbridge = v3_find_dev(vm, cfg->southbridge);
+
+       if (!southbridge) {
+           PrintError("Could not find southbridge\n");
+           return -1;
+       }
+
+       ide->southbridge = (struct v3_southbridge *)(southbridge->private_data);
+    }
+
+
+    PrintDebug("IDE: Creating IDE bus x 2\n");
+
+    struct vm_device * dev = v3_allocate_device("IDE", &dev_ops, ide);
+
+    if (v3_attach_device(vm, dev) == -1) {
+       PrintError("Could not attach device %s\n", "IDE");
+       return -1;
+    }
+
 
     if (init_ide_state(dev) == -1) {
        PrintError("Failed to initialize IDE state\n");
        return -1;
     }
 
+    PrintDebug("Connecting to IDE IO ports\n");
 
     v3_dev_hook_io(dev, PRI_DATA_PORT, 
                   &ide_read_data_port, &write_data_port);
@@ -1356,6 +1558,8 @@ static int init_ide(struct vm_device * dev) {
        struct pci_device * pci_dev = NULL;
        int i;
 
+       PrintDebug("Connecting IDE to PCI bus\n");
+
        for (i = 0; i < 6; i++) {
            bars[i].type = PCI_BAR_NONE;
        }
@@ -1386,9 +1590,9 @@ static int init_ide(struct vm_device * dev) {
        pci_dev->config_header.device_id = 0x7010;
        pci_dev->config_header.revision = 0x00;
 
-       pci_dev->config_header.prog_if = 0x80;
-       pci_dev->config_header.subclass = 0x01;
-       pci_dev->config_header.class = 0x01;
+       pci_dev->config_header.prog_if = 0x80; // Master IDE device
+       pci_dev->config_header.subclass = PCI_STORAGE_SUBCLASS_IDE;
+       pci_dev->config_header.class = PCI_CLASS_STORAGE;
 
        pci_dev->config_header.command = 0;
        pci_dev->config_header.status = 0x0280;
@@ -1398,37 +1602,19 @@ static int init_ide(struct vm_device * dev) {
 
     }
 
-    return 0;
-}
+    PrintDebug("IDE Initialized\n");
 
-
-static int deinit_ide(struct vm_device * dev) {
-    // unhook io ports....
-    // deregister from PCI?
     return 0;
 }
 
 
-static struct vm_device_ops dev_ops = {
-    .init = init_ide,
-    .deinit = deinit_ide,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-};
+device_register("IDE", ide_init)
+
 
 
-struct vm_device *  v3_create_ide(struct vm_device * pci_bus, struct vm_device * southbridge_dev) {
-    struct ide_internal * ide  = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));  
-    struct vm_device * device = v3_create_device("IDE", &dev_ops, ide);
 
-    ide->pci_bus = pci_bus;
-    ide->southbridge = (struct v3_southbridge *)(southbridge_dev->private_data);
 
-    PrintDebug("IDE: Creating IDE bus x 2\n");
 
-    return device;
-}
 
 
 
@@ -1531,7 +1717,7 @@ int v3_ide_register_harddisk(struct vm_device * ide_dev,
     /* this is something of a hack... */
     drive->num_sectors = 63;
     drive->num_heads = 16;
-    drive->num_cylinders = (ops->get_capacity(private_data) / 512) / (drive->num_sectors * drive->num_heads);
+    drive->num_cylinders = ops->get_capacity(private_data)  / (drive->num_sectors * drive->num_heads);
 
     if (ide->ide_pci) {
        // Hardcode this for now, but its not a good idea....