Commit e12f50b9 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

dbdma: fix load_word/store_word value endianness 



The values to read/write to/from physical memory are copied directly to the
physical address with no endian swapping required.

Also add some extra information to debugging output while we are here.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 3f0d4128

hw/misc/macio/mac_dbdma.c

+5 −19
Original line number Diff line number Diff line
@@ -350,9 +350,8 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr, 
                     uint16_t len)

{

    dbdma_cmd *current = &ch->current;

    uint32_t val;



    DBDMA_DPRINTFCH(ch, "load_word\n");

    DBDMA_DPRINTFCH(ch, "load_word %d bytes, addr=%08x\n", len, addr);



    /* only implements KEY_SYSTEM */
@@ -362,14 +361,7 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr, 
        return;

    }



    dma_memory_read(&address_space_memory, addr, &val, len);



    if (len == 2)

        val = (val << 16) | (current->cmd_dep & 0x0000ffff);

    else if (len == 1)

        val = (val << 24) | (current->cmd_dep & 0x00ffffff);



    current->cmd_dep = val;

    dma_memory_read(&address_space_memory, addr, &current->cmd_dep, len);



    if (conditional_wait(ch))

        goto wait;
@@ -389,9 +381,9 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr, 
                      uint16_t len)

{

    dbdma_cmd *current = &ch->current;

    uint32_t val;



    DBDMA_DPRINTFCH(ch, "store_word\n");

    DBDMA_DPRINTFCH(ch, "store_word %d bytes, addr=%08x pa=%x\n",

                    len, addr, le32_to_cpu(current->cmd_dep));



    /* only implements KEY_SYSTEM */
@@ -401,13 +393,7 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr, 
        return;

    }



    val = current->cmd_dep;

    if (len == 2)

        val >>= 16;

    else if (len == 1)

        val >>= 24;



    dma_memory_write(&address_space_memory, addr, &val, len);

    dma_memory_write(&address_space_memory, addr, &current->cmd_dep, len);



    if (conditional_wait(ch))

        goto wait;