On 16/01/2016 02:50, Alistair Francis wrote:
> On Mon, Jan 4, 2016 at 10:25 AM, <fred.kon...@greensocs.com> wrote:
>> From: KONRAD Frederic <fred.kon...@greensocs.com>
>>
>> This adds the DP and the DPDMA to the Zynq MP platform.
>>
>> Signed-off-by: KONRAD Frederic <fred.kon...@greensocs.com>
>> Reviewed-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
>> Tested-By: Hyun Kwon <hyun.k...@xilinx.com>
>> ---
>> hw/arm/xlnx-zynqmp.c | 30 ++++++++++++++++++++++++++++++
>> include/hw/arm/xlnx-zynqmp.h | 5 +++++
>> 2 files changed, 35 insertions(+)
>>
>> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
>> index 87553bb..ce9919f 100644
>> --- a/hw/arm/xlnx-zynqmp.c
>> +++ b/hw/arm/xlnx-zynqmp.c
>> @@ -32,6 +32,12 @@
>> #define SATA_ADDR 0xFD0C0000
>> #define SATA_NUM_PORTS 2
>>
>> +#define DP_ADDR 0xfd4a0000
>> +#define DP_IRQ 113
>> +
>> +#define DPDMA_ADDR 0xfd4c0000
>> +#define DPDMA_IRQ 116
>> +
>> static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
>> 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
>> };
>> @@ -112,6 +118,12 @@ static void xlnx_zynqmp_init(Object *obj)
>> qdev_set_parent_bus(DEVICE(&s->sdhci[i]),
>> sysbus_get_default());
>> }
>> +
>> + object_initialize(&s->dp, sizeof(s->dp), TYPE_XLNX_DP);
>> + qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default());
>> +
>> + object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA);
>> + qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default());
>> }
>>
>> static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
>> @@ -286,6 +298,24 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
>> **errp)
>> sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0,
>> gic_spi[sdhci_intr[i]]);
>> }
>> +
>> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dp), 0, DP_ADDR);
>> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->dp), 0, gic_spi[DP_IRQ]);
>> +
>> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR);
>> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]);
>> + object_property_set_bool(OBJECT(&s->dp), true, "realized", &err);
>> + if (err) {
>> + error_propagate(errp, err);
>> + return;
>> + }
>> + object_property_set_bool(OBJECT(&s->dpdma), true, "realized", &err);
>> + if (err) {
>> + error_propagate(errp, err);
>> + return;
>> + }
> Can you set the device as realized before the sysbus connections? That
> is how every other device does it.
Ok will do that.
>
>> + object_property_set_link(OBJECT(&s->dp), OBJECT(&s->dpdma), "dpdma",
>> + &error_abort);
>> }
>>
>> static Property xlnx_zynqmp_props[] = {
>> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
>> index d116092..e683eaf 100644
>> --- a/include/hw/arm/xlnx-zynqmp.h
>> +++ b/include/hw/arm/xlnx-zynqmp.h
>> @@ -25,6 +25,8 @@
>> #include "hw/ide/pci.h"
>> #include "hw/ide/ahci.h"
>> #include "hw/sd/sdhci.h"
>> +#include "hw/dma/xlnx_dpdma.h"
>> +#include "hw/display/xlnx_dp.h"
>>
>> #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
>> #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
>> @@ -69,6 +71,9 @@ typedef struct XlnxZynqMPState {
>>
>> char *boot_cpu;
>> ARMCPU *boot_cpu_ptr;
>> +
>> + XlnxDPState dp;
>> + XlnxDPDMAState dpdma;
> Can you also move these up so they are with the rest of the devices?
yes
>
> Otherwise:
>
> Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
>
> Thanks,
>
> Alistair
>
>> } XlnxZynqMPState;
>>
>> #define XLNX_ZYNQMP_H
>> --
>> 1.9.0
>>
>>
