Re: [Qemu-devel] [PATCH 14/14] sdhci: add a "dma-memory" property

[Alistair Francis]

On Wed, Dec 13, 2017 at 11:58 AM, Philippe Mathieu-Daudé
<address@hidden> wrote:
> Add a dma property allowing machine creation to provide the address-space
> sdhci dma operates on.
>
> [based on a patch from Alistair Francis <address@hidden>
>  from qemu/xilinx tag xilinx-v2016.1]
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  include/hw/sd/sdhci.h |  2 ++
>  hw/sd/sdhci.c         | 24 ++++++++++++++++++------
>  2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
> index 1b6a98d578..e6644e6e7d 100644
> --- a/include/hw/sd/sdhci.h
> +++ b/include/hw/sd/sdhci.h
> @@ -41,6 +41,8 @@ typedef struct SDHCIState {
>      /*< public >*/
>      SDBus sdbus;
>      MemoryRegion iomem;
> +    MemoryRegion *dma_mr;
> +    AddressSpace dma_as;
>
>      QEMUTimer *insert_timer;       /* timer for 'changing' sd card. */
>      QEMUTimer *transfer_timer;
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index 78bb8e8e89..5f8064c59b 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -590,7 +590,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr 
> *dscr)
>      hwaddr entry_addr = (hwaddr)s->admasysaddr;
>      switch (SDHC_DMA_TYPE(s->hostctl)) {
>      case SDHC_CTRL_ADMA2_32:
> -        adma2 = ldq_le_dma(&address_space_memory, entry_addr);
> +        adma2 = ldq_le_dma(&s->dma_as, entry_addr);
>          /* The spec does not specify endianness of descriptor table.
>           * We currently assume that it is LE.
>           */
> @@ -600,7 +600,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr 
> *dscr)
>          dscr->incr = 8;
>          break;
>      case SDHC_CTRL_ADMA1_32:
> -        adma1 = ldl_le_dma(&address_space_memory, entry_addr);
> +        adma1 = ldl_le_dma(&s->dma_as, entry_addr);
>          dscr->addr = (hwaddr)(adma1 & 0xFFFFF000);
>          dscr->attr = (uint8_t)extract32(adma1, 0, 7);
>          dscr->incr = 4;
> @@ -611,9 +611,9 @@ static void get_adma_description(SDHCIState *s, ADMADescr 
> *dscr)
>          }
>          break;
>      case SDHC_CTRL_ADMA2_64:
> -        dscr->attr = ldub_dma(&address_space_memory, entry_addr);
> -        dscr->length = lduw_le_dma(&address_space_memory, entry_addr + 2);
> -        dscr->attr = ldq_le_dma(&address_space_memory, entry_addr + 4);
> +        dscr->attr = ldub_dma(&s->dma_as, entry_addr);
> +        dscr->length = lduw_le_dma(&s->dma_as, entry_addr + 2);
> +        dscr->attr = ldq_le_dma(&s->dma_as, entry_addr + 4);
>          dscr->attr &= 0xfffffff8;
>          dscr->incr = 12;
>          break;
> @@ -670,7 +670,7 @@ static void sdhci_do_adma(SDHCIState *s)
>                          s->data_count = block_size;
>                          length -= block_size - begin;
>                      }
> -                    dma_memory_write(&address_space_memory, dscr.addr,
> +                    dma_memory_write(&s->dma_as, dscr.addr,
>                                       &s->fifo_buffer[begin],
>                                       s->data_count - begin);
>                      dscr.addr += s->data_count - begin;
> @@ -1172,10 +1172,20 @@ static void sdhci_realizefn(SDHCIState *s, Error 
> **errp)
>
>      memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
>                            SDHC_REGISTERS_MAP_SIZE);
> +
> +    /* use system_memory() if property "dma-memory" not set */
> +    address_space_init(&s->dma_as,
> +                       s->dma_mr ? s->dma_mr : get_system_memory(),
> +                       "sdhci-dma");
>  }
>
>  static void sdhci_unrealizefn(SDHCIState *s, Error **errp)
>  {
> +    if (s->dma_mr) {
> +        address_space_destroy(&s->dma_as);
> +        object_unparent(OBJECT(&s->dma_mr));
> +    }
> +
>      g_free(s->fifo_buffer);
>      s->fifo_buffer = NULL;
>  }
> @@ -1257,6 +1267,8 @@ static Property sdhci_properties[] = {
>      DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0),
>      DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, 
> pending_insert_quirk,
>                       false),
> +    DEFINE_PROP_LINK("dma-memory", SDHCIState, dma_mr,
> +                     TYPE_MEMORY_REGION, MemoryRegion *),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>
> --
> 2.15.1
>
>