[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 15/17] ahci: add support for restarting non-queue
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v4 15/17] ahci: add support for restarting non-queued commands |
Date: |
Mon, 23 Feb 2015 11:18:04 -0500 |
From: Paolo Bonzini <address@hidden>
This is easy, since start_dma already restarts processing from the
beginning of the PRDT.
Migration is also easy to cover; the comment about busy_slot is
wrong, busy_slot will only be set if there is an error. In this
case we have nothing to do really. The core IDE code will restart
the operation and command list processing will proceed after the
erroring command has been completed.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 3f4fc77..56a4867 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1160,6 +1160,11 @@ static void ahci_start_dma(IDEDMA *dma, IDEState *s,
dma_cb(s, 0);
}
+static void ahci_restart_dma(IDEDMA *dma)
+{
+ /* Nothing to do, ahci_start_dma already resets s->io_buffer_offset. */
+}
+
/**
* Called in DMA R/W chains to read the PRDT, utilizing ahci_populate_sglist.
* Not currently invoked by PIO R/W chains,
@@ -1248,6 +1253,7 @@ static void ahci_irq_set(void *opaque, int n, int level)
static const IDEDMAOps ahci_dma_ops = {
.start_dma = ahci_start_dma,
+ .restart_dma = ahci_restart_dma,
.start_transfer = ahci_start_transfer,
.prepare_buf = ahci_dma_prepare_buf,
.commit_buf = ahci_commit_buf,
@@ -1282,6 +1288,7 @@ void ahci_init(AHCIState *s, DeviceState *qdev,
AddressSpace *as, int ports)
ad->port_no = i;
ad->port.dma = &ad->dma;
ad->port.dma->ops = &ahci_dma_ops;
+ ide_register_restart_cb(&ad->port);
}
}
@@ -1360,16 +1367,16 @@ static int ahci_state_post_load(void *opaque, int
version_id)
map_page(s->as, &ad->res_fis,
((uint64_t)pr->fis_addr_hi << 32) | pr->fis_addr, 256);
/*
- * All pending i/o should be flushed out on a migrate. However,
- * we might not have cleared the busy_slot since this is done
- * in a bh. Also, issue i/o against any slots that are pending.
+ * If an error is present, ad->busy_slot will be valid and not -1.
+ * In this case, an operation is waiting to resume and will re-check
+ * for additional AHCI commands to execute upon completion.
+ *
+ * In the case where no error was present, busy_slot will be -1,
+ * and we should check to see if there are additional commands waiting.
*/
- if ((ad->busy_slot != -1) &&
- !(ad->port.ifs[0].status & (BUSY_STAT|DRQ_STAT))) {
- pr->cmd_issue &= ~(1 << ad->busy_slot);
- ad->busy_slot = -1;
+ if (ad->busy_slot == -1) {
+ check_cmd(s, i);
}
- check_cmd(s, i);
}
return 0;
--
1.9.3
- [Qemu-devel] [PATCH v4 04/17] ide: do not use BMDMA in restart callback, (continued)
- [Qemu-devel] [PATCH v4 04/17] ide: do not use BMDMA in restart callback, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 03/17] ide: introduce ide_register_restart_cb, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 08/17] ide: replace set_unit callback with more IDEBus state, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 02/17] ide: prepare to move restart to common code, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 06/17] ide: move restart callback to common code, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 10/17] ide: migrate initial request state via IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 07/17] ide: remove restart_cb callback, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 15/17] ahci: add support for restarting non-queued commands,
John Snow <=
- [Qemu-devel] [PATCH v4 13/17] ide: support PIO restart for the ISA controller, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 14/17] ahci: Migrate IDEStatus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 17/17] qtest/ide: Test flush / retry for ISA and PCI, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 12/17] ide: make more functions static, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 16/17] ahci: Recompute cur_cmd on migrate post load, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 11/17] ide: commonize io_buffer_index initialization, John Snow, 2015/02/23
- Re: [Qemu-devel] [PATCH v4 00/17] ide: rerror/werror migration fixes for IDE/ISA and AHCI, Stefan Hajnoczi, 2015/02/25