From patchwork Wed Nov 28 09:14:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: walimis X-Patchwork-Id: 202396 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 973CC2C0082 for ; Wed, 28 Nov 2012 20:14:48 +1100 (EST) Received: from localhost ([::1]:41866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TddjC-0001Yf-Lz for incoming@patchwork.ozlabs.org; Wed, 28 Nov 2012 04:14:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tddj2-0001YI-2E for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:14:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tddiw-000392-5c for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:14:35 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tddiv-00038w-V0 for qemu-devel@nongnu.org; Wed, 28 Nov 2012 04:14:30 -0500 Received: by mail-pb0-f45.google.com with SMTP id mc8so9076806pbc.4 for ; Wed, 28 Nov 2012 01:14:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=SdoJ3RXp7tzXnvGTEalxFEnL1+vC1u+rdo4DaYd8M0U=; b=tztp2MZuzvzinWkhHIF5if2DjBjb/Af6pKfWdMOFFb6evuRgVKlGAKHUJAgk1zpZEl Rbu0ATS/Nhe26SUDefEv/D0rQCBXsiEPLDqZWmYt3/wFsHofdmpLR+VS/XMc3dMkKkHq bzJ2s0HY+pIq4P/eEg9FuGD7pyCpOuvWQiKTQiwg2uid6sYW8rbUKTgtzHDqUREd6JSO TkEtrvvsuhzXHzlU86AcMlImY3b5HtJnoERjhwAwZ5+1DnECqOkiT/L9kG277LFZdHjr SWQWBbs05ur56tEfJyuBvD92OuuqstWch/3AtwpzKOCKhWlZfNKLyoEhGjiKY/UdVSWI 6yjw== Received: by 10.68.248.1 with SMTP id yi1mr57040033pbc.93.1354094068364; Wed, 28 Nov 2012 01:14:28 -0800 (PST) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id ix9sm12162602pbc.7.2012.11.28.01.14.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 01:14:26 -0800 (PST) From: Liming Wang To: qemu-devel@nongnu.org, Peter Crosthwaite Date: Wed, 28 Nov 2012 17:14:16 +0800 Message-Id: <1354094056-4093-1-git-send-email-walimisdev@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.45 Cc: Peter Maydell , Peter Crosthwaite , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] xilinx_zynq: Add one variable to avoid overwriting QSPI bus 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 commit 7b482bcf xilinx_zynq: added QSPI controller Adds one QSPI controller, which has two spi buses, one is for spi0, and another is for spi1. But when initializing the spi1 bus, "dev" has been overwrited by the ssi_create_slave_no_init() function, so that qdev_get_child_bus() returns NULL and the last two m25p80 flashes won't be attached to the spi1 bus, but to main-system-bus. Here we add one variable to avoid overwriting. Signed-off-by: Liming Wang Reviewed-by: Peter Crosthwaite --- hw/xilinx_zynq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 1f12a3d..49233d8 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -57,6 +57,7 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq, DeviceState *dev; SysBusDevice *busdev; SSIBus *spi; + DeviceState *flash_dev; int i, j; int num_busses = is_qspi ? NUM_QSPI_BUSSES : 1; int num_ss = is_qspi ? NUM_QSPI_FLASHES : NUM_SPI_FLASHES; @@ -81,11 +82,11 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq, spi = (SSIBus *)qdev_get_child_bus(dev, bus_name); for (j = 0; j < num_ss; ++j) { - dev = ssi_create_slave_no_init(spi, "m25p80"); - qdev_prop_set_string(dev, "partname", "n25q128"); - qdev_init_nofail(dev); + flash_dev = ssi_create_slave_no_init(spi, "m25p80"); + qdev_prop_set_string(flash_dev, "partname", "n25q128"); + qdev_init_nofail(flash_dev); - cs_line = qdev_get_gpio_in(dev, 0); + cs_line = qdev_get_gpio_in(flash_dev, 0); sysbus_connect_irq(busdev, i * num_ss + j + 1, cs_line); } }