X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fatapi.h;h=0cc9f269bc78fb93f39d6c55e0b9b9fdbf32791c;hb=d57b407f9d05a21303bc2c94cbd5142de130be48;hp=c889248596ea4c318197055b5887317bfc7bff31;hpb=a0d3be5212e7a5053ba213ce7bd26c7124cf01e3;p=palacios.git diff --git a/palacios/src/devices/atapi.h b/palacios/src/devices/atapi.h index c889248..0cc9f26 100644 --- a/palacios/src/devices/atapi.h +++ b/palacios/src/devices/atapi.h @@ -17,11 +17,15 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ +#ifndef __DEVICES_ATAPI_H__ +#define __DEVICES_ATAPI_H__ + #define ATAPI_PACKET_SIZE 12 #include "atapi-types.h" + /* ATAPI sucks... * The OS will write to the cylinder register the number of bytes it wants to read * however the device can change that value @@ -30,10 +34,10 @@ static int atapi_update_req_len(struct ide_internal * ide, struct ide_channel * channel, uint_t xfer_len) { struct ide_drive * drive = get_selected_drive(channel); - // PrintDebug("Updating request length (pre=%d)\n", drive->req_len); + //PrintDebug("\tUpdating request length (pre=%d)\n", drive->req_len); if (drive->req_len == 0) { - PrintError("ATAPI Error: request of length 0\n"); + PrintError(VM_NONE,VCORE_NONE, "ATAPI Error: request of length 0\n"); return -1; } @@ -51,11 +55,12 @@ static int atapi_update_req_len(struct ide_internal * ide, struct ide_channel * } // if the device can't return as much as the OS requested + // this is actually a decrement of the req_len by the amount requested by the OS if (drive->req_len > xfer_len) { drive->req_len = xfer_len; } - // PrintDebug("Updating request length (post=%d)\n", drive->req_len); + // PrintDebug("\tUpdating request length (post=%d)\n", drive->req_len); return 0; } @@ -74,9 +79,12 @@ static void atapi_setup_cmd_resp(struct ide_internal * ide, struct ide_channel * drive->irq_flags.c_d = 0; channel->status.busy = 0; - channel->status.data_req = 1; channel->status.error = 0; + if (drive->transfer_length > 0) { + channel->status.data_req = 1; + } + ide_raise_irq(ide, channel); } @@ -128,11 +136,12 @@ static void atapi_cmd_nop(struct ide_internal * ide, struct ide_channel * channe static int atapi_read_chunk(struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); - int ret = drive->ops->read(drive->data_buf, drive->current_lba * ATAPI_BLOCK_SIZE, ATAPI_BLOCK_SIZE, -drive->private_data); + int ret = drive->ops->read(drive->data_buf, + drive->current_lba * ATAPI_BLOCK_SIZE, + ATAPI_BLOCK_SIZE, drive->private_data); if (ret == -1) { - PrintError("IDE: Error reading CD block (LBA=%p)\n", (void *)(addr_t)(drive->current_lba)); + PrintError(VM_NONE,VCORE_NONE, "IDE: Error reading CD block (LBA=%p)\n", (void *)(addr_t)(drive->current_lba)); return -1; } @@ -147,14 +156,14 @@ static int atapi_update_data_buf(struct ide_internal * ide, struct ide_channel * case 0x28: // read(10) case 0xa8: // read(12) - // Update lba address to point to next block + // Update lba address to point to next block drive->current_lba++; // read the next block return atapi_read_chunk(ide, channel); default: - PrintError("Unhandled ATAPI command in update buffer %x\n", drive->cd_state.atapi_cmd); + PrintError(VM_NONE,VCORE_NONE, "Unhandled ATAPI command in update buffer %x\n", drive->cd_state.atapi_cmd); return -1; } @@ -169,7 +178,7 @@ static int atapi_read10(struct guest_info * core, uint32_t lba = be_to_le_32(cmd->lba); uint16_t xfer_len = be_to_le_16(cmd->xfer_len); - PrintDebug("READ10: XferLen=%d\n", xfer_len); + PrintDebug(core->vm_info, core, "READ10: XferLen=%d ; LBA=%x \n", xfer_len, lba ); /* Check if cd is ready * if not: atapi_cmd_error(... ATAPI_SEN_NOT_RDY, ASC_MEDIA_NOT_PRESENT) @@ -180,8 +189,8 @@ static int atapi_read10(struct guest_info * core, return 0; } - if (lba + xfer_len > drive->ops->get_capacity(drive->private_data)) { - PrintError("IDE: xfer len exceeded capacity (lba=%d) (xfer_len=%d) (ReadEnd=%d) (capacity=%d)\n", + if ((lba + xfer_len) > (drive->ops->get_capacity(drive->private_data) / ATAPI_BLOCK_SIZE)) { + PrintError(core->vm_info, core, "IDE: xfer len exceeded capacity (lba=%d) (xfer_len=%d) (ReadEnd=%d) (capacity=%d)\n", lba, xfer_len, lba + xfer_len, (uint32_t)drive->ops->get_capacity(drive->private_data)); atapi_cmd_error(ide, channel, ATAPI_SEN_ILL_REQ, ASC_LOG_BLK_OOR); @@ -189,8 +198,7 @@ static int atapi_read10(struct guest_info * core, return 0; } - // PrintDebug("Reading %d blocks from LBA 0x%x\n", xfer_len, lba); - + // PrintDebug(core->vm_info, core, "Reading %d blocks from LBA 0x%x\n", xfer_len, lba); drive->current_lba = lba; // Update the request length value in the cylinder registers @@ -201,7 +209,7 @@ static int atapi_read10(struct guest_info * core, if (channel->dma_status.active == 1) { if (dma_read(core, ide, channel) == -1) { - PrintError("Error in DMA read for CD Read10 command\n"); + PrintError(core->vm_info, core, "Error in DMA read for CD Read10 command\n"); return -1; } } @@ -209,7 +217,7 @@ static int atapi_read10(struct guest_info * core, } if (atapi_read_chunk(ide, channel) == -1) { - PrintError("IDE: Could not read initial chunk from CD\n"); + PrintError(core->vm_info, core, "IDE: Could not read initial chunk from CD\n"); return -1; } @@ -217,7 +225,7 @@ static int atapi_read10(struct guest_info * core, // This is weird... The host sets this value to say what it would like to transfer, // if it is larger than the correct size, the device shrinks it to the correct size if (atapi_update_req_len(ide, channel, ATAPI_BLOCK_SIZE) == -1) { - PrintError("Could not update initial request length\n"); + PrintError(core->vm_info, core, "Could not update initial request length\n"); return -1; } @@ -243,7 +251,7 @@ static int atapi_get_capacity(struct ide_internal * ide, struct ide_channel * ch struct atapi_rd_capacity_resp * resp = (struct atapi_rd_capacity_resp *)(drive->data_buf); uint32_t capacity = drive->ops->get_capacity(drive->private_data); - resp->lba = le_to_be_32(capacity); + resp->lba = le_to_be_32((capacity / ATAPI_BLOCK_SIZE) - 1); resp->block_len = le_to_be_32(ATAPI_BLOCK_SIZE); atapi_setup_cmd_resp(ide, channel, sizeof(struct atapi_rd_capacity_resp)); @@ -266,6 +274,8 @@ static int atapi_get_config(struct ide_internal * ide, struct ide_channel * chan xfer_len = alloc_len; } + V3_Print(VM_NONE, VCORE_NONE, "ATAPI Get config: xfer_len=%d\b", xfer_len); + atapi_setup_cmd_resp(ide, channel, xfer_len); return 0; @@ -297,7 +307,7 @@ static int atapi_read_toc(struct ide_internal * ide, struct ide_channel * channe atapi_setup_cmd_resp(ide, channel, xfer_len); } else { - PrintError("Unhandled Format (%d)\n", cmd->format); + PrintError(VM_NONE, VCORE_NONE, "Unhandled Format (%d)\n", cmd->format); return -1; } @@ -311,8 +321,8 @@ static int atapi_mode_sense_cur_values(struct ide_internal * ide, struct ide_cha struct atapi_mode_sense_hdr * hdr = (struct atapi_mode_sense_hdr *)(drive->data_buf); uint_t resp_len = sizeof(struct atapi_mode_sense_hdr); uint16_t alloc_len = be_to_le_16(sense_cmd->alloc_len); - PrintDebug("Page Code: %x\n", sense_cmd->page_code); - PrintDebug("Alloc len: %d\n", alloc_len); + PrintDebug(VM_NONE, VCORE_NONE,"Page Code: %x\n", sense_cmd->page_code); + PrintDebug(VM_NONE, VCORE_NONE,"Alloc len: %d\n", alloc_len); switch (sense_cmd->page_code) { @@ -321,25 +331,75 @@ static int atapi_mode_sense_cur_values(struct ide_internal * ide, struct ide_cha err = (struct atapi_error_recovery *)(drive->data_buf + sizeof(struct atapi_mode_sense_hdr)); + memcpy(err, &(drive->cd_state.err_recovery), sizeof(struct atapi_error_recovery)); resp_len += sizeof(struct atapi_error_recovery); + PrintError(VM_NONE, VCORE_NONE,"mode sense (error recovery) resp_len=%d\n", resp_len); + + hdr->mode_data_len = le_to_be_16(resp_len - 2); break; } case 0x2a: { // CDROM caps and mech. status + + uint8_t * buf = drive->data_buf; + + + + PrintError(VM_NONE, VCORE_NONE, "mode sense (caps/mechs v2) resp_len=%d\n", resp_len); + + *((uint16_t *)buf) = le_to_be_16(28 + 6); + buf[2] = 0x70; + buf[3] = 0; + buf[4] = 0; + buf[5] = 0; + buf[6] = 0; + buf[7] = 0; + + buf[8] = 0x2a; + buf[9] = 0x12; + buf[10] = 0x00; + buf[11] = 0x00; + + /* Claim PLAY_AUDIO capability (0x01) since some Linux + code checks for this to automount media. */ + buf[12] = 0x71; + buf[13] = 3 << 5; + buf[14] = (1 << 0) | (1 << 3) | (1 << 5); + + buf[6] |= 1 << 1; + buf[15] = 0x00; + *((uint16_t *)&(buf[16])) = le_to_be_16(706); + buf[18] = 0; + buf[19] = 2; + *((uint16_t *)&(buf[20])) = le_to_be_16(512); + *((uint16_t *)&(buf[22])) = le_to_be_16(706); + buf[24] = 0; + buf[25] = 0; + buf[26] = 0; + buf[27] = 0; + + resp_len = 28; + +#if 0 struct atapi_cdrom_caps * caps = NULL; caps = (struct atapi_cdrom_caps *)(drive->data_buf + sizeof(struct atapi_mode_sense_hdr)); + + memset(caps, 0, sizeof(struct atapi_cdrom_caps)); resp_len += sizeof(struct atapi_cdrom_caps); hdr->mode_data_len = le_to_be_16(resp_len - 2); + + PrintError(VM_NONE, VCORE_NONE, "mode sense (caps/mechs v2) resp_len=%d\n", resp_len); + caps->page_code = 0x2a; caps->page_len = 0x12; caps->mode2_form1 = 1; @@ -360,13 +420,15 @@ static int atapi_mode_sense_cur_values(struct ide_internal * ide, struct ide_cha caps->lun_buf_size = le_to_be_16(512); caps->obsolete2 = le_to_be_16(0x2c2); +#endif + break; } case 0x0d: case 0x0e: case 0x3f: default: - PrintError("ATAPI: Mode sense Page Code not supported (%x)\n", sense_cmd->page_code); + PrintError(VM_NONE, VCORE_NONE, "ATAPI: Mode sense Page Code not supported (%x)\n", sense_cmd->page_code); atapi_cmd_error(ide, channel, ATAPI_SEN_ILL_REQ, ASC_INV_CMD_FIELD); ide_raise_irq(ide, channel); return 0; @@ -374,10 +436,10 @@ static int atapi_mode_sense_cur_values(struct ide_internal * ide, struct ide_cha // We do this after error checking, because its only valid if everything worked - memset(hdr, 0, sizeof(struct atapi_mode_sense_hdr)); - hdr->media_type_code = 0x70; + // memset(hdr, 0, sizeof(struct atapi_mode_sense_hdr)); + // hdr->media_type_code = 0x70; - PrintDebug("resp_len=%d\n", resp_len); + PrintDebug(VM_NONE, VCORE_NONE, "resp_len=%d\n", resp_len); drive->transfer_length = (resp_len > alloc_len) ? alloc_len : resp_len; drive->transfer_index = 0; @@ -400,13 +462,14 @@ static int atapi_mode_sense(struct ide_internal * ide, struct ide_channel * chan case 0x02: // default values case 0x03: // saved values default: - PrintError("ATAPI: Mode sense mode not supported (%x)\n", sense_cmd->page_ctrl); + PrintError(VM_NONE, VCORE_NONE, "ATAPI: Mode sense mode not supported (%x)\n", sense_cmd->page_ctrl); return -1; } return 0; } + static int atapi_inquiry(struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); struct atapi_inquiry_cmd * inquiry_cmd = (struct atapi_inquiry_cmd *)(drive->data_buf); @@ -439,6 +502,28 @@ static int atapi_inquiry(struct ide_internal * ide, struct ide_channel * channel } +static int atapi_mech_status(struct ide_internal * ide, struct ide_channel * channel) { + struct ide_drive * drive = get_selected_drive(channel); + struct atapi_mech_status_cmd * status_cmd = (struct atapi_mech_status_cmd *)(drive->data_buf); + uint16_t alloc_len = be_to_le_16(status_cmd->alloc_len); + struct atapi_mech_status_resp * resp = (struct atapi_mech_status_resp *)(drive->data_buf); + int xfer_len = sizeof(struct atapi_mech_status_resp); + + memset(resp, 0, sizeof(struct atapi_mech_status_resp)); + + resp->lba = le_to_be_32(1); + resp->slot_table_len = le_to_be_16(0); + + if (alloc_len < xfer_len) { + xfer_len = alloc_len; + } + + atapi_setup_cmd_resp(ide, channel, xfer_len); + + return 0; +} + + static int atapi_cmd_is_data_op(uint8_t cmd) { switch (cmd) { case 0x28: // read (10) @@ -456,7 +541,7 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i struct ide_drive * drive = get_selected_drive(channel); uint8_t cmd = drive->data_buf[0]; - PrintDebug("IDE: ATAPI Command %x\n", cmd); + PrintDebug(core->vm_info, core, "IDE: ATAPI Command %x\n", cmd); drive->cd_state.atapi_cmd = cmd; @@ -469,6 +554,7 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i */ break; case 0x03: // request sense + PrintError(core->vm_info, core, "IDE: Requesting Sense (0x3)\n"); atapi_req_sense(ide, channel); break; @@ -478,14 +564,14 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i case 0x28: // read(10) if (atapi_read10(core, ide, channel) == -1) { - PrintError("IDE: Error in ATAPI read (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error in ATAPI read (%x)\n", cmd); return -1; } break; case 0x5a: // mode sense if (atapi_mode_sense(ide, channel) == -1) { - PrintError("IDE: Error in ATAPI mode sense (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error in ATAPI mode sense (%x)\n", cmd); return -1; } break; @@ -493,7 +579,7 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i case 0x25: // read cdrom capacity if (atapi_get_capacity(ide, channel) == -1) { - PrintError("IDE: Error getting CDROM capacity (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error getting CDROM capacity (%x)\n", cmd); return -1; } break; @@ -501,14 +587,14 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i case 0x43: // read TOC if (atapi_read_toc(ide, channel) == -1) { - PrintError("IDE: Error getting CDROM TOC (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error getting CDROM TOC (%x)\n", cmd); return -1; } break; case 0x46: // get configuration if (atapi_get_config(ide, channel) == -1) { - PrintError("IDE: Error getting CDROM Configuration (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error getting CDROM Configuration (%x)\n", cmd); return -1; } break; @@ -517,23 +603,32 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i case 0x4a: // Get Status/event case 0x51: // read disk info // no-op to keep the Linux CD-ROM driver happy - PrintDebug("Error: Read disk info no-op to keep the Linux CD-ROM driver happy\n"); + PrintDebug(core->vm_info, core, "Error: Read disk info no-op to keep the Linux CD-ROM driver happy\n"); atapi_cmd_error(ide, channel, ATAPI_SEN_ILL_REQ, ASC_INV_CMD_FIELD); ide_raise_irq(ide, channel); break; case 0x12: // inquiry if (atapi_inquiry(ide, channel) == -1) { - PrintError("IDE: Error in ATAPI inquiry (%x)\n", cmd); + PrintError(core->vm_info, core, "IDE: Error in ATAPI inquiry (%x)\n", cmd); return -1; } break; + case 0xbd: // mechanism status + if (atapi_mech_status(ide, channel) == -1) { + PrintError(core->vm_info, core, "IDE: error in ATAPI Mechanism status query (%x)\n", cmd); + return -1; + } + break; + + case 0xa8: // read(12) case 0x1b: // start/stop drive - case 0xbd: // mechanism status + atapi_cmd_nop(ide,channel); + break; case 0xbe: // read cd @@ -558,7 +653,7 @@ static int atapi_handle_packet(struct guest_info * core, struct ide_internal * i case 0x4e: // stop play/scan default: - PrintError("Unhandled ATAPI command %x\n", cmd); + PrintError(core->vm_info, core, "Unhandled ATAPI command %x\n", cmd); atapi_cmd_error(ide, channel, ATAPI_SEN_ILL_REQ, ASC_INV_CMD_FIELD); ide_raise_irq(ide, channel); return -1; @@ -597,6 +692,7 @@ static void atapi_identify_device(struct ide_drive * drive) { drive_id->dword_io = 1; // enable DMA access + /* Disabled until command packet DMA is fixed */ drive_id->dma_enable = 1; // enable LBA access @@ -605,13 +701,18 @@ static void atapi_identify_device(struct ide_drive * drive) { drive_id->rw_multiples = 0x80ff; // words 64-70, 54-58 valid - drive_id->field_valid = 0x0007; // DMA + pkg cmd valid + /* Disabled until command packet DMA is fixed */ + drive_id->field_valid = 0x0007; // DMA + pkg cmd valid // copied from CFA540A - drive_id->buf[63] = 0x0103; // variable (DMA stuff) - //drive_id->buf[63] = 0x0000; // variable (DMA stuff) - - // drive_id->buf[64] = 0x0001; // PIO + /* Disabled until command packet DMA is fixed */ + drive_id->buf[63] = 0x0103; // variable (DMA stuff) + + + /* uncommented to disable dma(?) */ + // drive_id->buf[64] = 0x0001; // PIO + + drive_id->buf[65] = 0x00b4; drive_id->buf[66] = 0x00b4; drive_id->buf[67] = 0x012c; @@ -623,5 +724,8 @@ static void atapi_identify_device(struct ide_drive * drive) { // drive_id->buf[80] = 0x1e; // supports up to ATA/ATAPI-4 drive_id->major_rev_num = 0x0040; // supports up to ATA/ATAPI-6 + /* Disabled until command packet DMA is fixed */ drive_id->dma_ultra = 0x2020; // Ultra_DMA_Mode_5_Selected | Ultra_DMA_Mode_5_Supported; } + +#endif