[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/15] ahci: use new DMA helpers
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 04/15] ahci: use new DMA helpers |
Date: |
Mon, 13 Feb 2012 18:10:11 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/ahci.c | 82 +++++++++------------------------------------------------
1 files changed, 13 insertions(+), 69 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index c87a6ca..25ed844 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -426,55 +426,6 @@ static void ahci_reg_init(AHCIState *s)
}
}
-static uint32_t read_from_sglist(uint8_t *buffer, uint32_t len,
- QEMUSGList *sglist)
-{
- uint32_t i = 0;
- uint32_t total = 0, once;
- ScatterGatherEntry *cur_prd;
- uint32_t sgcount;
-
- cur_prd = sglist->sg;
- sgcount = sglist->nsg;
- for (i = 0; len && sgcount; i++) {
- once = MIN(cur_prd->len, len);
- cpu_physical_memory_read(cur_prd->base, buffer, once);
- cur_prd++;
- sgcount--;
- len -= once;
- buffer += once;
- total += once;
- }
-
- return total;
-}
-
-static uint32_t write_to_sglist(uint8_t *buffer, uint32_t len,
- QEMUSGList *sglist)
-{
- uint32_t i = 0;
- uint32_t total = 0, once;
- ScatterGatherEntry *cur_prd;
- uint32_t sgcount;
-
- DPRINTF(-1, "total: 0x%x bytes\n", len);
-
- cur_prd = sglist->sg;
- sgcount = sglist->nsg;
- for (i = 0; len && sgcount; i++) {
- once = MIN(cur_prd->len, len);
- DPRINTF(-1, "write 0x%x bytes to 0x%lx\n", once, (long)cur_prd->base);
- cpu_physical_memory_write(cur_prd->base, buffer, once);
- cur_prd++;
- sgcount--;
- len -= once;
- buffer += once;
- total += once;
- }
-
- return total;
-}
-
static void check_cmd(AHCIState *s, int port)
{
AHCIPortRegs *pr = &s->dev[port].port_regs;
@@ -795,9 +746,8 @@ static void process_ncq_command(AHCIState *s, int port,
uint8_t *cmd_fis,
DPRINTF(port, "tag %d aio read %"PRId64"\n",
ncq_tfs->tag, ncq_tfs->lba);
- bdrv_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
- (ncq_tfs->sector_count-1) * BDRV_SECTOR_SIZE,
- BDRV_ACCT_READ);
+ dma_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
+ &ncq_tfs->sglist, BDRV_ACCT_READ);
ncq_tfs->aiocb = dma_bdrv_read(ncq_tfs->drive->port.ifs[0].bs,
&ncq_tfs->sglist, ncq_tfs->lba,
ncq_cb, ncq_tfs);
@@ -809,9 +759,8 @@ static void process_ncq_command(AHCIState *s, int port,
uint8_t *cmd_fis,
DPRINTF(port, "tag %d aio write %"PRId64"\n",
ncq_tfs->tag, ncq_tfs->lba);
- bdrv_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
- (ncq_tfs->sector_count-1) * BDRV_SECTOR_SIZE,
- BDRV_ACCT_WRITE);
+ dma_acct_start(ncq_tfs->drive->port.ifs[0].bs, &ncq_tfs->acct,
+ &ncq_tfs->sglist, BDRV_ACCT_WRITE);
ncq_tfs->aiocb = dma_bdrv_write(ncq_tfs->drive->port.ifs[0].bs,
&ncq_tfs->sglist, ncq_tfs->lba,
ncq_cb, ncq_tfs);
@@ -1016,12 +965,12 @@ static int ahci_start_transfer(IDEDMA *dma)
is_write ? "writ" : "read", size, is_atapi ? "atapi" : "ata",
has_sglist ? "" : "o");
- if (is_write && has_sglist && (s->data_ptr < s->data_end)) {
- read_from_sglist(s->data_ptr, size, &s->sg);
- }
-
- if (!is_write && has_sglist && (s->data_ptr < s->data_end)) {
- write_to_sglist(s->data_ptr, size, &s->sg);
+ if (has_sglist && size) {
+ if (is_write) {
+ dma_buf_write(s->data_ptr, size, &s->sg);
+ } else {
+ dma_buf_read(s->data_ptr, size, &s->sg);
+ }
}
/* update number of transferred bytes */
@@ -1060,14 +1009,9 @@ static int ahci_dma_prepare_buf(IDEDMA *dma, int
is_write)
{
AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);
IDEState *s = &ad->port.ifs[0];
- int i;
ahci_populate_sglist(ad, &s->sg);
-
- s->io_buffer_size = 0;
- for (i = 0; i < s->sg.nsg; i++) {
- s->io_buffer_size += s->sg.sg[i].len;
- }
+ s->io_buffer_size = s->sg.size;
DPRINTF(ad->port_no, "len=%#x\n", s->io_buffer_size);
return s->io_buffer_size != 0;
@@ -1085,9 +1029,9 @@ static int ahci_dma_rw_buf(IDEDMA *dma, int is_write)
}
if (is_write) {
- write_to_sglist(p, l, &s->sg);
+ dma_buf_read(p, l, &s->sg);
} else {
- read_from_sglist(p, l, &s->sg);
+ dma_buf_write(p, l, &s->sg);
}
/* update number of transferred bytes */
--
1.7.7.6
- [Qemu-devel] [PATCH v3 00/15] SCSI s/g + SCSI migration + virtio-scsi, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 01/15] dma-helpers: make QEMUSGList target independent, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 02/15] dma-helpers: add dma_buf_read and dma_buf_write, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 03/15] dma-helpers: add accounting wrappers, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 04/15] ahci: use new DMA helpers,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 05/15] scsi: pass residual amount to command_complete, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 07/15] scsi-disk: enable scatter/gather functionality, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 06/15] scsi: add scatter/gather functionality, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 08/15] scsi: add SCSIDevice vmstate definitions, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 09/15] scsi-generic: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 15/15] virtio-scsi: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 10/15] scsi-disk: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 13/15] virtio-scsi: add basic SCSI bus operation, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 12/15] virtio-scsi: Add basic request processing infrastructure, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 14/15] virtio-scsi: process control queue requests, Paolo Bonzini, 2012/02/13