X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=7b13e5b6506d5fa3c51033f932f3a6d0b4c655b7;hp=60be9de2de0ea7f98688cb37759a3d5e2aea922d;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=942df9bb1e2570764d24c74f797247536639502e diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 60be9de..7b13e5b 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -18,15 +18,15 @@ */ #include +#include #include #include #include #include -#include #include "ide-types.h" #include "atapi-types.h" -#ifndef DEBUG_IDE +#ifndef CONFIG_DEBUG_IDE #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -63,6 +63,10 @@ #define DATA_BUFFER_SIZE 2048 +#define ATAPI_BLOCK_SIZE 2048 +#define HD_SECTOR_SIZE 512 + + static const char * ide_pri_port_strs[] = {"PRI_DATA", "PRI_FEATURES", "PRI_SECT_CNT", "PRI_SECT_NUM", "PRI_CYL_LOW", "PRI_CYL_HIGH", "PRI_DRV_SEL", "PRI_CMD", "PRI_CTRL", "PRI_ADDR_REG"}; @@ -76,6 +80,7 @@ static const char * ide_dma_port_strs[] = {"DMA_CMD", NULL, "DMA_STATUS", NULL, "DMA_PRD0", "DMA_PRD1", "DMA_PRD2", "DMA_PRD3"}; +typedef enum {BLOCK_NONE, BLOCK_DISK, BLOCK_CDROM} v3_block_type_t; static inline const char * io_port_to_str(uint16_t port) { if ((port >= PRI_DATA_PORT) && (port <= PRI_CMD_PORT)) { @@ -122,11 +127,7 @@ struct ide_drive { v3_block_type_t drive_type; - union { - struct v3_cd_ops * cd_ops; - struct v3_hd_ops * hd_ops; - }; - + struct v3_dev_blk_ops * ops; union { struct ide_cd_state cd_state; @@ -280,9 +281,9 @@ static inline int is_lba_enabled(struct ide_channel * channel) { /* Drive Commands */ static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) { if (channel->ctrl_reg.irq_disable == 0) { - PrintDebug("Raising IDE Interrupt %d\n", channel->irq); - channel->dma_status.int_gen = 1; - v3_raise_irq(dev->vm, channel->irq); + // PrintError("Raising IDE Interrupt %d\n", channel->irq); + channel->dma_status.int_gen = 1; + v3_raise_irq(dev->vm, channel->irq); } } @@ -353,7 +354,7 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel); #include "ata.h" -#ifdef DEBUG_IDE +#ifdef CONFIG_DEBUG_IDE static void print_prd_table(struct vm_device * dev, struct ide_channel * channel) { struct ide_dma_prd prd_entry; int index = 0; @@ -395,7 +396,7 @@ 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 +#ifdef CONFIG_DEBUG_IDE print_prd_table(dev, channel); #endif @@ -626,7 +627,8 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { #define DMA_CHANNEL_FLAG 0x08 -static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int write_dma_port(ushort_t port, void * src, uint_t length, void * private_data) { + struct vm_device * dev = (struct vm_device *)private_data; 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; @@ -708,7 +710,8 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_de } -static int read_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { +static int read_dma_port(ushort_t port, void * dst, uint_t length, void * private_data) { + struct vm_device * dev = (struct vm_device *)private_data; 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; @@ -1157,7 +1160,7 @@ static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct v struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); - // PrintDebug("IDE: Reading Data Port %x (len=%d)\n", port, length); + PrintDebug("IDE: Reading Data Port %x (len=%d)\n", port, length); if ((channel->cmd_reg == 0xec) || (channel->cmd_reg == 0xa1)) { @@ -1370,7 +1373,7 @@ static void init_drive(struct ide_drive * drive) { drive->private_data = NULL; - drive->cd_ops = NULL; + drive->ops = NULL; } static void init_channel(struct ide_channel * channel) { @@ -1395,7 +1398,7 @@ static void init_channel(struct ide_channel * channel) { } -static int pci_config_update(struct pci_device * pci_dev, uint_t reg_num, int length) { +static int pci_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) { PrintDebug("PCI Config Update\n"); PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", pci_dev->name, pci_dev->config_header.intr_line); @@ -1440,28 +1443,91 @@ static struct v3_device_ops dev_ops = { -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); + +static int connect_fn(struct guest_info * info, + void * frontend_data, + struct v3_dev_blk_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data) { + struct ide_internal * ide = (struct ide_internal *)(frontend_data); + struct ide_channel * channel = NULL; + struct ide_drive * drive = NULL; + + char * bus_str = v3_cfg_val(cfg, "bus_num"); + char * drive_str = v3_cfg_val(cfg, "drive_num"); + char * type_str = v3_cfg_val(cfg, "type"); + char * model_str = v3_cfg_val(cfg, "model"); + uint_t bus_num = 0; + uint_t drive_num = 0; + + + if ((!type_str) || (!drive_str) || (!bus_str)) { + PrintError("Incomplete IDE Configuration\n"); + return -1; + } + + bus_num = atoi(bus_str); + drive_num = atoi(drive_str); + + channel = &(ide->channels[bus_num]); + drive = &(channel->drives[drive_num]); + + if (drive->drive_type != BLOCK_NONE) { + PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); + return -1; + } + + strncpy(drive->model, model_str, sizeof(drive->model) - 1); + if (strcasecmp(type_str, "cdrom") == 0) { + drive->drive_type = BLOCK_CDROM; + + while (strlen((char *)(drive->model)) < 40) { + strcat((char*)(drive->model), " "); + } + + } else if (strcasecmp(type_str, "hd") == 0) { + drive->drive_type = BLOCK_DISK; + + drive->hd_state.accessed = 0; + drive->hd_state.mult_sector_num = 1; + + drive->num_sectors = 63; + drive->num_heads = 16; + drive->num_cylinders = ops->get_capacity(private_data) / (drive->num_sectors * drive->num_heads); + } else { + PrintError("invalid IDE drive type\n"); + return -1; + } + + + drive->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; +} + + + + +static int ide_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { + struct ide_internal * ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal)); + char * name = v3_cfg_val(cfg, "name"); + 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, v3_cfg_val(cfg, "bus")); - 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 (ide->pci_bus != NULL) { + struct vm_device * southbridge = v3_find_dev(vm, v3_cfg_val(cfg, "controller")); if (!southbridge) { PrintError("Could not find southbridge\n"); @@ -1471,17 +1537,15 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { 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); + struct vm_device * dev = v3_allocate_device(name, &dev_ops, ide); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "IDE"); + PrintError("Could not attach device %s\n", name); return -1; } - if (init_ide_state(dev) == -1) { PrintError("Failed to initialize IDE state\n"); return -1; @@ -1554,12 +1618,14 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { } bars[4].type = PCI_BAR_IO; - bars[4].default_base_port = PRI_DEFAULT_DMA_PORT; + // bars[4].default_base_port = PRI_DEFAULT_DMA_PORT; + bars[4].default_base_port = -1; bars[4].num_ports = 16; bars[4].io_read = read_dma_port; bars[4].io_write = write_dma_port; - + bars[4].private_data = dev; + 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); @@ -1591,6 +1657,12 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { } + if (v3_dev_add_blk_frontend(vm, name, connect_fn, (void *)ide) == -1) { + PrintError("Could not register %s as frontend\n", name); + return -1; + } + + PrintDebug("IDE Initialized\n"); return 0; @@ -1602,11 +1674,6 @@ device_register("IDE", ide_init) - - - - - 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) { @@ -1627,98 +1694,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n - -int v3_ide_register_cdrom(struct vm_device * ide_dev, - uint_t bus_num, - uint_t drive_num, - char * dev_name, - struct v3_cd_ops * ops, - void * private_data) { - - struct ide_internal * ide = (struct ide_internal *)(ide_dev->private_data); - struct ide_channel * channel = NULL; - struct ide_drive * drive = NULL; - - V3_ASSERT((bus_num >= 0) && (bus_num < 2)); - V3_ASSERT((drive_num >= 0) && (drive_num < 2)); - - channel = &(ide->channels[bus_num]); - drive = &(channel->drives[drive_num]); - - if (drive->drive_type != BLOCK_NONE) { - PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); - return -1; - } - - strncpy(drive->model, dev_name, sizeof(drive->model) - 1); - - while (strlen((char *)(drive->model)) < 40) { - strcat((char*)(drive->model), " "); - } - - - drive->drive_type = BLOCK_CDROM; - - 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; -} - - -int v3_ide_register_harddisk(struct vm_device * ide_dev, - uint_t bus_num, - uint_t drive_num, - char * dev_name, - struct v3_hd_ops * ops, - void * private_data) { - - struct ide_internal * ide = (struct ide_internal *)(ide_dev->private_data); - struct ide_channel * channel = NULL; - struct ide_drive * drive = NULL; - - V3_ASSERT((bus_num >= 0) && (bus_num < 2)); - V3_ASSERT((drive_num >= 0) && (drive_num < 2)); - - channel = &(ide->channels[bus_num]); - drive = &(channel->drives[drive_num]); - - if (drive->drive_type != BLOCK_NONE) { - PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); - return -1; - } - - strncpy(drive->model, dev_name, sizeof(drive->model) - 1); - - drive->drive_type = BLOCK_DISK; - - drive->hd_state.accessed = 0; - drive->hd_state.mult_sector_num = 1; - - 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; -} - - -