[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v9 13/13] xlnx-zcu102: Add support for the ZynqM
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v9 13/13] xlnx-zcu102: Add support for the ZynqMP QSPI |
Date: |
Mon, 27 Nov 2017 00:55:01 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 11/26/2017 08:16 PM, Francisco Iglesias wrote:
> Add support for the ZynqMP QSPI (consisting of the Generic QSPI and Legacy
> QSPI) and connect Numonyx n25q512a11 flashes to it.
>
> Signed-off-by: Francisco Iglesias <address@hidden>
> Reviewed-by: Alistair Francis <address@hidden>
> Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> Tested-by: Edgar E. Iglesias <address@hidden>
> ---
> hw/arm/xlnx-zcu102.c | 23 +++++++++++++++++++++++
> hw/arm/xlnx-zynqmp.c | 26 ++++++++++++++++++++++++++
> include/hw/arm/xlnx-zynqmp.h | 5 +++++
> 3 files changed, 54 insertions(+)
>
> diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
> index bbe7d04..b126cf1 100644
> --- a/hw/arm/xlnx-zcu102.c
> +++ b/hw/arm/xlnx-zcu102.c
> @@ -151,6 +151,29 @@ static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState
> *machine)
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, cs_line);
> }
>
> + for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_FLASH; i++) {
> + SSIBus *spi_bus;
> + DeviceState *flash_dev;
> + qemu_irq cs_line;
> + DriveInfo *dinfo = drive_get_next(IF_MTD);
> + int bus = i / XLNX_ZYNQMP_NUM_QSPI_BUS_CS;
> + gchar *bus_name = g_strdup_printf("qspi%d", bus);
> +
> + spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(&s->soc), bus_name);
> + g_free(bus_name);
> +
> + flash_dev = ssi_create_slave_no_init(spi_bus, "n25q512a11");
> + if (dinfo) {
> + qdev_prop_set_drive(flash_dev, "drive",
> blk_by_legacy_dinfo(dinfo),
> + &error_fatal);
> + }
> + qdev_init_nofail(flash_dev);
> +
> + cs_line = qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS, 0);
> +
> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.qspi), i + 1, cs_line);
> + }
> +
> /* TODO create and connect IDE devices for ide_drive_get() */
>
> xlnx_zcu102_binfo.ram_size = ram_size;
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index c707c66..3256420 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -40,6 +40,10 @@
> #define SATA_ADDR 0xFD0C0000
> #define SATA_NUM_PORTS 2
>
> +#define QSPI_ADDR 0xff0f0000
> +#define LQSPI_ADDR 0xc0000000
> +#define QSPI_IRQ 15
> +
> #define DP_ADDR 0xfd4a0000
> #define DP_IRQ 113
>
> @@ -171,6 +175,9 @@ static void xlnx_zynqmp_init(Object *obj)
> qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default());
> }
>
> + object_initialize(&s->qspi, sizeof(s->qspi), TYPE_XLNX_ZYNQMP_QSPIPS);
> + qdev_set_parent_bus(DEVICE(&s->qspi), sysbus_get_default());
> +
> object_initialize(&s->dp, sizeof(s->dp), TYPE_XLNX_DP);
> qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default());
>
> @@ -411,6 +418,25 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> g_free(bus_name);
> }
>
> + object_property_set_bool(OBJECT(&s->qspi), true, "realized", &err);
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR);
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR);
> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]);
> +
> + for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_BUS; i++) {
> + gchar *bus_name;
> + gchar *target_bus;
> +
> + /* Alias controller SPI bus to the SoC itself */
> + bus_name = g_strdup_printf("qspi%d", i);
> + target_bus = g_strdup_printf("spi%d", i);
> + object_property_add_alias(OBJECT(s), bus_name,
> + OBJECT(&s->qspi), target_bus,
> + &error_abort);
> + g_free(bus_name);
> + g_free(target_bus);
> + }
> +
> object_property_set_bool(OBJECT(&s->dp), true, "realized", &err);
> if (err) {
> error_propagate(errp, err);
> diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
> index 6eff81a..3e6fb9b 100644
> --- a/include/hw/arm/xlnx-zynqmp.h
> +++ b/include/hw/arm/xlnx-zynqmp.h
> @@ -40,6 +40,10 @@
> #define XLNX_ZYNQMP_NUM_SDHCI 2
> #define XLNX_ZYNQMP_NUM_SPIS 2
>
> +#define XLNX_ZYNQMP_NUM_QSPI_BUS 2
> +#define XLNX_ZYNQMP_NUM_QSPI_BUS_CS 2
> +#define XLNX_ZYNQMP_NUM_QSPI_FLASH 4
> +
> #define XLNX_ZYNQMP_NUM_OCM_BANKS 4
> #define XLNX_ZYNQMP_OCM_RAM_0_ADDRESS 0xFFFC0000
> #define XLNX_ZYNQMP_OCM_RAM_SIZE 0x10000
> @@ -83,6 +87,7 @@ typedef struct XlnxZynqMPState {
> SysbusAHCIState sata;
> SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI];
> XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS];
> + XlnxZynqMPQSPIPS qspi;
> XlnxDPState dp;
> XlnxDPDMAState dpdma;
>
>
- [Qemu-devel] [PATCH v9 05/13] xilinx_spips: Move FlashCMD, XilinxQSPIPS and XilinxSPIPSClass, (continued)
- [Qemu-devel] [PATCH v9 05/13] xilinx_spips: Move FlashCMD, XilinxQSPIPS and XilinxSPIPSClass, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 07/13] xilinx_spips: Add support for RX discard and RX drain, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 06/13] xilinx_spips: Update striping to be big-endian bit order, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 09/13] xilinx_spips: Add support for zero pumping, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 08/13] xilinx_spips: Make tx/rx_data_bytes more generic and reusable, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 10/13] xilinx_spips: Add support for 4 byte addresses in the LQSPI, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 11/13] xilinx_spips: Don't set TX FIFO UNDERFLOW at cmd done, Francisco Iglesias, 2017/11/26
- [Qemu-devel] [PATCH v9 13/13] xlnx-zcu102: Add support for the ZynqMP QSPI, Francisco Iglesias, 2017/11/26
- Re: [Qemu-devel] [PATCH v9 13/13] xlnx-zcu102: Add support for the ZynqMP QSPI,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v9 12/13] xilinx_spips: Add support for the ZynqMP Generic QSPI, Francisco Iglesias, 2017/11/26
- Re: [Qemu-devel] [PATCH v9 00/13] Add support for the ZynqMP Generic QSPI, Peter Maydell, 2017/11/28