[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 6/7] atapi: call ide_set_irq before ide_transfer_sta
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH 6/7] atapi: call ide_set_irq before ide_transfer_start |
Date: |
Wed, 6 Jun 2018 15:09:54 -0400 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/atapi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index c0509c8bf5..7168ff55a7 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -287,6 +287,7 @@ void ide_atapi_cmd_reply_end(IDEState *s)
} else {
/* a new transfer is needed */
s->nsector = (s->nsector & ~7) | ATAPI_INT_REASON_IO;
+ ide_set_irq(s->bus);
byte_count_limit = atapi_byte_count_limit(s);
trace_ide_atapi_cmd_reply_end_bcl(s, byte_count_limit);
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))
size = (s->cd_sector_size - s->io_buffer_index);
}
- s->packet_transfer_size -= size;
- s->elementary_transfer_size -= size;
- s->io_buffer_index += size;
- ide_transfer_start(s, s->io_buffer + s->io_buffer_index - size,
- size, ide_atapi_cmd_reply_end);
- ide_set_irq(s->bus);
trace_ide_atapi_cmd_reply_end_new(s, s->status);
+ s->packet_transfer_size -= size;
+ s->elementary_transfer_size -= size;
+ s->io_buffer_index += size;
+ ide_transfer_start(s, s->io_buffer + s->io_buffer_index - size,
+ size, ide_atapi_cmd_reply_end);
}
}
}
--
2.14.3
- [Qemu-block] [PATCH 0/7] atapi: change unlimited recursion to while loop, John Snow, 2018/06/06
- [Qemu-block] [PATCH 4/7] ide: call ide_cmd_done from ide_transfer_stop, John Snow, 2018/06/06
- [Qemu-block] [PATCH 6/7] atapi: call ide_set_irq before ide_transfer_start,
John Snow <=
- [Qemu-block] [PATCH 5/7] ide: make ide_transfer_stop idempotent, John Snow, 2018/06/06
- [Qemu-block] [PATCH 1/7] libqos/ahci: track sector size, John Snow, 2018/06/06
- [Qemu-block] [PATCH 7/7] ide: introduce ide_transfer_start_norecurse, John Snow, 2018/06/06
- [Qemu-block] [PATCH 2/7] ahci: move PIO Setup FIS before transfer, fix it for ATAPI commands, John Snow, 2018/06/06
- [Qemu-block] [PATCH 3/7] ide: push end_transfer_func out of start_transfer callback, rename callback, John Snow, 2018/06/06
- Re: [Qemu-block] [PATCH 0/7] atapi: change unlimited recursion to while loop, John Snow, 2018/06/06
- Re: [Qemu-block] [Qemu-devel] [PATCH 0/7] atapi: change unlimited recursion to while loop, John Snow, 2018/06/06