ide/atapi: Mark non-data commands as complete
v2 cover ide/atapi: Mark non-data commands as complete
v2:
- Instead of using ide_set_inactive, use ide_stop_transfer
- ATAPI helpers use either ide_atapi_cmd_ok or ide_atapi_cmd_error, instead of ide_stop_transfer directly.
John Snow (1):
ide/atapi: Mark non-data commands as complete
hw/ide/atapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.3
PATCH v2 1/1 ide/atapi: Mark non-data commands as complete
When the command completion code in IDE and AHCI was unified to put all command completion inside of a callback, "cmd_done," we neglected to ensure that all AHCI/ATAPI command paths would eventually register as finished. for the PCI interface to IDE this is not a problem because cmd_done is a nop, but the AHCI implementation needs to send a D2H_REG_FIS and interrupt back to the guest to inform of completion.
This patch adds calls to ide_stop_transfer, which calls ide_cmd_done, inside of ide_atapi_cmd_ok and ide_atapi_cmd_error.
This fixes regressions observed by trying to boot QEMU with a Fedora 20 live CD under Q35/AHCI, which uses ATAPI command 0x00, which is a status check that may cause a hang because we never complete, and ATAPI command 0x56, which is unsupported by our current implementation and results in an error that we never report back to the guest.
--- hw/ide/atapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/ide/atapi.c +3 -4
@@ -134,6 +134,7 @@ void ide_atapi_cmd_ok(IDEState *s) s->error =0 ; s->status =READY_STAT |SEEK_STAT ; s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; +ide_transfer_stop (s);ide_set_irq (s->bus); }
@@ -147,6 +148,7 @@ void ide_atapi_cmd_error(IDEState *s, int sense_key, int asc) s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; s->sense_key = sense_key; s->asc = asc; +ide_transfer_stop (s);ide_set_irq (s->bus); }
@@ -174,9 +176,7 @@ void ide_atapi_cmd_reply_end(IDEState *s)#endif if (s->packet_transfer_size <=0 ) {/* end of transfer */ - s->status =READY_STAT |SEEK_STAT ; - s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; -ide_transfer_stop (s); +ide_atapi_cmd_ok (s);ide_set_irq (s->bus);#ifdef DEBUG_IDE_ATAPI printf ("status=0x%x\n" , s->status);
@@ -186,7 +186,6 @@ void ide_atapi_cmd_reply_end(IDEState *s)if (s->lba !=-1 && s->io_buffer_index >= s->cd_sector_size) { ret =cd_read_sector (s, s->lba, s->io_buffer, s->cd_sector_size);if (ret <0 ) { -ide_transfer_stop (s);ide_atapi_io_error (s, ret);return ; }
Signature · 1 line
1.9.3
Il 13/09/2014 05:51, John Snow ha scritto:
Quoted 60 lines
When the command completion code in IDE and AHCI was unified to put all command completion inside of a callback, "
cmd_done," we neglected to ensure that all AHCI/ATAPI command paths would eventually register as finished. for the PCI interface to IDE this is not a problem becausecmd_doneis a nop, but the AHCI implementation needs to send aD2H_REG_FISand interrupt back to the guest to inform of completion.This patch adds calls to
ide_stop_transfer, which callside_cmd_done, inside ofide_atapi_cmd_okandide_atapi_cmd_error.This fixes regressions observed by trying to boot QEMU with a Fedora 20 live CD under Q35/AHCI, which uses ATAPI command
0x00, which is a status check that may cause a hang because we never complete, and ATAPI command0x56, which is unsupported by our current implementation and results in an error that we never report back to the guest.Signed-off-by John Snow <[email protected]>--- hw/ide/atapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)hw/ide/atapi.c +3
-3@@ -134,6 +134,7 @@ void ide_atapi_cmd_ok(IDEState *s) s->error =0 ; s->status =READY_STAT |SEEK_STAT ; s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; +ide_transfer_stop (s);ide_set_irq (s->bus); }@@ -147,6 +148,7 @@ void ide_atapi_cmd_error(IDEState *s, int sense_key, int asc) s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; s->sense_key = sense_key; s->asc = asc; +ide_transfer_stop (s);ide_set_irq (s->bus); }@@ -174,9 +176,7 @@ void ide_atapi_cmd_reply_end(IDEState *s)#endif if (s->packet_transfer_size <=0 ) {/* end of transfer */ - s->status =READY_STAT |SEEK_STAT ; - s->nsector = (s->nsector & ~7 ) |ATAPI_INT_REASON_IO |ATAPI_INT_REASON_CD ; -ide_transfer_stop (s); +ide_atapi_cmd_ok (s);ide_set_irq (s->bus);#ifdef DEBUG_IDE_ATAPI printf ("status=0x%x\n" , s->status);
hw/ide/atapi.c void ide_atapi_cmd_reply_end(IDEState *s) · line 191
Quoted 7 lines
hw/ide/atapi.c +0
-1@@ -186,7 +186,6 @@ void ide_atapi_cmd_reply_end(IDEState *s)if (s->lba !=-1 && s->io_buffer_index >= s->cd_sector_size) { ret =cd_read_sector (s, s->lba, s->io_buffer, s->cd_sector_size);if (ret <0 ) { -ide_transfer_stop (s);ide_atapi_io_error (s, ret);return ; }
Stefan Hajnoczi
AppliedQuoted 6 lines · John Snow
v2:
- Instead of using
ide_set_inactive, useide_stop_transfer
- ATAPI helpers use eitheride_atapi_cmd_okoride_atapi_cmd_error, instead ofide_stop_transferdirectly.
Quoted 10 lines
John Snow (1):
ide/atapi: Mark non-data commands as completehw/ide/atapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)Signature · 1 line
1.9.3
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan