[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/30] ide: make all commands go through cmd_done
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 16/30] ide: make all commands go through cmd_done |
Date: |
Mon, 4 Aug 2014 17:11:17 -0400 |
From: Paolo Bonzini <address@hidden>
AHCI has code to fill in the D2H FIS trigger the IRQ all over the place.
Centralize this in a single cmd_done callback by generalizing the existing
async_cmd_done callback.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 16 +++-------------
hw/ide/atapi.c | 2 +-
hw/ide/core.c | 20 +++++++++++---------
hw/ide/internal.h | 2 +-
4 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e1f27bd..b40ec06 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -969,11 +969,6 @@ static int handle_cmd(AHCIState *s, int port, int slot)
/* We're ready to process the command in FIS byte 2. */
ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
-
- if ((s->dev[port].port.ifs[0].status &
(READY_STAT|DRQ_STAT|BUSY_STAT)) ==
- READY_STAT) {
- ahci_write_fis_d2h(&s->dev[port], cmd_fis);
- }
}
out:
@@ -1036,11 +1031,6 @@ out:
}
s->end_transfer_func(s);
-
- if (!(s->status & DRQ_STAT)) {
- /* done with DMA */
- ahci_trigger_irq(ad->hba, ad, PORT_IRQ_D2H_REG_FIS);
- }
}
static void ahci_start_dma(IDEDMA *dma, IDEState *s,
@@ -1102,11 +1092,11 @@ static int ahci_dma_set_unit(IDEDMA *dma, int unit)
return 0;
}
-static void ahci_async_cmd_done(IDEDMA *dma)
+static void ahci_cmd_done(IDEDMA *dma)
{
AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);
- DPRINTF(ad->port_no, "async cmd done\n");
+ DPRINTF(ad->port_no, "cmd done\n");
/* update d2h status */
ahci_write_fis_d2h(ad, NULL);
@@ -1132,7 +1122,7 @@ static const IDEDMAOps ahci_dma_ops = {
.prepare_buf = ahci_dma_prepare_buf,
.rw_buf = ahci_dma_rw_buf,
.set_unit = ahci_dma_set_unit,
- .async_cmd_done = ahci_async_cmd_done,
+ .cmd_done = ahci_cmd_done,
.restart_cb = ahci_dma_restart_cb,
};
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 3b419b3..3d92b52 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -174,9 +174,9 @@ void ide_atapi_cmd_reply_end(IDEState *s)
#endif
if (s->packet_transfer_size <= 0) {
/* end of transfer */
- ide_transfer_stop(s);
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);
#ifdef DEBUG_IDE_ATAPI
printf("status=0x%x\n", s->status);
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 91a17e6..bdb0a80 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -440,12 +440,20 @@ void ide_transfer_start(IDEState *s, uint8_t *buf, int
size,
}
}
+static void ide_cmd_done(IDEState *s)
+{
+ if (s->bus->dma->ops->cmd_done) {
+ s->bus->dma->ops->cmd_done(s->bus->dma);
+ }
+}
+
void ide_transfer_stop(IDEState *s)
{
s->end_transfer_func = ide_transfer_stop;
s->data_ptr = s->io_buffer;
s->data_end = s->io_buffer;
s->status &= ~DRQ_STAT;
+ ide_cmd_done(s);
}
int64_t ide_get_sector(IDEState *s)
@@ -588,20 +596,13 @@ static void dma_buf_commit(IDEState *s)
qemu_sglist_destroy(&s->sg);
}
-static void ide_async_cmd_done(IDEState *s)
-{
- if (s->bus->dma->ops->async_cmd_done) {
- s->bus->dma->ops->async_cmd_done(s->bus->dma);
- }
-}
-
void ide_set_inactive(IDEState *s, bool more)
{
s->bus->dma->aiocb = NULL;
if (s->bus->dma->ops->set_inactive) {
s->bus->dma->ops->set_inactive(s->bus->dma, more);
}
- ide_async_cmd_done(s);
+ ide_cmd_done(s);
}
void ide_dma_error(IDEState *s)
@@ -849,7 +850,7 @@ static void ide_flush_cb(void *opaque, int ret)
bdrv_acct_done(s->bs, &s->acct);
s->status = READY_STAT | SEEK_STAT;
- ide_async_cmd_done(s);
+ ide_cmd_done(s);
ide_set_irq(s->bus);
}
@@ -1773,6 +1774,7 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val)
s->status |= SEEK_STAT;
}
+ ide_cmd_done(s);
ide_set_irq(s->bus);
}
}
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index b919e96..5c19f79 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -433,7 +433,7 @@ struct IDEDMAOps {
DMAIntFunc *rw_buf;
DMAIntFunc *set_unit;
DMAStopFunc *set_inactive;
- DMAVoidFunc *async_cmd_done;
+ DMAVoidFunc *cmd_done;
DMARestartFunc *restart_cb;
DMAVoidFunc *reset;
};
--
1.9.3
- [Qemu-devel] [PATCH v2 03/30] ide-test: add test for werror=stop, (continued)
- [Qemu-devel] [PATCH v2 03/30] ide-test: add test for werror=stop, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 09/30] ide: wrap start_dma callback, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 08/30] ide: simplify start_transfer callbacks, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 06/30] ide: simplify set_inactive callbacks, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 11/30] ide: fold add_status callback into set_inactive, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 04/30] ide: stash aiocb for flushes, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 10/30] ide: remove wrong setting of BM_STATUS_INT, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 13/30] ide: move retry constants out of BM_STATUS_* namespace, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 12/30] ide: move BM_STATUS bits to pci.[ch], John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 18/30] q35: Enable the ioapic device to be seen by qtest., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 16/30] ide: make all commands go through cmd_done,
John Snow <=
- [Qemu-devel] [PATCH v2 15/30] ide: stop PIO transfer on errors, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 17/30] ahci: construct PIO Setup FIS for PIO commands, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 14/30] ahci: remove duplicate PORT_IRQ_* constants, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 21/30] libqtest: Correct small memory leak., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 19/30] qtest: Adding qtest_memset and qmemset., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 26/30] ahci: Add test_pci_spec to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 30/30] ahci: Add test_identify case to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 24/30] qtest/ide: Fix small memory leak, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 29/30] ahci: Add test_hba_enable to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 20/30] libqos: Correct memory leak, John Snow, 2014/08/04