#include "ide-types.h"
#include "atapi-types.h"
-#ifndef CONFIG_DEBUG_IDE
+#ifndef V3_CONFIG_DEBUG_IDE
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
};
struct ide_hd_state {
- int accessed;
+ uint32_t accessed;
/* this is the multiple sector transfer size as configured for read/write multiple sectors*/
- uint_t mult_sector_num;
+ uint32_t mult_sector_num;
/* This is the current op sector size:
* for multiple sector ops this equals mult_sector_num
* for standard ops this equals 1
*/
- uint_t cur_sector_num;
+ uint32_t cur_sector_num;
};
struct ide_drive {
char model[41];
// Where we are in the data transfer
- uint_t transfer_index;
+ uint32_t transfer_index;
// the length of a transfer
// calculated for easy access
- uint_t transfer_length;
+ uint32_t transfer_length;
uint64_t current_lba;
struct ide_dma_cmd_reg dma_cmd;
struct ide_dma_status_reg dma_status;
uint32_t dma_prd_addr;
- uint_t dma_tbl_index;
+ uint32_t dma_tbl_index;
};
struct vm_device * pci_bus;
struct pci_device * ide_pci;
+
+ struct v3_vm_info * vm;
};
/* Drive Commands */
-static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) {
+static void ide_raise_irq(struct ide_internal * ide, struct ide_channel * channel) {
if (channel->ctrl_reg.irq_disable == 0) {
// PrintError("Raising IDE Interrupt %d\n", channel->irq);
channel->dma_status.int_gen = 1;
- v3_raise_irq(dev->vm, channel->irq);
+ v3_raise_irq(ide->vm, channel->irq);
}
}
}
-static void ide_abort_command(struct vm_device * dev, struct ide_channel * channel) {
+static void ide_abort_command(struct ide_internal * ide, struct ide_channel * channel) {
channel->status.val = 0x41; // Error + ready
channel->error_reg.val = 0x04; // No idea...
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
}
-static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel);
-static int dma_write(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel);
+static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel);
+static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel);
/* ATAPI functions */
#include "ata.h"
-#ifdef CONFIG_DEBUG_IDE
-static void print_prd_table(struct vm_device * dev, struct ide_channel * channel) {
+#ifdef V3_CONFIG_DEBUG_IDE
+static void print_prd_table(struct ide_internal * ide, struct ide_channel * channel) {
struct ide_dma_prd prd_entry;
int index = 0;
uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index);
int ret;
- ret = v3_read_gpa_memory(&(dev->vm->cores[0]), prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+ ret = v3_read_gpa_memory(&(ide->vm->cores[0]), prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
if (ret != sizeof(struct ide_dma_prd)) {
PrintError("Could not read PRD\n");
}
PrintDebug("\tPRD Addr: %x, PRD Len: %d, EOT: %d\n",
- prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+ prd_entry.base_addr,
+ (prd_entry.size == 0) ? 0x10000 : prd_entry.size,
+ prd_entry.end_of_table);
if (prd_entry.end_of_table) {
break;
#endif
/* IO Operations */
-static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel) {
+static int dma_read(struct guest_info * core, struct ide_internal * ide, 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 = {};
// Read in the data buffer....
// Read a sector/block at a time until the prd entry is full.
-#ifdef CONFIG_DEBUG_IDE
- print_prd_table(dev, channel);
+#ifdef V3_CONFIG_DEBUG_IDE
+ print_prd_table(ide, channel);
#endif
PrintDebug("DMA read for %d bytes\n", bytes_left);
// loop through the PRD data....
- prd_bytes_left = prd_entry.size;
+ if (prd_entry.size == 0) {
+ // a size of 0 means 64k
+ prd_bytes_left = 0x10000;
+ } else {
+ prd_bytes_left = prd_entry.size;
+ }
while (prd_bytes_left > 0) {
bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left;
- if (ata_read(dev, channel, drive->data_buf, 1) == -1) {
+ if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
PrintError("Failed to read next disk sector\n");
return -1;
}
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) {
+ if (atapi_read_chunk(ide, 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");
+ /*
+ PrintError("DMA of command packet\n");
+ PrintError("How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd);
return -1;
+ */
+ int cmd_ret = 0;
+
bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left;
prd_bytes_left = bytes_to_write;
+
+ cmd_ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset,
+ bytes_to_write, drive->data_buf);
+
+ // check cmd_ret
+
+
+ bytes_to_write = 0;
+ prd_bytes_left = 0;
+ drive->transfer_index += bytes_to_write;
+
+ 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(ide, channel);
+
+ return 0;
}
}
channel->dma_status.err = 0;
}
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
return 0;
}
-static int dma_write(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel) {
+static int dma_write(struct guest_info * core, struct ide_internal * ide, 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 = {};
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) {
+ if (ata_write(ide, channel, drive->data_buf, 1) == -1) {
PrintError("Failed to write data to disk\n");
return -1;
}
channel->dma_status.err = 0;
}
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
return 0;
}
#define DMA_CHANNEL_FLAG 0x08
static int write_dma_port(struct guest_info * core, 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);
+ struct ide_internal * ide = (struct ide_internal *)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]);
if (channel->dma_cmd.read == 1) {
// DMA Read
- if (dma_read(core, dev, channel) == -1) {
+ if (dma_read(core, ide, channel) == -1) {
PrintError("Failed DMA Read\n");
return -1;
}
} else {
// DMA write
- if (dma_write(core, dev, channel) == -1) {
+ if (dma_write(core, ide, channel) == -1) {
PrintError("Failed DMA Write\n");
return -1;
}
static int read_dma_port(struct guest_info * core, 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);
+ struct ide_internal * ide = (struct ide_internal *)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]);
-static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+ struct ide_internal * ide = priv_data;
struct ide_channel * channel = get_selected_channel(ide, port);
struct ide_drive * drive = get_selected_drive(channel);
drive_reset(drive);
// JRL: Should we abort here?
- ide_abort_command(dev, channel);
+ ide_abort_command(ide, 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);
+ ide_raise_irq(ide, channel);
}
break;
case 0xec: // Identify Device
drive_reset(drive);
// JRL: Should we abort here?
- ide_abort_command(dev, channel);
+ ide_abort_command(ide, channel);
} else {
ata_identify_device(drive);
channel->error_reg.val = 0;
channel->status.val = 0x58;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
}
break;
case 0xa0: // ATAPI Command Packet
if (drive->drive_type != BLOCK_CDROM) {
- ide_abort_command(dev, channel);
+ ide_abort_command(ide, channel);
}
drive->sector_count = 1;
case 0x21: // Read Sectors without Retry
drive->hd_state.cur_sector_num = 1;
- if (ata_read_sectors(dev, channel) == -1) {
+ if (ata_read_sectors(ide, channel) == -1) {
PrintError("Error reading sectors\n");
return -1;
}
case 0x24: // Read Sectors Extended
drive->hd_state.cur_sector_num = 1;
- if (ata_read_sectors_ext(dev, channel) == -1) {
+ if (ata_read_sectors_ext(ide, channel) == -1) {
PrintError("Error reading extended sectors\n");
return -1;
}
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);
+ if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) {
+ ide_abort_command(ide, channel);
return 0;
}
if (channel->dma_status.active == 1) {
// DMA Read
- if (dma_read(core, dev, channel) == -1) {
+ if (dma_read(core, ide, channel) == -1) {
PrintError("Failed DMA Read\n");
return -1;
}
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);
+ if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) {
+ ide_abort_command(ide, channel);
return 0;
}
if (channel->dma_status.active == 1) {
// DMA Write
- if (dma_write(core, dev, channel) == -1) {
+ if (dma_write(core, ide, channel) == -1) {
PrintError("Failed DMA Write\n");
return -1;
}
case 0x99: // Sleep Now 2
channel->status.val = 0;
channel->status.ready = 1;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
break;
case 0xef: // Set Features
channel->status.ready = 1;
channel->status.seek_complete = 1;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
break;
case 0x91: // Initialize Drive Parameters
channel->status.error = 0;
channel->status.ready = 1;
channel->status.seek_complete = 1;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
break;
case 0xc6: { // Set multiple mode (IDE Block mode)
// This makes the drive transfer multiple sectors before generating an interrupt
uint32_t tmp_sect_num = drive->sector_num; // GCC SUCKS
if (tmp_sect_num > MAX_MULT_SECTORS) {
- ide_abort_command(dev, channel);
+ ide_abort_command(ide, channel);
break;
}
channel->status.ready = 1;
channel->status.error = 0;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
break;
}
+
+ case 0x08: // Reset Device
+ drive_reset(drive);
+ channel->error_reg.val = 0x01;
+ channel->status.busy = 0;
+ channel->status.ready = 1;
+ channel->status.seek_complete = 1;
+ channel->status.write_fault = 0;
+ channel->status.error = 0;
+ break;
+
+ case 0xe5: // Check power mode
+ drive->sector_count = 0xff; /* 0x00=standby, 0x80=idle, 0xff=active or idle */
+ channel->status.busy = 0;
+ channel->status.ready = 1;
+ channel->status.write_fault = 0;
+ channel->status.data_req = 0;
+ channel->status.error = 0;
+ break;
+
case 0xc4: // read multiple sectors
drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num;
default:
}
-static int write_data_port(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_data_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+ struct ide_internal * ide = priv_data;
struct ide_channel * channel = get_selected_channel(ide, port);
struct ide_drive * drive = get_selected_drive(channel);
return -1;
case 0xa0: // ATAPI packet command
- if (atapi_handle_packet(core, dev, channel) == -1) {
+ if (atapi_handle_packet(core, ide, channel) == -1) {
PrintError("Error handling ATAPI packet\n");
return -1;
}
}
-static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
struct ide_drive * drive = get_selected_drive(channel);
int data_offset = drive->transfer_index % HD_SECTOR_SIZE;
if ((data_offset == 0) && (drive->transfer_index > 0)) {
drive->current_lba++;
- if (ata_read(dev, channel, drive->data_buf, 1) == -1) {
+ if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
PrintError("Could not read next disk sector\n");
return -1;
}
drive->irq_flags.io_dir = 1;
channel->status.busy = 0;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
}
-static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
struct ide_drive * drive = get_selected_drive(channel);
int data_offset = drive->transfer_index % ATAPI_BLOCK_SIZE;
- int req_offset = drive->transfer_index % drive->req_len;
+ // int req_offset = drive->transfer_index % drive->req_len;
if (drive->cd_state.atapi_cmd != 0x28) {
PrintDebug("IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len);
+ PrintDebug("IDE: transfer len=%d, transfer idx=%d\n", drive->transfer_length, drive->transfer_index);
}
+
+
if (drive->transfer_index >= drive->transfer_length) {
PrintError("Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n",
drive->transfer_length, drive->transfer_index,
if ((data_offset == 0) && (drive->transfer_index > 0)) {
- if (atapi_update_data_buf(dev, channel) == -1) {
+ if (atapi_update_data_buf(ide, channel) == -1) {
PrintError("Could not update CDROM data buffer\n");
return -1;
}
// Should the req_offset be recalculated here?????
- if ((req_offset == 0) && (drive->transfer_index > 0)) {
+ 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...
drive->irq_flags.c_d = 0;
// Update the request length in the cylinder regs
- if (atapi_update_req_len(dev, channel, drive->transfer_length - drive->transfer_index) == -1) {
+ if (atapi_update_req_len(ide, channel, drive->transfer_length - drive->transfer_index) == -1) {
PrintError("Could not update request length after completed increment\n");
return -1;
}
} else {
// This was the final read of the request
+
+ drive->req_len = 0;
channel->status.data_req = 0;
channel->status.ready = 1;
drive->irq_flags.io_dir = 1;
channel->status.busy = 0;
- ide_raise_irq(dev, channel);
+ ide_raise_irq(ide, channel);
}
return length;
}
-static int read_drive_id( uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_drive_id( uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
struct ide_drive * drive = get_selected_drive(channel);
channel->status.busy = 0;
}
-static int ide_read_data_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int ide_read_data_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+ struct ide_internal * ide = priv_data;
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)) {
- return read_drive_id((uint8_t *)dst, length, dev, channel);
+ return read_drive_id((uint8_t *)dst, length, ide, channel);
}
if (drive->drive_type == BLOCK_CDROM) {
- if (read_cd_data((uint8_t *)dst, length, dev, channel) == -1) {
- PrintError("IDE: Could not read CD Data\n");
+ if (read_cd_data((uint8_t *)dst, length, ide, channel) == -1) {
+ PrintError("IDE: Could not read CD Data (atapi cmd=%x)\n", drive->cd_state.atapi_cmd);
return -1;
}
} else if (drive->drive_type == BLOCK_DISK) {
- if (read_hd_data((uint8_t *)dst, length, dev, channel) == -1) {
+ if (read_hd_data((uint8_t *)dst, length, ide, channel) == -1) {
PrintError("IDE: Could not read HD Data\n");
return -1;
}
return length;
}
-static int write_port_std(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_port_std(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+ struct ide_internal * ide = priv_data;
struct ide_channel * channel = get_selected_channel(ide, port);
struct ide_drive * drive = get_selected_drive(channel);
PrintDebug("Attempting to select a non-present drive\n");
channel->error_reg.abort = 1;
channel->status.error = 1;
+ } else {
+ 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;
}
break;
}
-static int read_port_std(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int read_port_std(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+ struct ide_internal * ide = priv_data;
struct ide_channel * channel = get_selected_channel(ide, port);
struct ide_drive * drive = get_selected_drive(channel);
static int pci_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) {
PrintDebug("PCI Config Update\n");
- /* struct vm_device * dev = (struct vm_device *)private_data;
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+ /*
+ struct ide_internal * ide = (struct ide_internal *)(private_data);
PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line);
*/
return 0;
}
-static int init_ide_state(struct vm_device * dev) {
- struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int init_ide_state(struct ide_internal * ide) {
int i;
/*
-static int ide_free(struct vm_device * dev) {
- // unhook io ports....
-
+static int ide_free(struct ide_internal * ide) {
// deregister from PCI?
+ V3_Free(ide);
+
+ return 0;
+}
+
+#ifdef V3_CONFIG_CHECKPOINT
+
+#include <palacios/vmm_sprintf.h>
+static int ide_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct ide_internal * ide = (struct ide_internal *)private_data;
+ int ch_num = 0;
+ int drive_num = 0;
+ char buf[128];
+
+
+ for (ch_num = 0; ch_num < 2; ch_num++) {
+ struct v3_chkpt_ctx * ch_ctx = NULL;
+ struct ide_channel * ch = &(ide->channels[ch_num]);
+ snprintf(buf, 128, "channel-%d", ch_num);
+ ch_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf);
+
+ v3_chkpt_save_8(ch_ctx, "ERROR", &(ch->error_reg.val));
+ v3_chkpt_save_8(ch_ctx, "FEATURES", &(ch->features.val));
+ v3_chkpt_save_8(ch_ctx, "DRIVE_HEAD", &(ch->drive_head.val));
+ v3_chkpt_save_8(ch_ctx, "STATUS", &(ch->status.val));
+ v3_chkpt_save_8(ch_ctx, "CMD_REG", &(ch->cmd_reg));
+ v3_chkpt_save_8(ch_ctx, "CTRL_REG", &(ch->ctrl_reg.val));
+ v3_chkpt_save_8(ch_ctx, "DMA_CMD", &(ch->dma_cmd.val));
+ v3_chkpt_save_8(ch_ctx, "DMA_STATUS", &(ch->dma_status.val));
+ v3_chkpt_save_32(ch_ctx, "PRD_ADDR", &(ch->dma_prd_addr));
+ v3_chkpt_save_32(ch_ctx, "DMA_TBL_IDX", &(ch->dma_tbl_index));
+
+
+ for (drive_num = 0; drive_num < 2; drive_num++) {
+ struct v3_chkpt_ctx * drive_ctx = NULL;
+ struct ide_drive * drive = &(ch->drives[drive_num]);
+
+ snprintf(buf, 128, "drive-%d-%d", ch_num, drive_num);
+ drive_ctx = v3_chkpt_open_ctx(ctx->chkpt, ch_ctx, buf);
+
+ v3_chkpt_save_8(drive_ctx, "DRIVE_TYPE", &(drive->drive_type));
+ v3_chkpt_save_8(drive_ctx, "SECTOR_COUNT", &(drive->sector_count));
+ v3_chkpt_save_8(drive_ctx, "SECTOR_NUM", &(drive->sector_num));
+ v3_chkpt_save_16(drive_ctx, "CYLINDER", &(drive->cylinder));
+
+ v3_chkpt_save_64(drive_ctx, "CURRENT_LBA", &(drive->current_lba));
+ v3_chkpt_save_32(drive_ctx, "TRANSFER_LENGTH", &(drive->transfer_length));
+ v3_chkpt_save_32(drive_ctx, "TRANSFER_INDEX", &(drive->transfer_index));
+
+ v3_chkpt_save(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+
+
+ /* For now we'll just pack the type specific data at the end... */
+ /* We should probably add a new context here in the future... */
+ if (drive->drive_type == BLOCK_CDROM) {
+ v3_chkpt_save(drive_ctx, "ATAPI_SENSE_DATA", 18, drive->cd_state.sense.buf);
+ v3_chkpt_save_8(drive_ctx, "ATAPI_CMD", &(drive->cd_state.atapi_cmd));
+ v3_chkpt_save(drive_ctx, "ATAPI_ERR_RECOVERY", 12, drive->cd_state.err_recovery.buf);
+ } else if (drive->drive_type == BLOCK_DISK) {
+ v3_chkpt_save_32(drive_ctx, "ACCESSED", &(drive->hd_state.accessed));
+ v3_chkpt_save_32(drive_ctx, "MULT_SECT_NUM", &(drive->hd_state.mult_sector_num));
+ v3_chkpt_save_32(drive_ctx, "CUR_SECT_NUM", &(drive->hd_state.cur_sector_num));
+ }
+ }
+ }
+
+ return 0;
+}
+
+
+
+static int ide_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct ide_internal * ide = (struct ide_internal *)private_data;
+ int ch_num = 0;
+ int drive_num = 0;
+ char buf[128];
+
+
+ for (ch_num = 0; ch_num < 2; ch_num++) {
+ struct v3_chkpt_ctx * ch_ctx = NULL;
+ struct ide_channel * ch = &(ide->channels[ch_num]);
+
+ snprintf(buf, 128, "channel-%d", ch_num);
+ ch_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf);
+
+ v3_chkpt_load_8(ch_ctx, "ERROR", &(ch->error_reg.val));
+ v3_chkpt_load_8(ch_ctx, "FEATURES", &(ch->features.val));
+ v3_chkpt_load_8(ch_ctx, "DRIVE_HEAD", &(ch->drive_head.val));
+ v3_chkpt_load_8(ch_ctx, "STATUS", &(ch->status.val));
+ v3_chkpt_load_8(ch_ctx, "CMD_REG", &(ch->cmd_reg));
+ v3_chkpt_load_8(ch_ctx, "CTRL_REG", &(ch->ctrl_reg.val));
+ v3_chkpt_load_8(ch_ctx, "DMA_CMD", &(ch->dma_cmd.val));
+ v3_chkpt_load_8(ch_ctx, "DMA_STATUS", &(ch->dma_status.val));
+ v3_chkpt_load_32(ch_ctx, "PRD_ADDR", &(ch->dma_prd_addr));
+ v3_chkpt_load_32(ch_ctx, "DMA_TBL_IDX", &(ch->dma_tbl_index));
+
+
+ for (drive_num = 0; drive_num < 2; drive_num++) {
+ struct v3_chkpt_ctx * drive_ctx = NULL;
+ struct ide_drive * drive = &(ch->drives[drive_num]);
+
+ snprintf(buf, 128, "drive-%d-%d", ch_num, drive_num);
+ drive_ctx = v3_chkpt_open_ctx(ctx->chkpt, ch_ctx, buf);
+
+ v3_chkpt_load_8(drive_ctx, "DRIVE_TYPE", &(drive->drive_type));
+ v3_chkpt_load_8(drive_ctx, "SECTOR_COUNT", &(drive->sector_count));
+ v3_chkpt_load_8(drive_ctx, "SECTOR_NUM", &(drive->sector_num));
+ v3_chkpt_load_16(drive_ctx, "CYLINDER", &(drive->cylinder));
+
+ v3_chkpt_load_64(drive_ctx, "CURRENT_LBA", &(drive->current_lba));
+ v3_chkpt_load_32(drive_ctx, "TRANSFER_LENGTH", &(drive->transfer_length));
+ v3_chkpt_load_32(drive_ctx, "TRANSFER_INDEX", &(drive->transfer_index));
+
+ v3_chkpt_load(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+
+
+ /* For now we'll just pack the type specific data at the end... */
+ /* We should probably add a new context here in the future... */
+ if (drive->drive_type == BLOCK_CDROM) {
+ v3_chkpt_load(drive_ctx, "ATAPI_SENSE_DATA", 18, drive->cd_state.sense.buf);
+ v3_chkpt_load_8(drive_ctx, "ATAPI_CMD", &(drive->cd_state.atapi_cmd));
+ v3_chkpt_load(drive_ctx, "ATAPI_ERR_RECOVERY", 12, drive->cd_state.err_recovery.buf);
+ } else if (drive->drive_type == BLOCK_DISK) {
+ v3_chkpt_load_32(drive_ctx, "ACCESSED", &(drive->hd_state.accessed));
+ v3_chkpt_load_32(drive_ctx, "MULT_SECT_NUM", &(drive->hd_state.mult_sector_num));
+ v3_chkpt_load_32(drive_ctx, "CUR_SECT_NUM", &(drive->hd_state.cur_sector_num));
+ }
+ }
+ }
return 0;
}
+
+#endif
+
+
static struct v3_device_ops dev_ops = {
- .free = ide_free,
+ .free = (int (*)(void *))ide_free,
+#ifdef V3_CONFIG_CHECKPOINT
+ .save = ide_save,
+ .load = ide_load
+#endif
};
return -1;
}
- strncpy(drive->model, model_str, sizeof(drive->model) - 1);
-
+ if (model_str != NULL) {
+ strncpy(drive->model, model_str, sizeof(drive->model) - 1);
+ }
+
if (strcasecmp(type_str, "cdrom") == 0) {
drive->drive_type = BLOCK_CDROM;
static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct ide_internal * ide = NULL;
char * dev_id = v3_cfg_val(cfg, "ID");
+ int ret = 0;
PrintDebug("IDE: Initializing IDE\n");
memset(ide, 0, sizeof(struct ide_internal));
-
+ ide->vm = vm;
ide->pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
if (ide->pci_bus != NULL) {
PrintDebug("IDE: Creating IDE bus x 2\n");
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ide);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ide);
- if (v3_attach_device(vm, dev) == -1) {
+ if (dev == NULL) {
PrintError("Could not attach device %s\n", dev_id);
- v3_free_device(dev);
V3_Free(ide);
return -1;
}
- if (init_ide_state(dev) == -1) {
+ if (init_ide_state(ide) == -1) {
PrintError("Failed to initialize IDE state\n");
- v3_detach_device(dev);
+ v3_remove_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);
- v3_dev_hook_io(dev, PRI_FEATURES_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_SECT_CNT_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_SECT_NUM_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_CYL_LOW_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_DRV_SEL_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_CMD_PORT,
- &read_port_std, &write_cmd_port);
-
- v3_dev_hook_io(dev, SEC_DATA_PORT,
- &ide_read_data_port, &write_data_port);
- v3_dev_hook_io(dev, SEC_FEATURES_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_SECT_CNT_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_SECT_NUM_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_CYL_LOW_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_DRV_SEL_PORT,
- &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_CMD_PORT,
- &read_port_std, &write_cmd_port);
+ ret |= v3_dev_hook_io(dev, PRI_DATA_PORT,
+ &ide_read_data_port, &write_data_port);
+ ret |= v3_dev_hook_io(dev, PRI_FEATURES_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_SECT_CNT_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_SECT_NUM_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_CYL_LOW_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_DRV_SEL_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_CMD_PORT,
+ &read_port_std, &write_cmd_port);
+
+ ret |= v3_dev_hook_io(dev, SEC_DATA_PORT,
+ &ide_read_data_port, &write_data_port);
+ ret |= v3_dev_hook_io(dev, SEC_FEATURES_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_SECT_CNT_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_SECT_NUM_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_CYL_LOW_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_DRV_SEL_PORT,
+ &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_CMD_PORT,
+ &read_port_std, &write_cmd_port);
- v3_dev_hook_io(dev, PRI_CTRL_PORT,
- &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_CTRL_PORT,
+ &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_CTRL_PORT,
- &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_CTRL_PORT,
+ &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, SEC_ADDR_REG_PORT,
- &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, SEC_ADDR_REG_PORT,
+ &read_port_std, &write_port_std);
- v3_dev_hook_io(dev, PRI_ADDR_REG_PORT,
- &read_port_std, &write_port_std);
+ ret |= v3_dev_hook_io(dev, PRI_ADDR_REG_PORT,
+ &read_port_std, &write_port_std);
+ if (ret != 0) {
+ PrintError("Error hooking IDE IO port\n");
+ v3_remove_device(dev);
+ return -1;
+ }
if (ide->pci_bus) {
bars[4].io_read = read_dma_port;
bars[4].io_write = write_dma_port;
- bars[4].private_data = dev;
+ bars[4].private_data = ide;
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);
+ pci_config_update, NULL, NULL, ide);
if (pci_dev == NULL) {
PrintError("Failed to register IDE BUS %d with PCI\n", i);
+ v3_remove_device(dev);
return -1;
}
if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) {
PrintError("Could not register %s as frontend\n", dev_id);
- v3_detach_device(dev);
+ v3_remove_device(dev);
return -1;
}
-int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_num,
+int v3_ide_get_geometry(void * ide_data, 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_internal * ide = ide_data;
struct ide_channel * channel = &(ide->channels[channel_num]);
struct ide_drive * drive = &(channel->drives[drive_num]);
