From patchwork Mon Oct 8 04:18:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 189890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD5E52C009A for ; Mon, 8 Oct 2012 15:35:20 +1100 (EST) Received: from localhost ([::1]:54684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL4pL-00044U-Mj for incoming@patchwork.ozlabs.org; Mon, 08 Oct 2012 00:20:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL4pE-0003wi-D7 for qemu-devel@nongnu.org; Mon, 08 Oct 2012 00:20:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TL4pD-0007EO-0A for qemu-devel@nongnu.org; Mon, 08 Oct 2012 00:20:16 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:46947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TL4pC-0006Zk-Pv for qemu-devel@nongnu.org; Mon, 08 Oct 2012 00:20:14 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so3627987pad.4 for ; Sun, 07 Oct 2012 21:20:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=M3R6q+PuTuJORbZ5guaOYjY3aFOijXh9ML7roxH4laA=; b=o8on861FrniXfOUA2vL/KTU5PcM8KtuVCvKOPam9KtA1yTHKiMYFOyGoJG0f/NDKvb SFRhWLEpHlTn/LQ8jcm4VZhNoTVWcJmfJMqhT4r6f3OBtn534vNHffQHKP7w3+7oESh8 BQNuIbllJ6YPH8dfVKydtdPriUZRIeMX3UMN2tOpbpqXqQFaCWv3llHcvRnhtOcIwMPQ 192XyWLmy4qK0FZkr1yTmS8FwvpgcfhAS9gnlG2AbzmdOnuuiTF1vwq6Arw9yUcJnqI8 PCIWnjxTRcI7Q7HrwMPZ2pYt5OYufVSMFC8Pj6uyz851LRvgA+rAw3u3+hixkZIgAAsJ QZ8g== Received: by 10.66.86.133 with SMTP id p5mr39683529paz.35.1349670014274; Sun, 07 Oct 2012 21:20:14 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id i4sm10190387pav.20.2012.10.07.21.20.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Oct 2012 21:20:13 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com, peter.maydell@linaro.org Date: Mon, 8 Oct 2012 14:18:27 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkeromS+1RXDjIogq/QVkNb5vjEwt0z0kRpWbInpIZb797p2vBqEQ0qIvS5KKI7tXcBiIRP X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: Peter Crosthwaite Subject: [Qemu-devel] [PATCH v9 13/13] ssi: Add slave autoconnect helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Added helper function to automatically connect SPI slaves based on the QOM child nodes of a device. A SSI master device can call this routine to automatically hook-up all child nodes to its SPI bus. Signed-off-by: Peter Crosthwaite Acked-by: Peter Maydell --- hw/ssi.c | 33 +++++++++++++++++++++++++++++++++ hw/ssi.h | 4 ++++ hw/xilinx_spi.c | 6 ++++-- hw/xilinx_spips.c | 4 +++- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/hw/ssi.c b/hw/ssi.c index c47419d..2b56357 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -139,3 +139,36 @@ static void ssi_slave_register_types(void) } type_init(ssi_slave_register_types) + +typedef struct SSIAutoConnectArg { + qemu_irq **cs_linep; + SSIBus *bus; +} SSIAutoConnectArg; + +static int ssi_auto_connect_slave(Object *child, void *opaque) +{ + SSIAutoConnectArg *arg = opaque; + SSISlave *dev = (SSISlave *)object_dynamic_cast(child, TYPE_SSI_SLAVE); + qemu_irq cs_line; + + if (!dev) { + return 0; + } + + cs_line = qdev_get_gpio_in(DEVICE(dev), 0); + qdev_set_parent_bus(DEVICE(dev), &arg->bus->qbus); + **arg->cs_linep = cs_line; + (*arg->cs_linep)++; + return 0; +} + +void ssi_auto_connect_slaves(DeviceState *parent, qemu_irq *cs_line, + SSIBus *bus) +{ + SSIAutoConnectArg arg = { + .cs_linep = &cs_line, + .bus = bus + }; + + object_child_foreach(OBJECT(parent), ssi_auto_connect_slave, &arg); +} diff --git a/hw/ssi.h b/hw/ssi.h index 2bde9f5..a05d60b 100644 --- a/hw/ssi.h +++ b/hw/ssi.h @@ -83,6 +83,10 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name); uint32_t ssi_transfer(SSIBus *bus, uint32_t val); +/* Automatically connect all children nodes a spi controller as slaves */ +void ssi_auto_connect_slaves(DeviceState *parent, qemu_irq *cs_lines, + SSIBus *bus); + /* max111x.c */ void max111x_set_input(DeviceState *dev, int line, uint8_t value); diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c index 7db4787..5cdf967 100644 --- a/hw/xilinx_spi.c +++ b/hw/xilinx_spi.c @@ -320,8 +320,12 @@ static int xilinx_spi_init(SysBusDevice *dev) XilinxSPI *s = FROM_SYSBUS(typeof(*s), dev); DB_PRINT("\n"); + + s->spi = ssi_create_bus(&dev->qdev, "spi"); + sysbus_init_irq(dev, &s->irq); s->cs_lines = g_new(qemu_irq, s->num_cs); + ssi_auto_connect_slaves(DEVICE(s), s->cs_lines, s->spi); for (i = 0; i < s->num_cs; ++i) { sysbus_init_irq(dev, &s->cs_lines[i]); } @@ -331,8 +335,6 @@ static int xilinx_spi_init(SysBusDevice *dev) s->irqline = -1; - s->spi = ssi_create_bus(&dev->qdev, "spi"); - fifo8_create(&s->tx_fifo, FIFO_CAPACITY); fifo8_create(&s->rx_fifo, FIFO_CAPACITY); diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c index a886c5d..f64a782 100644 --- a/hw/xilinx_spips.c +++ b/hw/xilinx_spips.c @@ -289,6 +289,9 @@ static int xilinx_spips_init(SysBusDevice *dev) DB_PRINT("inited device model\n"); + s->spi = ssi_create_bus(&dev->qdev, "spi"); + + ssi_auto_connect_slaves(DEVICE(s), s->cs_lines, s->spi); sysbus_init_irq(dev, &s->irq); for (i = 0; i < NUM_CS_LINES; ++i) { sysbus_init_irq(dev, &s->cs_lines[i]); @@ -298,7 +301,6 @@ static int xilinx_spips_init(SysBusDevice *dev) sysbus_init_mmio(dev, &s->iomem); s->irqline = -1; - s->spi = ssi_create_bus(&dev->qdev, "spi"); fifo8_create(&s->rx_fifo, RXFF_A); fifo8_create(&s->tx_fifo, TXFF_A);