X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=197d90370a53958142c5afe03ae5c83cecbcfaf7;hp=43858a45340a8e0ab1a79db74b28edf573b616ce;hb=6661dd1d2aa547ae248e816dcd4201bcbcb7fee0;hpb=a3843aa9457ed5a02159fd5a83620426b0a0f3fe diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 43858a4..197d903 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -90,7 +90,7 @@ static inline const char * dma_port_to_str(uint16_t port) { } -static const char * ide_dev_type_strs[] = {"HARDDISK", "CDROM", "NONE"}; +static const char * ide_dev_type_strs[] = {"NONE", "HARDDISK", "CDROM" }; static inline const char * device_type_to_str(v3_ide_dev_type_t type) { @@ -105,13 +105,13 @@ static inline const char * device_type_to_str(v3_ide_dev_type_t type) { struct ide_cd_state { struct atapi_sense_data sense; - uint_t current_lba; + uint8_t atapi_cmd; struct atapi_error_recovery err_recovery; }; struct ide_hd_state { - + int accessed; }; struct ide_drive { @@ -139,6 +139,7 @@ struct ide_drive { // calculated for easy access uint_t transfer_length; + uint64_t current_lba; // We have a local data buffer that we use for IO port accesses uint8_t data_buf[DATA_BUFFER_SIZE]; @@ -154,24 +155,23 @@ struct ide_drive { union { uint8_t sector_num; // 0x1f3,0x173 uint8_t lba0; - }; + } __attribute__((packed)); union { uint16_t cylinder; uint16_t lba12; - - + struct { uint8_t cylinder_low; // 0x1f4,0x174 uint8_t cylinder_high; // 0x1f5,0x175 } __attribute__((packed)); - + struct { uint8_t lba1; uint8_t lba2; } __attribute__((packed)); - - + + // The transfer length requested by the CPU uint16_t req_len; } __attribute__((packed)); @@ -216,6 +216,10 @@ struct ide_internal { + + +/* Utility functions */ + static inline uint16_t be_to_le_16(const uint16_t val) { uint8_t * buf = (uint8_t *)&val; return (buf[0] << 8) | (buf[1]) ; @@ -265,6 +269,7 @@ 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); @@ -277,11 +282,14 @@ static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) static void drive_reset(struct ide_drive * drive) { drive->sector_count = 0x01; drive->sector_num = 0x01; + + PrintDebug("Resetting drive %s\n", drive->model); if (drive->drive_type == IDE_CDROM) { drive->cylinder = 0xeb14; } else { drive->cylinder = 0x0000; + //drive->hd_state.accessed = 0; } @@ -326,11 +334,19 @@ static void ide_abort_command(struct vm_device * dev, struct ide_channel * chann } -// Include the ATAPI interface handlers + + + + +/* ATAPI functions */ #include "atapi.h" +/* ATA functions */ +#include "ata.h" + +/* IO Operations */ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); struct ide_dma_prd prd_entry; @@ -560,7 +576,39 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de channel->cmd_reg = *(uint8_t *)src; switch (channel->cmd_reg) { - + + case 0xa1: // ATAPI Identify Device Packet + if (drive->drive_type != IDE_CDROM) { + drive_reset(drive); + + // JRL: Should we abort here? + ide_abort_command(dev, channel); + } else { + + atapi_identify_device(drive); + + channel->error_reg.val = 0; + channel->status.val = 0x58; // ready, data_req, seek_complete + + ide_raise_irq(dev, channel); + } + break; + case 0xec: // Identify Device + if (drive->drive_type != IDE_DISK) { + drive_reset(drive); + + // JRL: Should we abort here? + ide_abort_command(dev, channel); + } else { + ata_identify_device(drive); + + channel->error_reg.val = 0; + channel->status.val = 0x58; + + ide_raise_irq(dev, channel); + } + break; + case 0xa0: // ATAPI Command Packet if (drive->drive_type != IDE_CDROM) { ide_abort_command(dev, channel); @@ -578,26 +626,21 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de drive->transfer_index = 0; break; - case 0xa1: // ATAPI Identify Device Packet - atapi_identify_device(drive); - channel->error_reg.val = 0; - channel->status.val = 0x58; // ready, data_req, seek_complete - - ide_raise_irq(dev, channel); + case 0x20: // Read Sectors with Retry + case 0x21: // Read Sectors without Retry + if (ata_read_sectors(dev, channel) == -1) { + PrintError("Error reading sectors\n"); + return -1; + } break; - case 0xec: // Identify Device - if (drive->drive_type != IDE_DISK) { - drive_reset(drive); - // JRL: Should we abort here? - ide_abort_command(dev, channel); - } else { - PrintError("IDE Disks currently not implemented\n"); + case 0x24: // Read Sectors Extended + if (ata_read_sectors_ext(dev, channel) == -1) { + PrintError("Error reading extended sectors\n"); return -1; } 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) @@ -614,6 +657,7 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de ide_raise_irq(dev, channel); break; + default: PrintError("Unimplemented IDE command (%x)\n", channel->cmd_reg); return -1; @@ -658,15 +702,70 @@ static int write_data_port(ushort_t port, void * src, uint_t length, struct vm_d static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) { - PrintError("Harddrive data port read not implemented\n"); - return -1; + struct ide_drive * drive = get_selected_drive(channel); + int data_offset = drive->transfer_index % IDE_SECTOR_SIZE; + + + + if (drive->transfer_index >= drive->transfer_length) { + PrintError("Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n", + drive->transfer_length, drive->transfer_index, + drive->transfer_index + length); + return -1; + } + + + if ((data_offset == 0) && (drive->transfer_index > 0)) { + drive->current_lba++; + + if (ata_read(dev, channel) == -1) { + PrintError("Could not read next disk sector\n"); + return -1; + } + } + + /* + PrintDebug("Reading HD Data (Val=%x), (len=%d) (offset=%d)\n", + *(uint32_t *)(drive->data_buf + data_offset), + length, data_offset); + */ + memcpy(dst, drive->data_buf + data_offset, length); + + drive->transfer_index += length; + + if ((drive->transfer_index % IDE_SECTOR_SIZE) == 0) { + if (drive->transfer_index < drive->transfer_length) { + // An increment is complete, but there is still more data to be transferred... + PrintDebug("Integral Complete, still transferring more sectors\n"); + channel->status.data_req = 1; + + drive->irq_flags.c_d = 0; + } else { + PrintDebug("Final Sector Transferred\n"); + // This was the final read of the request + channel->status.data_req = 0; + + + drive->irq_flags.c_d = 1; + drive->irq_flags.rel = 0; + } + + channel->status.ready = 1; + drive->irq_flags.io_dir = 1; + channel->status.busy = 0; + + ide_raise_irq(dev, channel); + } + + + return length; } static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); - int data_offset = drive->transfer_index % DATA_BUFFER_SIZE; + int data_offset = drive->transfer_index % ATAPI_BLOCK_SIZE; int req_offset = drive->transfer_index % drive->req_len; if (drive->cd_state.atapi_cmd != 0x28) { @@ -683,14 +782,8 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st if ((data_offset == 0) && (drive->transfer_index > 0)) { - - if (drive->drive_type == IDE_CDROM) { - if (atapi_update_data_buf(dev, channel) == -1) { - PrintError("Could not update CDROM data buffer\n"); - return -1; - } - } else { - PrintError("IDE Harddrives not implemented\n"); + if (atapi_update_data_buf(dev, channel) == -1) { + PrintError("Could not update CDROM data buffer\n"); return -1; } } @@ -699,6 +792,8 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st drive->transfer_index += length; + + // Should the req_offset be recalculated here????? if ((req_offset == 0) && (drive->transfer_index > 0)) { if (drive->transfer_index < drive->transfer_length) { // An increment is complete, but there is still more data to be transferred... @@ -817,21 +912,25 @@ static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_de case PRI_SECT_CNT_PORT: case SEC_SECT_CNT_PORT: - drive->sector_count = *(uint8_t *)src; + channel->drives[0].sector_count = *(uint8_t *)src; + channel->drives[1].sector_count = *(uint8_t *)src; break; case PRI_SECT_NUM_PORT: case SEC_SECT_NUM_PORT: - drive->sector_num = *(uint8_t *)src; - + channel->drives[0].sector_num = *(uint8_t *)src; + channel->drives[1].sector_num = *(uint8_t *)src; + break; case PRI_CYL_LOW_PORT: case SEC_CYL_LOW_PORT: - drive->cylinder_low = *(uint8_t *)src; + channel->drives[0].cylinder_low = *(uint8_t *)src; + channel->drives[1].cylinder_low = *(uint8_t *)src; break; case PRI_CYL_HIGH_PORT: case SEC_CYL_HIGH_PORT: - drive->cylinder_high = *(uint8_t *)src; + channel->drives[0].cylinder_high = *(uint8_t *)src; + channel->drives[1].cylinder_high = *(uint8_t *)src; break; case PRI_DRV_SEL_PORT: @@ -962,7 +1061,6 @@ static void init_drive(struct ide_drive * drive) { memset(drive->data_buf, 0, sizeof(drive->data_buf)); - drive->private_data = NULL; drive->cd_ops = NULL; } @@ -1228,9 +1326,14 @@ int v3_ide_register_harddisk(struct vm_device * ide_dev, drive->drive_type = IDE_DISK; + drive->hd_state.accessed = 0; + drive->hd_ops = ops; drive->private_data = private_data; return 0; } + + +