// Control Registers
struct ide_ctrl_reg ctrl_reg; // [write] 0x3f6,0x376
- struct ide_dma_cmd_reg dma_cmd;
- struct ide_dma_status_reg dma_status;
- uint32_t dma_prd_addr;
+ union {
+ uint8_t dma_ports[8];
+ struct {
+ struct ide_dma_cmd_reg dma_cmd;
+ uint8_t rsvd1;
+ struct ide_dma_status_reg dma_status;
+ uint8_t rsvd2;
+ uint32_t dma_prd_addr;
+ } __attribute__((packed));
+ } __attribute__((packed));
+
uint32_t dma_tbl_index;
};
/* Drive Commands */
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);
+
+ //PrintError(info->vm_info, info, "Raising IDE Interrupt %d\n", channel->irq);
+
channel->dma_status.int_gen = 1;
v3_raise_irq(ide->vm, channel->irq);
}
drive->sector_count = 0x01;
drive->sector_num = 0x01;
- PrintDebug("Resetting drive %s\n", drive->model);
+ PrintDebug(VM_NONE,VCORE_NONE, "Resetting drive %s\n", drive->model);
if (drive->drive_type == BLOCK_CDROM) {
drive->cylinder = 0xeb14;
#include "ata.h"
-#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;
- PrintDebug("Dumping PRD table\n");
+ V3_Print(VM_NONE, VCORE_NONE,"Dumping PRD table\n");
while (1) {
uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index);
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");
+ PrintError(VM_NONE, VCORE_NONE, "Could not read PRD\n");
return;
}
- PrintDebug("\tPRD Addr: %x, PRD Len: %d, EOT: %d\n",
+ V3_Print(VM_NONE, VCORE_NONE,"\tPRD Addr: %x, PRD Len: %d, EOT: %d\n",
prd_entry.base_addr,
(prd_entry.size == 0) ? 0x10000 : prd_entry.size,
prd_entry.end_of_table);
return;
}
-#endif
+
/* IO Operations */
static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel) {
print_prd_table(ide, channel);
#endif
- PrintDebug("DMA read for %d bytes\n", bytes_left);
+ PrintDebug(core->vm_info, core, "DMA read for %d bytes\n", bytes_left);
// Loop through the disk data
while (bytes_left > 0) {
uint_t prd_offset = 0;
int ret;
- PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
+ PrintDebug(core->vm_info, core, "PRD table address = %x\n", channel->dma_prd_addr);
ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
if (ret != sizeof(struct ide_dma_prd)) {
- PrintError("Could not read PRD\n");
+ PrintError(core->vm_info, core, "Could not read PRD\n");
return -1;
}
- PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n",
+ PrintDebug(core->vm_info, core, "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....
if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
- PrintError("Failed to read next disk sector\n");
+ PrintError(core->vm_info, core, "Failed to read next disk sector\n");
return -1;
}
} else if (drive->drive_type == BLOCK_CDROM) {
bytes_to_write = (prd_bytes_left > ATAPI_BLOCK_SIZE) ? ATAPI_BLOCK_SIZE : prd_bytes_left;
if (atapi_read_chunk(ide, channel) == -1) {
- PrintError("Failed to read next disk sector\n");
+ PrintError(core->vm_info, core, "Failed to read next disk sector\n");
return -1;
}
} else {
/*
- PrintError("DMA of command packet\n");
- PrintError("How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd);
+ PrintError(core->vm_info, core, "How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd);
return -1;
*/
int cmd_ret = 0;
+ //V3_Print(core->vm_info, core, "DMA of command packet\n");
+
bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left;
prd_bytes_left = bytes_to_write;
+
+ // V3_Print(core->vm_info, core, "Writing ATAPI cmd OP DMA (cmd=%x) (len=%d)\n", drive->cd_state.atapi_cmd, prd_bytes_left);
cmd_ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset,
bytes_to_write, drive->data_buf);
}
}
- PrintDebug("Writing DMA data to guest Memory ptr=%p, len=%d\n",
+ PrintDebug(core->vm_info, core, "Writing DMA data to guest Memory ptr=%p, len=%d\n",
(void *)(addr_t)(prd_entry.base_addr + prd_offset), bytes_to_write);
drive->current_lba++;
ret = v3_write_gpa_memory(core, 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);
+ PrintError(core->vm_info, core, "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);
+ PrintDebug(core->vm_info, core, "\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;
if (drive->drive_type == BLOCK_DISK) {
if (drive->transfer_index % HD_SECTOR_SIZE) {
- PrintError("We currently don't handle sectors that span PRD descriptors\n");
+ PrintError(core->vm_info, core, "We currently don't handle sectors that span PRD descriptors\n");
return -1;
}
} else if (drive->drive_type == BLOCK_CDROM) {
if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) {
if (drive->transfer_index % ATAPI_BLOCK_SIZE) {
- PrintError("We currently don't handle ATAPI BLOCKS that span PRD descriptors\n");
- PrintError("transfer_index=%d, transfer_length=%d\n",
+ PrintError(core->vm_info, core, "We currently don't handle ATAPI BLOCKS that span PRD descriptors\n");
+ PrintError(core->vm_info, core, "transfer_index=%d, transfer_length=%d\n",
drive->transfer_index, drive->transfer_length);
return -1;
}
if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) {
- PrintError("DMA table not large enough for data transfer...\n");
+ PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n");
return -1;
}
}
uint_t bytes_left = drive->transfer_length;
- PrintDebug("DMA write from %d bytes\n", bytes_left);
+ PrintDebug(core->vm_info, core, "DMA write from %d bytes\n", bytes_left);
// Loop through disk data
while (bytes_left > 0) {
uint_t prd_offset = 0;
int ret;
- PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr);
+ PrintDebug(core->vm_info, core, "PRD Table address = %x\n", channel->dma_prd_addr);
ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
if (ret != sizeof(struct ide_dma_prd)) {
- PrintError("Could not read PRD\n");
+ PrintError(core->vm_info, core, "Could not read PRD\n");
return -1;
}
- PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n",
+ PrintDebug(core->vm_info, core, "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;
+
+ 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) {
uint_t bytes_to_write = 0;
ret = v3_read_gpa_memory(core, 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);
+ PrintError(core->vm_info, core, "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);
+ PrintDebug(core->vm_info, core, "\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left);
if (ata_write(ide, channel, drive->data_buf, 1) == -1) {
- PrintError("Failed to write data to disk\n");
+ PrintError(core->vm_info, core, "Failed to write data to disk\n");
return -1;
}
channel->dma_tbl_index++;
if (drive->transfer_index % HD_SECTOR_SIZE) {
- PrintError("We currently don't handle sectors that span PRD descriptors\n");
+ PrintError(core->vm_info, core, "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");
+ PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n");
+ PrintError(core->vm_info, core, "\t(bytes_left=%u) (transfer_length=%u)...\n",
+ bytes_left, drive->transfer_length);
+ PrintError(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n",
+ prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+
+ print_prd_table(ide, channel);
return -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",
+ PrintDebug(core->vm_info, core, "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) {
if (channel->dma_cmd.read == 1) {
// DMA Read
if (dma_read(core, ide, channel) == -1) {
- PrintError("Failed DMA Read\n");
+ PrintError(core->vm_info, core, "Failed DMA Read\n");
return -1;
}
} else {
// DMA write
if (dma_write(core, ide, channel) == -1) {
- PrintError("Failed DMA Write\n");
+ PrintError(core->vm_info, core, "Failed DMA Write\n");
return -1;
}
}
uint8_t val = *(uint8_t *)src;
if (length != 1) {
- PrintError("Invalid read length for DMA status port\n");
+ PrintError(core->vm_info, core, "Invalid read length for DMA status port\n");
return -1;
}
int i = 0;
if (addr_index + length > 4) {
- PrintError("DMA Port space overrun port=%x len=%d\n", port_offset, length);
+ PrintError(core->vm_info, core, "DMA Port space overrun port=%x len=%d\n", port_offset, length);
return -1;
}
addr_buf[addr_index + i] = *((uint8_t *)src + i);
}
- PrintDebug("Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr);
+ PrintDebug(core->vm_info, core, "Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr);
break;
}
default:
- PrintError("IDE: Invalid DMA Port (%s)\n", dma_port_to_str(port_offset));
- return -1;
+ PrintError(core->vm_info, core, "IDE: Invalid DMA Port (%d) (%s)\n", port, dma_port_to_str(port_offset));
+ break;
}
return length;
}
-static int read_dma_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * private_data) {
+static int read_dma_port(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * 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]);
- PrintDebug("Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag);
-
- switch (port_offset) {
- case DMA_CMD_PORT:
- *(uint8_t *)dst = channel->dma_cmd.val;
- break;
-
- case DMA_STATUS_PORT:
- if (length != 1) {
- PrintError("Invalid read length for DMA status port\n");
- return -1;
- }
-
- *(uint8_t *)dst = channel->dma_status.val;
- break;
-
- case DMA_PRD_PORT0:
- case DMA_PRD_PORT1:
- case DMA_PRD_PORT2:
- case DMA_PRD_PORT3: {
- uint_t addr_index = port_offset & 0x3;
- uint8_t * addr_buf = (uint8_t *)&(channel->dma_prd_addr);
- int i = 0;
-
- if (addr_index + length > 4) {
- PrintError("DMA Port space overrun port=%x len=%d\n", port_offset, length);
- return -1;
- }
-
- for (i = 0; i < length; i++) {
- *((uint8_t *)dst + i) = addr_buf[addr_index + i];
- }
+ PrintDebug(core->vm_info, core, "Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag);
- break;
- }
- default:
- PrintError("IDE: Invalid DMA Port (%s)\n", dma_port_to_str(port_offset));
- return -1;
+ if (port_offset + length > 16) {
+ PrintError(core->vm_info, core, "DMA Port Read: Port overrun (port_offset=%d, length=%d)\n", port_offset, length);
+ return -1;
}
- PrintDebug("\tval=%x (len=%d)\n", *(uint32_t *)dst, length);
+ memcpy(dst, channel->dma_ports + port_offset, length);
+
+ PrintDebug(core->vm_info, core, "\tval=%x (len=%d)\n", *(uint32_t *)dst, length);
return length;
}
struct ide_drive * drive = get_selected_drive(channel);
if (length != 1) {
- PrintError("Invalid Write Length on IDE command Port %x\n", port);
+ PrintError(core->vm_info, core, "Invalid Write Length on IDE command Port %x\n", port);
return -1;
}
- PrintDebug("IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src);
+ PrintDebug(core->vm_info, core, "IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src);
channel->cmd_reg = *(uint8_t *)src;
drive->hd_state.cur_sector_num = 1;
if (ata_read_sectors(ide, channel) == -1) {
- PrintError("Error reading sectors\n");
+ PrintError(core->vm_info, core, "Error reading sectors\n");
return -1;
}
break;
drive->hd_state.cur_sector_num = 1;
if (ata_read_sectors_ext(ide, channel) == -1) {
- PrintError("Error reading extended sectors\n");
+ PrintError(core->vm_info, core, "Error reading extended sectors\n");
return -1;
}
break;
if (channel->dma_status.active == 1) {
// DMA Read
if (dma_read(core, ide, channel) == -1) {
- PrintError("Failed DMA Read\n");
+ PrintError(core->vm_info, core, "Failed DMA Read\n");
return -1;
}
}
if (channel->dma_status.active == 1) {
// DMA Write
if (dma_write(core, ide, channel) == -1) {
- PrintError("Failed DMA Write\n");
+ PrintError(core->vm_info, core, "Failed DMA Write\n");
return -1;
}
}
case 0xc4: // read multiple sectors
drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num;
default:
- PrintError("Unimplemented IDE command (%x)\n", channel->cmd_reg);
+ PrintError(core->vm_info, core, "Unimplemented IDE command (%x)\n", channel->cmd_reg);
return -1;
}
struct ide_channel * channel = get_selected_channel(ide, port);
struct ide_drive * drive = get_selected_drive(channel);
- // PrintDebug("IDE: Writing Data Port %x (val=%x, len=%d)\n",
+ // PrintDebug(core->vm_info, core, "IDE: Writing Data Port %x (val=%x, len=%d)\n",
// port, *(uint32_t *)src, length);
memcpy(drive->data_buf + drive->transfer_index, src, length);
if (drive->transfer_index >= drive->transfer_length) {
switch (channel->cmd_reg) {
case 0x30: // Write Sectors
- PrintError("Writing Data not yet implemented\n");
+ PrintError(core->vm_info, core, "Writing Data not yet implemented\n");
return -1;
case 0xa0: // ATAPI packet command
if (atapi_handle_packet(core, ide, channel) == -1) {
- PrintError("Error handling ATAPI packet\n");
+ PrintError(core->vm_info, core, "Error handling ATAPI packet\n");
return -1;
}
break;
default:
- PrintError("Unhandld IDE Command %x\n", channel->cmd_reg);
+ PrintError(core->vm_info, core, "Unhandld IDE Command %x\n", channel->cmd_reg);
return -1;
}
}
if (drive->transfer_index >= drive->transfer_length) {
- PrintError("Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n",
+ PrintError(VM_NONE, VCORE_NONE, "Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n",
drive->transfer_length, drive->transfer_index,
drive->transfer_index + length);
return -1;
drive->current_lba++;
if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
- PrintError("Could not read next disk sector\n");
+ PrintError(VM_NONE, VCORE_NONE, "Could not read next disk sector\n");
return -1;
}
}
/*
- PrintDebug("Reading HD Data (Val=%x), (len=%d) (offset=%d)\n",
+ PrintDebug(VM_NONE, VCORE_NONE, "Reading HD Data (Val=%x), (len=%d) (offset=%d)\n",
*(uint32_t *)(drive->data_buf + data_offset),
length, data_offset);
*/
(drive->transfer_index == drive->transfer_length)) {
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");
+ PrintDebug(VM_NONE, VCORE_NONE, "Integral Complete, still transferring more sectors\n");
channel->status.data_req = 1;
drive->irq_flags.c_d = 0;
} else {
- PrintDebug("Final Sector Transferred\n");
+ PrintDebug(VM_NONE, VCORE_NONE, "Final Sector Transferred\n");
// This was the final read of the request
channel->status.data_req = 0;
// 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);
+ PrintDebug(VM_NONE, VCORE_NONE, "IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len);
+ PrintDebug(VM_NONE, VCORE_NONE, "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",
+ PrintError(VM_NONE, VCORE_NONE, "Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n",
drive->transfer_length, drive->transfer_index,
drive->transfer_index + length);
return -1;
if ((data_offset == 0) && (drive->transfer_index > 0)) {
if (atapi_update_data_buf(ide, channel) == -1) {
- PrintError("Could not update CDROM data buffer\n");
+ PrintError(VM_NONE, VCORE_NONE, "Could not update CDROM data buffer\n");
return -1;
}
}
// Update the request length in the cylinder regs
if (atapi_update_req_len(ide, channel, drive->transfer_length - drive->transfer_index) == -1) {
- PrintError("Could not update request length after completed increment\n");
+ PrintError(VM_NONE, VCORE_NONE, "Could not update request length after completed increment\n");
return -1;
}
} else {
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(core->vm_info, core, "IDE: Reading Data Port %x (len=%d)\n", port, length);
if ((channel->cmd_reg == 0xec) ||
(channel->cmd_reg == 0xa1)) {
if (drive->drive_type == BLOCK_CDROM) {
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);
+ PrintError(core->vm_info, core, "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, ide, channel) == -1) {
- PrintError("IDE: Could not read HD Data\n");
+ PrintError(core->vm_info, core, "IDE: Could not read HD Data\n");
return -1;
}
} else {
struct ide_drive * drive = get_selected_drive(channel);
if (length != 1) {
- PrintError("Invalid Write length on IDE port %x\n", port);
+ PrintError(core->vm_info, core, "Invalid Write length on IDE port %x\n", port);
return -1;
}
- PrintDebug("IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src);
+ PrintDebug(core->vm_info, core, "IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src);
switch (port) {
// reset and interrupt enable
// Selecting a non-present device is a no-no
if (drive->drive_type == BLOCK_NONE) {
- PrintDebug("Attempting to select a non-present drive\n");
+ PrintDebug(core->vm_info, core, "Attempting to select a non-present drive\n");
channel->error_reg.abort = 1;
channel->status.error = 1;
} else {
break;
}
default:
- PrintError("IDE: Write to unknown Port %x\n", port);
+ PrintError(core->vm_info, core, "IDE: Write to unknown Port %x\n", port);
return -1;
}
return length;
struct ide_drive * drive = get_selected_drive(channel);
if (length != 1) {
- PrintError("Invalid Read length on IDE port %x\n", port);
+ PrintError(core->vm_info, core, "Invalid Read length on IDE port %x\n", port);
return -1;
}
- PrintDebug("IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port));
+ PrintDebug(core->vm_info, core, "IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port));
if ((port == PRI_ADDR_REG_PORT) ||
(port == SEC_ADDR_REG_PORT)) {
break;
default:
- PrintError("Invalid Port: %x\n", port);
+ PrintError(core->vm_info, core, "Invalid Port: %x\n", port);
return -1;
}
- PrintDebug("\tVal=%x\n", *(uint8_t *)dst);
+ PrintDebug(core->vm_info, core, "\tVal=%x\n", *(uint8_t *)dst);
return length;
}
channel->cmd_reg = 0x00;
channel->ctrl_reg.val = 0x08;
-
channel->dma_cmd.val = 0;
channel->dma_status.val = 0;
channel->dma_prd_addr = 0;
}
-static int pci_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) {
- PrintDebug("PCI Config Update\n");
+static int pci_config_update(struct pci_device * pci_dev, uint32_t reg_num, void * src, uint_t length, void * private_data) {
+ PrintDebug(VM_NONE, VCORE_NONE, "PCI Config Update\n");
/*
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);
+ PrintDebug(VM_NONE, VCORE_NONE, info, "\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line);
*/
return 0;
#ifdef V3_CONFIG_CHECKPOINT
#include <palacios/vmm_sprintf.h>
-static int ide_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+
+static int ide_save_extended(struct v3_chkpt *chkpt, char *id, void * private_data) {
struct ide_internal * ide = (struct ide_internal *)private_data;
+ struct v3_chkpt_ctx *ctx=0;
int ch_num = 0;
int drive_num = 0;
char buf[128];
+ ctx=v3_chkpt_open_ctx(chkpt,id);
+
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Failed to open context for save\n");
+ goto savefailout;
+ }
+
+ // nothing saved yet
+
+ v3_chkpt_close_ctx(ctx);ctx=0;
+
+
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);
+ snprintf(buf, 128, "%s-%d", id, ch_num);
- 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));
+ ctx = v3_chkpt_open_ctx(chkpt, buf);
+
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save channel %d\n",ch_num);
+ goto savefailout;
+ }
+
+ V3_CHKPT_SAVE(ctx, "ERROR", ch->error_reg.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "FEATURES", ch->features.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "DRIVE_HEAD", ch->drive_head.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "STATUS", ch->status.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "CMD_REG", ch->cmd_reg, savefailout);
+ V3_CHKPT_SAVE(ctx, "CTRL_REG", ch->ctrl_reg.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "DMA_CMD", ch->dma_cmd.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "DMA_STATUS", ch->dma_status.val, savefailout);
+ V3_CHKPT_SAVE(ctx, "PRD_ADDR", ch->dma_prd_addr, savefailout);
+ V3_CHKPT_SAVE(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, savefailout);
+ v3_chkpt_close_ctx(ctx); ctx=0;
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);
+ snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num);
+
+ ctx = v3_chkpt_open_ctx(chkpt, 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));
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save drive %d\n",drive_num);
+ goto savefailout;
+ }
- 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(ctx, "DRIVE_TYPE", drive->drive_type, savefailout);
+ V3_CHKPT_SAVE(ctx, "SECTOR_COUNT", drive->sector_count, savefailout);
+ V3_CHKPT_SAVE(ctx, "SECTOR_NUM", drive->sector_num, savefailout);
+ V3_CHKPT_SAVE(ctx, "CYLINDER", drive->cylinder,savefailout);
- v3_chkpt_save(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+ V3_CHKPT_SAVE(ctx, "CURRENT_LBA", drive->current_lba, savefailout);
+ V3_CHKPT_SAVE(ctx, "TRANSFER_LENGTH", drive->transfer_length, savefailout);
+ V3_CHKPT_SAVE(ctx, "TRANSFER_INDEX", drive->transfer_index, savefailout);
+
+ V3_CHKPT_SAVE(ctx, "DATA_BUF", drive->data_buf, savefailout);
/* 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);
+ V3_CHKPT_SAVE(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, savefailout);
+ V3_CHKPT_SAVE(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, savefailout);
+ V3_CHKPT_SAVE(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, savefailout);
} 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));
+ V3_CHKPT_SAVE(ctx, "ACCESSED", drive->hd_state.accessed, savefailout);
+ V3_CHKPT_SAVE(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, savefailout);
+ V3_CHKPT_SAVE(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, savefailout);
+ } else if (drive->drive_type == BLOCK_NONE) {
+ // no drive connected, so no data
+ } else {
+ PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type);
+ goto savefailout;
}
+
+ v3_chkpt_close_ctx(ctx); ctx=0;
}
}
+// goodout:
return 0;
+
+ savefailout:
+ PrintError(VM_NONE, VCORE_NONE, "Failed to save IDE\n");
+ if (ctx) {v3_chkpt_close_ctx(ctx); }
+ return -1;
}
-static int ide_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+static int ide_load_extended(struct v3_chkpt *chkpt, char *id, void * private_data) {
struct ide_internal * ide = (struct ide_internal *)private_data;
+ struct v3_chkpt_ctx *ctx=0;
int ch_num = 0;
int drive_num = 0;
char buf[128];
+ ctx=v3_chkpt_open_ctx(chkpt,id);
+
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Failed to open context for load\n");
+ goto loadfailout;
+ }
+
+ // nothing saved yet
+
+ v3_chkpt_close_ctx(ctx);ctx=0;
+
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);
+ snprintf(buf, 128, "%s-%d", id, ch_num);
- 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));
+ ctx = v3_chkpt_open_ctx(chkpt, buf);
+
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load channel %d\n",ch_num);
+ goto loadfailout;
+ }
+ V3_CHKPT_LOAD(ctx, "ERROR", ch->error_reg.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "FEATURES", ch->features.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "DRIVE_HEAD", ch->drive_head.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "STATUS", ch->status.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "CMD_REG", ch->cmd_reg, loadfailout);
+ V3_CHKPT_LOAD(ctx, "CTRL_REG", ch->ctrl_reg.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "DMA_CMD", ch->dma_cmd.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "DMA_STATUS", ch->dma_status.val, loadfailout);
+ V3_CHKPT_LOAD(ctx, "PRD_ADDR", ch->dma_prd_addr, loadfailout);
+ V3_CHKPT_LOAD(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, loadfailout);
+
+ v3_chkpt_close_ctx(ctx); ctx=0;
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);
+ snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num);
+
+ ctx = v3_chkpt_open_ctx(chkpt, 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));
+ if (!ctx) {
+ PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load drive %d\n",drive_num);
+ goto loadfailout;
+ }
- 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(ctx, "DRIVE_TYPE", drive->drive_type, loadfailout);
+ V3_CHKPT_LOAD(ctx, "SECTOR_COUNT", drive->sector_count, loadfailout);
+ V3_CHKPT_LOAD(ctx, "SECTOR_NUM", drive->sector_num, loadfailout);
+ V3_CHKPT_LOAD(ctx, "CYLINDER", drive->cylinder,loadfailout);
- v3_chkpt_load(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+ V3_CHKPT_LOAD(ctx, "CURRENT_LBA", drive->current_lba, loadfailout);
+ V3_CHKPT_LOAD(ctx, "TRANSFER_LENGTH", drive->transfer_length, loadfailout);
+ V3_CHKPT_LOAD(ctx, "TRANSFER_INDEX", drive->transfer_index, loadfailout);
+ V3_CHKPT_LOAD(ctx, "DATA_BUF", drive->data_buf, loadfailout);
+
/* 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);
+ V3_CHKPT_LOAD(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, loadfailout);
+ V3_CHKPT_LOAD(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, loadfailout);
+ V3_CHKPT_LOAD(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, loadfailout);
} 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));
+ V3_CHKPT_LOAD(ctx, "ACCESSED", drive->hd_state.accessed, loadfailout);
+ V3_CHKPT_LOAD(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, loadfailout);
+ V3_CHKPT_LOAD(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, loadfailout);
+ } else if (drive->drive_type == BLOCK_NONE) {
+ // no drive connected, so no data
+ } else {
+ PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type);
+ goto loadfailout;
}
}
}
-
+// goodout:
return 0;
+
+ loadfailout:
+ PrintError(VM_NONE, VCORE_NONE, "Failed to load IDE\n");
+ if (ctx) {v3_chkpt_close_ctx(ctx); }
+ return -1;
+
}
static struct v3_device_ops dev_ops = {
.free = (int (*)(void *))ide_free,
#ifdef V3_CONFIG_CHECKPOINT
- .save = ide_save,
- .load = ide_load
+ .save_extended = ide_save_extended,
+ .load_extended = ide_load_extended
#endif
-
};
if ((!type_str) || (!drive_str) || (!bus_str)) {
- PrintError("Incomplete IDE Configuration\n");
+ PrintError(vm, VCORE_NONE, "Incomplete IDE Configuration\n");
return -1;
}
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);
+ PrintError(vm, VCORE_NONE, "Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num);
return -1;
}
drive->num_heads = 16;
drive->num_cylinders = (ops->get_capacity(private_data) / HD_SECTOR_SIZE) / (drive->num_sectors * drive->num_heads);
} else {
- PrintError("invalid IDE drive type\n");
+ PrintError(vm, VCORE_NONE, "invalid IDE drive type\n");
return -1;
}
char * dev_id = v3_cfg_val(cfg, "ID");
int ret = 0;
- PrintDebug("IDE: Initializing IDE\n");
+ PrintDebug(vm, VCORE_NONE, "IDE: Initializing IDE\n");
ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));
if (ide == NULL) {
- PrintError("Error allocating IDE state\n");
+ PrintError(vm, VCORE_NONE, "Error allocating IDE state\n");
return -1;
}
struct vm_device * southbridge = v3_find_dev(vm, v3_cfg_val(cfg, "controller"));
if (!southbridge) {
- PrintError("Could not find southbridge\n");
+ PrintError(vm, VCORE_NONE, "Could not find southbridge\n");
V3_Free(ide);
return -1;
}
ide->southbridge = (struct v3_southbridge *)(southbridge->private_data);
}
- PrintDebug("IDE: Creating IDE bus x 2\n");
+ PrintDebug(vm, VCORE_NONE, "IDE: Creating IDE bus x 2\n");
struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ide);
if (dev == NULL) {
- PrintError("Could not attach device %s\n", dev_id);
+ PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
V3_Free(ide);
return -1;
}
if (init_ide_state(ide) == -1) {
- PrintError("Failed to initialize IDE state\n");
+ PrintError(vm, VCORE_NONE, "Failed to initialize IDE state\n");
v3_remove_device(dev);
return -1;
}
- PrintDebug("Connecting to IDE IO ports\n");
+ PrintDebug(vm, VCORE_NONE, "Connecting to IDE IO ports\n");
ret |= v3_dev_hook_io(dev, PRI_DATA_PORT,
&ide_read_data_port, &write_data_port);
if (ret != 0) {
- PrintError("Error hooking IDE IO port\n");
+ PrintError(vm, VCORE_NONE, "Error hooking IDE IO port\n");
v3_remove_device(dev);
return -1;
}
struct pci_device * pci_dev = NULL;
int i;
- PrintDebug("Connecting IDE to PCI bus\n");
+ PrintDebug(vm, VCORE_NONE, "Connecting IDE to PCI bus\n");
for (i = 0; i < 6; i++) {
bars[i].type = PCI_BAR_NONE;
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, ide);
+ pci_config_update, NULL, NULL, NULL, ide);
if (pci_dev == NULL) {
- PrintError("Failed to register IDE BUS %d with PCI\n", i);
+ PrintError(vm, VCORE_NONE, "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);
+ PrintError(vm, VCORE_NONE, "Could not register %s as frontend\n", dev_id);
v3_remove_device(dev);
return -1;
}
- PrintDebug("IDE Initialized\n");
+ PrintDebug(vm, VCORE_NONE, "IDE Initialized\n");
return 0;
}