mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Improve (hopefully) on the workaround code for devices that doesn't

Browse Source 
interrupt when command is done, ie some ATAPI CD drives with no
media loaded.
This commit is contained in:
Søren Schmidt 2004-08-16 09:32:35 +00:00
parent 7f28a4189b
commit 5f7a48ef1e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133834
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ata/ata-all.c
View File

@ -554,7 +554,7 @@ ata_getparam(struct ata_device *atadev, u_int8_t command)
while (retries-- > 0) {
request->device = atadev;
request->timeout = 5;
request->retries = -1;
request->retries = 0;
request->u.ata.command = command;
request->flags = (ATA_R_READ | ATA_R_IMMEDIATE);
request->data = (caddr_t)atadev->param;

13
sys/dev/ata/ata-lowlevel.c
View File

@ -100,7 +100,8 @@ ata_generic_transaction(struct ata_request *request)
if (ch->hw.command(request->device, request->u.ata.command,
request->u.ata.lba, request->u.ata.count,
request->u.ata.feature)) {
ata_prtdev(request->device, "error issueing PIO command\n");
ata_prtdev(request->device, "error issueing %s command\n",
ata_cmd2str(request));
request->result = EIO;
break;
}
@ -152,7 +153,8 @@ ata_generic_transaction(struct ata_request *request)
if (ch->hw.command(request->device, request->u.ata.command,
request->u.ata.lba, request->u.ata.count,
request->u.ata.feature)) {
ata_prtdev(request->device, "error issuing DMA command\n");
ata_prtdev(request->device, "error issueing %s command\n",
ata_cmd2str(request));
request->result = EIO;
break;
}
@ -524,13 +526,6 @@ ata_generic_interrupt(void *data)
break;
}
/* if we timed out the unlocking of the ATA channel is done later */
if (!(request->flags & ATA_R_TIMEOUT)) {
ch->running = NULL;
ATA_UNLOCK_CH(ch);
ch->locking(ch, ATA_LF_UNLOCK);
}
/* schedule completition for this request */
ata_finish(request);
}

26
sys/dev/ata/ata-queue.c
View File

@ -118,7 +118,7 @@ ata_controlcmd(struct ata_device *atadev, u_int8_t command, u_int16_t feature,
request->u.ata.feature = feature;
request->flags = ATA_R_CONTROL;
request->timeout = 5;
request->retries = -1;
request->retries = 0;
ata_queue_request(request);
error = request->result;
ata_free_request(request);
@ -194,10 +194,6 @@ ata_start(struct ata_channel *ch)
if (ch->hw.transaction(request) == ATA_OP_CONTINUES)
return;
/* unlock ATA channel HW */
ATA_UNLOCK_CH(ch);
ch->locking(ch, ATA_LF_UNLOCK);
/* finish up this (failed) request */
ata_finish(request);
}
@ -208,10 +204,18 @@ ata_start(struct ata_channel *ch)
void
ata_finish(struct ata_request *request)
{
struct ata_channel *ch = request->device->channel;
ATA_DEBUG_RQ(request, "taskqueue completition");
/* if we timed out the unlocking of the ATA channel is done later */
if (!(request->flags & ATA_R_TIMEOUT)) {
ch->running = NULL;
ATA_UNLOCK_CH(ch);
ch->locking(ch, ATA_LF_UNLOCK);
}
/* request is done schedule it for completition */
if (request->device->channel->flags & ATA_IMMEDIATE_MODE) {
if (ch->flags & ATA_IMMEDIATE_MODE) {
ata_completed(request, 0);
}
else {
@ -234,19 +238,15 @@ ata_completed(void *context, int dummy)
ATA_DEBUG_RQ(request, "completed called");
if (request->flags & ATA_R_TIMEOUT) {
/* if negative retry count just give up and unlock channel HW */
if (request->retries < 0) {
if (!(request->flags & ATA_R_QUIET))
/* workaround for devices failing to interrupt */
if (request->status == (ATA_S_READY | ATA_S_DSC)) {
ata_prtdev(request->device,
"FAILURE - %s no interrupt\n",
"WARNING - %s no interrupt but good status\n",
ata_cmd2str(request));
request->result = EIO;
ATA_UNLOCK_CH(channel);
channel->locking(channel, ATA_LF_UNLOCK);
}
else {
/* reset controller and devices */
ata_reinit(channel);