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.


added DMA write functionality to ide harddisk
[palacios.git] / palacios / src / devices / ide.c
index bf85ba1..361bed0 100644 (file)
@@ -21,6 +21,7 @@
 #include <palacios/vm_guest_mem.h>
 #include <devices/ide.h>
 #include <devices/pci.h>
+#include <devices/southbridge.h>
 #include "ide-types.h"
 #include "atapi-types.h"
 
@@ -158,6 +159,11 @@ struct ide_drive {
     uint8_t data_buf[DATA_BUFFER_SIZE];
 
 
+
+    uint32_t num_cylinders;
+    uint32_t num_heads;
+    uint32_t num_sectors;
+
     void * private_data;
     
     union {
@@ -208,8 +214,6 @@ struct ide_channel {
 
     int irq; // this is temporary until we add PCI support
 
-    struct pci_device * pci_dev;
-
     // Control Registers
     struct ide_ctrl_reg ctrl_reg; // [write] 0x3f6,0x376
 
@@ -223,8 +227,11 @@ struct ide_channel {
 
 struct ide_internal {
     struct ide_channel channels[2];
-    struct vm_device * pci;
-    struct pci_device * busmaster_pci;
+
+    struct v3_southbridge * southbridge;
+    struct vm_device * pci_bus;
+
+    struct pci_device * ide_pci;
 };
 
 
@@ -347,8 +354,8 @@ 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 */
@@ -362,29 +369,101 @@ static void ide_abort_command(struct vm_device * dev, struct ide_channel * chann
 /* IO Operations */
 static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
     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;
-    uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
-    int ret;
+    uint_t bytes_left = drive->transfer_length;
 
-    PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
+    // Read in the data buffer....
+    // Read a sector/block at a time until the prd entry is full.
 
-    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("DMA read for %d bytes\n", bytes_left);
 
-    ret = write_guest_pa_memory(dev->vm, prd_entry.base_addr, prd_entry.size, drive->data_buf); 
+    // 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);
+       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);
+       
+       // 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");
+                   return -1;
+               }
+           }
+           
+           PrintDebug("Writing DMA data to guest Memory ptr=%p, len=%d\n", 
+                      (void *)(addr_t)(prd_entry.base_addr + prd_offset), bytes_to_write);
 
-    if (ret != prd_entry.size) {
-       PrintError("Failed to copy data into guest memory... (ret=%d)\n", ret);
-       return -1;
-    }
+           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++;       
+       
+       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 ((prd_entry.end_of_table == 1) && (bytes_left > 0)) {
+           PrintError("DMA table not large enough for data transfer...\n");
+           return -1;
+       }
+    }
 
     /*
       drive->irq_flags.io_dir = 1;
@@ -393,18 +472,19 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
     */
 
 
+    // Update to the next PRD entry
+
     // set DMA status
 
     if (prd_entry.end_of_table) {
-       channel->dma_status.active = 0;
-       channel->dma_status.err = 0;
-       channel->dma_status.int_gen = 1;
-
        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);
@@ -414,46 +494,96 @@ 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;
 
 
-/* 
- * This is an ugly ugly ugly way to differentiate between the first and second DMA channels 
- */
+    PrintDebug("DMA write from %d bytes\n", bytes_left);
 
-static int write_dma_port(ushort_t port_offset, void * src, uint_t length, struct vm_device * dev, struct ide_channel * channel);
-static int read_dma_port(ushort_t port_offset, void * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel);
+    // 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);
 
-static int write_pri_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Writing PRI DMA Port %x (%s) (val=%x)\n", port, dma_port_to_str(port & 0x7), *(uint32_t *)src);
-    return write_dma_port(port & 0x7, src, length, dev, &(ide->channels[0]));
-}
+       if (ret != sizeof(struct ide_dma_prd)) {
+           PrintError("Could not read PRD\n");
+           return -1;
+       }
 
-static int write_sec_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Writing SEC DMA Port %x (%s) (val=%x)\n", port, dma_port_to_str(port & 0x7), *(uint32_t *)src);
-    return write_dma_port(port & 0x7, src, length, dev, &(ide->channels[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;
 
-static int read_pri_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Reading PRI DMA Port %x (%s)\n", port, dma_port_to_str(port & 0x7));
-    return read_dma_port(port & 0x7, dst, length, dev, &(ide->channels[0]));
-}
+       while (prd_bytes_left > 0) {
+           uint_t bytes_to_write = 0;
 
-static int read_sec_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Reading SEC DMA Port %x (%s)\n", port, dma_port_to_str(port & 0x7));
-    return read_dma_port(port & 0x7, dst, length, dev, &(ide->channels[1]));
+
+           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;
 }
 
 
+
 #define DMA_CMD_PORT      0x00
 #define DMA_STATUS_PORT   0x02
 #define DMA_PRD_PORT0     0x04
@@ -461,9 +591,16 @@ static int read_sec_dma_port(ushort_t port, void * dst, uint_t length, struct vm
 #define DMA_PRD_PORT2     0x06
 #define DMA_PRD_PORT3     0x07
 
+#define DMA_CHANNEL_FLAG  0x08
 
-static int write_dma_port(ushort_t port_offset, void * src, uint_t length, 
-                         struct vm_device * dev, struct ide_channel * channel) {
+static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+    uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1);
+    uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3;
+    struct ide_channel * channel = &(ide->channels[channel_flag]);
+
+    PrintDebug("IDE: Writing DMA Port %x (%s) (val=%x) (len=%d) (channel=%d)\n", 
+              port, dma_port_to_str(port_offset), *(uint32_t *)src, length, channel_flag);
 
     switch (port_offset) {
        case DMA_CMD_PORT:
@@ -493,15 +630,21 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length,
 
            break;
            
-       case DMA_STATUS_PORT:
+       case DMA_STATUS_PORT: {
+           uint8_t val = *(uint8_t *)src;
+
            if (length != 1) {
                PrintError("Invalid read length for DMA status port\n");
                return -1;
            }
 
-           channel->dma_status.val = *(uint8_t *)src;
+           // weirdness
+           channel->dma_status.val = ((val & 0x60) | 
+                                      (channel->dma_status.val & 0x01) |
+                                      (channel->dma_status.val & ~val & 0x06));
+
            break;
-           
+       }           
        case DMA_PRD_PORT0:
        case DMA_PRD_PORT1:
        case DMA_PRD_PORT2:
@@ -532,8 +675,13 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length,
 }
 
 
-static int read_dma_port(ushort_t port_offset, void * dst, uint_t length, 
-                        struct vm_device * dev, struct ide_channel * channel) {
+static int read_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+    uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1);
+    uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3;
+    struct ide_channel * channel = &(ide->channels[channel_flag]);
+
+    PrintDebug("Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag);
 
     switch (port_offset) {
        case DMA_CMD_PORT:
@@ -573,7 +721,7 @@ static int read_dma_port(ushort_t port_offset, void * dst, uint_t length,
            return -1;
     }
 
-    PrintDebug("\tval=%x\n", *(uint32_t *)dst);
+    PrintDebug("\tval=%x (len=%d)\n", *(uint32_t *)dst, length);
 
     return length;
 }
@@ -666,10 +814,66 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
            break;
 
        case 0xc8: // Read DMA with retry
-       case 0xc9: // Read DMA
+       case 0xc9: { // Read 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 Read
+               if (dma_read(dev, channel) == -1) {
+                   PrintError("Failed DMA Read\n");
+                   return -1;
+               }
+           }
            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
+       case 0xe3: // Set Idle 1
+       case 0xe6: // Sleep Now 1
+       case 0x94: // Standby Now 2
+       case 0x95: // Idle Immediate (CFA)
+       case 0x96: // Standby 2
+       case 0x97: // Set idle 2
+       case 0x99: // Sleep Now 2
+           channel->status.val = 0;
+           channel->status.ready = 1;
+           ide_raise_irq(dev, channel);
+           break;
+
        case 0xef: // Set Features
            // Prior to this the features register has been written to. 
            // This command tells the drive to check if the new value is supported (the value is drive specific)
@@ -847,8 +1051,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
        return -1;
     }
 
-
-
+    
     if ((data_offset == 0) && (drive->transfer_index > 0)) {
        if (atapi_update_data_buf(dev, channel) == -1) {
            PrintError("Could not update CDROM data buffer\n");
@@ -1128,6 +1331,10 @@ static void init_drive(struct ide_drive * drive) {
     drive->transfer_length = 0;
     memset(drive->data_buf, 0, sizeof(drive->data_buf));
 
+    drive->num_cylinders = 0;
+    drive->num_heads = 0;
+    drive->num_sectors = 0;
+    
 
     drive->private_data = NULL;
     drive->cd_ops = NULL;
@@ -1164,80 +1371,27 @@ static int pci_config_update(struct pci_device * pci_dev, uint_t reg_num, int le
 
 static int init_ide_state(struct vm_device * dev) {
     struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    struct v3_pci_bar bars[6];
-    struct pci_device * pci_dev = NULL;
-    int i, j;
+    int i;
 
-    for (i = 0; i < 2; i++) {
+    /* 
+     * Check if the PIIX 3 actually represents both IDE channels in a single PCI entry 
+     */
+
+    for (i = 0; i < 1; i++) {
        init_channel(&(ide->channels[i]));
 
        // JRL: this is a terrible hack...
        ide->channels[i].irq = PRI_DEFAULT_IRQ + i;
-
-       for (j = 0; j < 6; j++) {
-           bars[j].type = PCI_BAR_NONE;
-       }
-
-
-       bars[4].type = PCI_BAR_IO;
-       bars[4].default_base_port = PRI_DEFAULT_DMA_PORT + (i * 0x8);
-       bars[4].num_ports = 8;
-       
-       if (i == 0) {
-           bars[4].io_read = read_pri_dma_port;
-           bars[4].io_write = write_pri_dma_port;
-       } else {
-           bars[4].io_read = read_sec_dma_port;
-           bars[4].io_write = write_sec_dma_port;
-       }
-
-       pci_dev = v3_pci_register_device(ide->pci, PCI_STD_DEVICE, 0, "V3_IDE", -1, bars,
-                                        pci_config_update, NULL, NULL, dev);
-
-       if (pci_dev == NULL) {
-           PrintError("Failed to register IDE BUS %d with PCI\n", i); 
-           return -1;
-       }
-
-       ide->channels[i].pci_dev = pci_dev;
-
-       pci_dev->config_header.vendor_id = 0x1095;
-       pci_dev->config_header.device_id = 0x0646;
-       pci_dev->config_header.revision = 0x8f07;
-       pci_dev->config_header.subclass = 0x01;
-       pci_dev->config_header.class = 0x01;
-
-       pci_dev->config_header.intr_line = PRI_DEFAULT_IRQ + i;
-       pci_dev->config_header.intr_pin = 1;
     }
 
 
-
-    /* Register PIIX3 Busmaster PCI device */
-    for (j = 0; j < 6; j++) {
-       bars[j].type = PCI_BAR_NONE;
-    }
-
-    pci_dev = v3_pci_register_device(ide->pci, PCI_STD_DEVICE, 0, "PIIX3 IDE", -1, bars,
-                                    NULL, NULL, NULL, dev);
-    
-    
-    ide->busmaster_pci = pci_dev;
-
-    pci_dev->config_header.vendor_id = 0x8086;
-    pci_dev->config_header.device_id = 0x7010;
-    pci_dev->config_header.revision = 0x80;
-    pci_dev->config_header.subclass = 0x01;
-    pci_dev->config_header.class = 0x01;
-
-
     return 0;
 }
 
 
 
 static int init_ide(struct vm_device * dev) {
-    //struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
 
     PrintDebug("IDE: Initializing IDE\n");
 
@@ -1295,6 +1449,58 @@ static int init_ide(struct vm_device * dev) {
     v3_dev_hook_io(dev, PRI_ADDR_REG_PORT, 
                   &read_port_std, &write_port_std);
 
+
+
+
+    if (ide->pci_bus) {
+       struct v3_pci_bar bars[6];
+       struct v3_southbridge * southbridge = (struct v3_southbridge *)(ide->southbridge);
+       struct pci_device * sb_pci = (struct pci_device *)(southbridge->southbridge_pci);
+       struct pci_device * pci_dev = NULL;
+       int i;
+
+       for (i = 0; i < 6; i++) {
+           bars[i].type = PCI_BAR_NONE;
+       }
+
+       bars[4].type = PCI_BAR_IO;
+       bars[4].default_base_port = PRI_DEFAULT_DMA_PORT;
+       bars[4].num_ports = 16;
+
+       bars[4].io_read = read_dma_port;
+       bars[4].io_write = write_dma_port;
+       
+       pci_dev = v3_pci_register_device(ide->pci_bus, PCI_STD_DEVICE, 0, sb_pci->dev_num, 1, 
+                                        "PIIX3_IDE", bars,
+                                        pci_config_update, NULL, NULL, dev);
+
+       if (pci_dev == NULL) {
+           PrintError("Failed to register IDE BUS %d with PCI\n", i); 
+           return -1;
+       }
+
+       /* This is for CMD646 devices 
+          pci_dev->config_header.vendor_id = 0x1095;
+          pci_dev->config_header.device_id = 0x0646;
+          pci_dev->config_header.revision = 0x8f07;
+       */
+
+       pci_dev->config_header.vendor_id = 0x8086;
+       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.command = 0;
+       pci_dev->config_header.status = 0x0280;
+
+       ide->ide_pci = pci_dev;
+
+
+    }
+
     return 0;
 }
 
@@ -1315,11 +1521,12 @@ static struct vm_device_ops dev_ops = {
 };
 
 
-struct vm_device *  v3_create_ide(struct vm_device * pci) {
+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 = pci;
+    ide->pci_bus = pci_bus;
+    ide->southbridge = (struct v3_southbridge *)(southbridge_dev->private_data);
 
     PrintDebug("IDE: Creating IDE bus x 2\n");
 
@@ -1328,6 +1535,25 @@ struct vm_device *  v3_create_ide(struct vm_device * pci) {
 
 
 
+int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_num, 
+                       uint32_t * cylinders, uint32_t * heads, uint32_t * sectors) {
+
+    struct ide_internal * ide  = (struct ide_internal *)(ide_dev->private_data);  
+    struct ide_channel * channel = &(ide->channels[channel_num]);
+    struct ide_drive * drive = &(channel->drives[drive_num]);
+    
+    if (drive->drive_type == IDE_NONE) {
+       return -1;
+    }
+
+    *cylinders = drive->num_cylinders;
+    *heads = drive->num_heads;
+    *sectors = drive->num_sectors;
+
+    return 0;
+}
+
+
 
 
 int v3_ide_register_cdrom(struct vm_device * ide_dev, 
@@ -1363,6 +1589,11 @@ int v3_ide_register_cdrom(struct vm_device * ide_dev,
 
     drive->cd_ops = ops;
 
+    if (ide->ide_pci) {
+       // Hardcode this for now, but its not a good idea....
+       ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80;
+    }
+
     drive->private_data = private_data;
 
     return 0;
@@ -1400,6 +1631,18 @@ int v3_ide_register_harddisk(struct vm_device * ide_dev,
 
     drive->hd_ops = ops;
 
+    /* this is something of a hack... */
+    drive->num_sectors = 63;
+    drive->num_heads = 16;
+    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....
+       ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80;
+    }
+
+
+
     drive->private_data = private_data;
 
     return 0;