Commit bed9bcfa authored by Paolo Bonzini's avatar Paolo Bonzini Committed by John Snow
Browse files

ide: push end_transfer_func out of start_transfer callback, rename callback 



Now that end_transfer_func is a tail call in ahci_start_transfer,
formalize the fact that the callback (of which ahci_start_transfer is
the sole implementation) takes care of the transfer too: rename it to
pio_transfer and, if it is present, call the end_transfer_func as soon
as it returns.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180606190955.20845-4-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 956556e1

hw/ide/ahci.c

+6 −7
Original line number Diff line number Diff line
@@ -1340,8 +1340,8 @@ out: 
    return 0;

}



/* DMA dev <-> ram */

static void ahci_start_transfer(IDEDMA *dma)

/* Transfer PIO data between RAM and device */

static void ahci_pio_transfer(IDEDMA *dma)

{

    AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);

    IDEState *s = &ad->port.ifs[0];
@@ -1365,7 +1365,7 @@ static void ahci_start_transfer(IDEDMA *dma) 
        has_sglist = 1;

    }



    trace_ahci_start_transfer(ad->hba, ad->port_no, is_write ? "writ" : "read",

    trace_ahci_pio_transfer(ad->hba, ad->port_no, is_write ? "writ" : "read",

                            size, is_atapi ? "atapi" : "ata",

                            has_sglist ? "" : "o");
@@ -1382,7 +1382,6 @@ static void ahci_start_transfer(IDEDMA *dma) 
out:

    /* declare that we processed everything */

    s->data_ptr = s->data_end;

    s->end_transfer_func(s);

}



static void ahci_start_dma(IDEDMA *dma, IDEState *s,
@@ -1503,7 +1502,7 @@ static const IDEDMAOps ahci_dma_ops = { 
    .start_dma = ahci_start_dma,

    .restart = ahci_restart,

    .restart_dma = ahci_restart_dma,

    .start_transfer = ahci_start_transfer,

    .pio_transfer = ahci_pio_transfer,

    .prepare_buf = ahci_dma_prepare_buf,

    .commit_buf = ahci_commit_buf,

    .rw_buf = ahci_dma_rw_buf,

hw/ide/core.c

+5 −3
Original line number Diff line number Diff line
@@ -526,16 +526,18 @@ static void ide_clear_retry(IDEState *s) 
void ide_transfer_start(IDEState *s, uint8_t *buf, int size,

                        EndTransferFunc *end_transfer_func)

{

    s->end_transfer_func = end_transfer_func;

    s->data_ptr = buf;

    s->data_end = buf + size;

    ide_set_retry(s);

    if (!(s->status & ERR_STAT)) {

        s->status |= DRQ_STAT;

    }

    if (s->bus->dma->ops->start_transfer) {

        s->bus->dma->ops->start_transfer(s->bus->dma);

    if (!s->bus->dma->ops->pio_transfer) {

        s->end_transfer_func = end_transfer_func;

        return;

    }

    s->bus->dma->ops->pio_transfer(s->bus->dma);

    end_transfer_func(s);

}



static void ide_cmd_done(IDEState *s)

hw/ide/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ handle_cmd_badport(void *s, int port) "ahci(%p)[%d]: guest accessed unused port" 
handle_cmd_badfis(void *s, int port) "ahci(%p)[%d]: guest provided an invalid cmd FIS"

handle_cmd_badmap(void *s, int port, uint64_t len) "ahci(%p)[%d]: dma_memory_map failed, 0x%02"PRIx64" != 0x80"

handle_cmd_unhandled_fis(void *s, int port, uint8_t b0, uint8_t b1, uint8_t b2) "ahci(%p)[%d]: unhandled FIS type. cmd_fis: 0x%02x-%02x-%02x"

ahci_start_transfer(void *s, int port, const char *rw, uint32_t size, const char *tgt, const char *sgl) "ahci(%p)[%d]: %sing %d bytes on %s w/%s sglist"

ahci_pio_transfer(void *s, int port, const char *rw, uint32_t size, const char *tgt, const char *sgl) "ahci(%p)[%d]: %sing %d bytes on %s w/%s sglist"

ahci_start_dma(void *s, int port) "ahci(%p)[%d]: start dma"

ahci_dma_prepare_buf(void *s, int port, int32_t io_buffer_size, int32_t limit) "ahci(%p)[%d]: prepare buf limit=%"PRId32" prepared=%"PRId32

ahci_dma_prepare_buf_fail(void *s, int port) "ahci(%p)[%d]: sglist population failed"

include/hw/ide/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ struct IDEState { 


struct IDEDMAOps {

    DMAStartFunc *start_dma;

    DMAVoidFunc *start_transfer;

    DMAVoidFunc *pio_transfer;

    DMAInt32Func *prepare_buf;

    DMAu32Func *commit_buf;

    DMAIntFunc *rw_buf;