X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=eb07a625e39b326897d1ee7753b97a3917108634;hb=11b293c8f2068939809a1bc5ebe78abc7052f07f;hp=86d2b734026387946b5131a0fe187e510cdfe89c;hpb=639901d32ea8c5144ce9bb8f44bc6efa81a947a0;p=palacios.git

diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c
index 86d2b73..eb07a62 100644
--- a/palacios/src/devices/ide.c
+++ b/palacios/src/devices/ide.c
@@ -355,7 +355,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 */
@@ -381,8 +381,7 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
 
     // 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;
@@ -396,7 +395,8 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
 	    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....
 	
@@ -463,7 +463,6 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
 	    PrintError("DMA table not large enough for data transfer...\n");
 	    return -1;
 	}
-	
     }
 
     /*
@@ -495,9 +494,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 +837,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
@@ -1297,6 +1400,7 @@ static int init_ide(struct vm_device * dev) {
 	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 +1460,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;
 	}
@@ -1398,6 +1504,8 @@ static int init_ide(struct vm_device * dev) {
 
     }
 
+    PrintDebug("IDE Initialized\n");
+
     return 0;
 }
 
@@ -1420,10 +1528,21 @@ static struct vm_device_ops dev_ops = {
 
 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));  
+
+    memset(ide, 0, 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);
+    if (pci_bus != NULL) {
+	if (southbridge_dev == NULL) {
+	    PrintError("PCI Enabled BUT southbridge is NULL\n");
+	    return NULL;
+	}
+
+	ide->pci_bus = pci_bus;
+	ide->southbridge = (struct v3_southbridge *)(southbridge_dev->private_data);
+    }
+
 
     PrintDebug("IDE: Creating IDE bus x 2\n");
 
@@ -1531,7 +1650,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....