From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWW67-0002qP-32 for qemu-devel@nongnu.org; Mon, 31 Aug 2015 16:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWW62-0003hl-3a for qemu-devel@nongnu.org; Mon, 31 Aug 2015 16:54:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWW61-0003hc-Sa for qemu-devel@nongnu.org; Mon, 31 Aug 2015 16:54:30 -0400 References: <6e0045ed58a395ec0e3caa1c1abf478b41e5023b.1440806502.git.alistair.francis@xilinx.com> From: John Snow Message-ID: <55E4BF04.3070701@redhat.com> Date: Mon, 31 Aug 2015 16:54:28 -0400 MIME-Version: 1.0 In-Reply-To: <6e0045ed58a395ec0e3caa1c1abf478b41e5023b.1440806502.git.alistair.francis@xilinx.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 4/4] xlnx-zynqmp: Connect the sysbus AHCI to ZynqMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , qemu-devel@nongnu.org, peter.maydell@linaro.org, crosthwaitepeter@gmail.com Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, afaerber@suse.de On 08/28/2015 08:04 PM, Alistair Francis wrote: > Connect the Sysbus AHCI device to ZynqMP. > > Signed-off-by: Alistair Francis > Reviewed-by: Sai Pavan Boddu > --- > V6: > - Fix up Macros > V2: > - Marcoify the number of SATA prts > - Change the error for setting num-ports to error_abort > > hw/arm/xlnx-zynqmp.c | 18 ++++++++++++++++++ > include/hw/arm/xlnx-zynqmp.h | 3 +++ > 2 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 6756c74..90b2aca 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -28,6 +28,10 @@ > #define GIC_DIST_ADDR 0xf9010000 > #define GIC_CPU_ADDR 0xf9020000 > > +#define SATA_INTR 133 > +#define SATA_ADDR 0xFD0C0000 > +#define SATA_NUM_PORTS 2 > + > static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { > 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, > }; > @@ -90,6 +94,9 @@ static void xlnx_zynqmp_init(Object *obj) > object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UART); > qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); > } > + > + object_initialize(&s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI); > + qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default()); > } > > static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > @@ -240,6 +247,17 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0, > gic_spi[uart_intr[i]]); > } > + > + object_property_set_int(OBJECT(&s->sata), SATA_NUM_PORTS, "num-ports", > + &error_abort); > + object_property_set_bool(OBJECT(&s->sata), true, "realized", &err); > + if (err) { > + error_propagate((errp), (err)); > + return; > + } > + > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, SATA_ADDR); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); > } > > static Property xlnx_zynqmp_props[] = { > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 6ccb57b..97622ec 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -22,6 +22,8 @@ > #include "hw/intc/arm_gic.h" > #include "hw/net/cadence_gem.h" > #include "hw/char/cadence_uart.h" > +#include "hw/ide/pci.h" > +#include "hw/ide/ahci.h" > > #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" > #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ > @@ -60,6 +62,7 @@ typedef struct XlnxZynqMPState { > > CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS]; > CadenceUARTState uart[XLNX_ZYNQMP_NUM_UARTS]; > + SysbusAHCIState sata; > > char *boot_cpu; > ARMCPU *boot_cpu_ptr; > For some reason, this patch never made it to the qemu-devel archives for either v5 or v6. I only received a direct copy to my inbox, but the mailer daemon seems to have dropped this patch for ... some reason or another. --js