david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

atapi: call ide_set_irq before ide_transfer_start

Browse Source 
The ATAPI_INT_REASON_IO interrupt is raised when I/O starts, but in the
AHCI case ide_set_irq was actually called at the end of a mutual recursion.
Move it early, with the side effect that ide_transfer_start becomes a tail
call in ide_atapi_cmd_reply_end.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180606190955.20845-7-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-06-06 15:09:54 -04:00 committed by John Snow
parent 882941a568
commit d02cea6437
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ide/atapi.c
View File

@ -287,6 +287,7 @@ void ide_atapi_cmd_reply_end(IDEState *s)
} else { } else {
/* a new transfer is needed */ /* a new transfer is needed */
s->nsector = (s->nsector & ~7) | ATAPI_INT_REASON_IO; s->nsector = (s->nsector & ~7) | ATAPI_INT_REASON_IO;
ide_set_irq(s->bus);
byte_count_limit = atapi_byte_count_limit(s); byte_count_limit = atapi_byte_count_limit(s);
trace_ide_atapi_cmd_reply_end_bcl(s, byte_count_limit); trace_ide_atapi_cmd_reply_end_bcl(s, byte_count_limit);
size = s->packet_transfer_size; size = s->packet_transfer_size;
@ -304,13 +305,12 @@ void ide_atapi_cmd_reply_end(IDEState *s)
if (size > (s->cd_sector_size - s->io_buffer_index)) if (size > (s->cd_sector_size - s->io_buffer_index))
size = (s->cd_sector_size - s->io_buffer_index); size = (s->cd_sector_size - s->io_buffer_index);
} }
trace_ide_atapi_cmd_reply_end_new(s, s->status);
s->packet_transfer_size -= size; s->packet_transfer_size -= size;
s->elementary_transfer_size -= size; s->elementary_transfer_size -= size;
s->io_buffer_index += size; s->io_buffer_index += size;
ide_transfer_start(s, s->io_buffer + s->io_buffer_index - size, ide_transfer_start(s, s->io_buffer + s->io_buffer_index - size,
size, ide_atapi_cmd_reply_end); size, ide_atapi_cmd_reply_end);
ide_set_irq(s->bus);
trace_ide_atapi_cmd_reply_end_new(s, s->status);
} }
} }
} }