Commit 33108e9f authored by Sai Pavan Boddu's avatar Sai Pavan Boddu Committed by Stefan Hajnoczi
Browse files

target-arm: xlnx-zynqmp: Add sdhci support. 



Add two SYSBUS_SDHCI devices for xlnx-zynqmp

Signed-off-by: default avatarSai Pavan Boddu <saipava@xilinx.com>
Reviewed-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 637d23be

hw/arm/xlnx-zynqmp.c

+28 −0
Original line number Diff line number Diff line
@@ -48,6 +48,14 @@ static const int uart_intr[XLNX_ZYNQMP_NUM_UARTS] = { 
    21, 22,

};



static const uint64_t sdhci_addr[XLNX_ZYNQMP_NUM_SDHCI] = {

    0xFF160000, 0xFF170000,

};



static const int sdhci_intr[XLNX_ZYNQMP_NUM_SDHCI] = {

    48, 49,

};



typedef struct XlnxZynqMPGICRegion {

    int region_index;

    uint32_t address;
@@ -97,6 +105,13 @@ static void xlnx_zynqmp_init(Object *obj) 


    object_initialize(&s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI);

    qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default());



    for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {

        object_initialize(&s->sdhci[i], sizeof(s->sdhci[i]),

                          TYPE_SYSBUS_SDHCI);

        qdev_set_parent_bus(DEVICE(&s->sdhci[i]),

                            sysbus_get_default());

    }

}



static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
@@ -258,6 +273,19 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 


    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, SATA_ADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);



    for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {

        object_property_set_bool(OBJECT(&s->sdhci[i]), true,

                                 "realized", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                        sdhci_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                           gic_spi[sdhci_intr[i]]);

    }

}



static Property xlnx_zynqmp_props[] = {

include/hw/arm/xlnx-zynqmp.h

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hw/char/cadence_uart.h"

#include "hw/ide/pci.h"

#include "hw/ide/ahci.h"

#include "hw/sd/sdhci.h"



#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"

#define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
@@ -33,6 +34,7 @@ 
#define XLNX_ZYNQMP_NUM_RPU_CPUS 2

#define XLNX_ZYNQMP_NUM_GEMS 4

#define XLNX_ZYNQMP_NUM_UARTS 2

#define XLNX_ZYNQMP_NUM_SDHCI 2



#define XLNX_ZYNQMP_NUM_OCM_BANKS 4

#define XLNX_ZYNQMP_OCM_RAM_0_ADDRESS 0xFFFC0000
@@ -63,6 +65,7 @@ typedef struct XlnxZynqMPState { 
    CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS];

    CadenceUARTState uart[XLNX_ZYNQMP_NUM_UARTS];

    SysbusAHCIState sata;

    SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI];



    char *boot_cpu;

    ARMCPU *boot_cpu_ptr;