From patchwork Wed Oct 10 00:46:34 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: 190518 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 D5DDF2C007F for ; Wed, 10 Oct 2012 11:47:00 +1100 (EST) Received: from localhost ([::1]:34693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkRv-0002DE-2C for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2012 20:46:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkRj-00024x-1D for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:46:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLkRh-00012F-RH for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:46:46 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:55865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkRh-00010q-L9 for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:46:45 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so5823913pad.4 for ; Tue, 09 Oct 2012 17:46:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=I4iZn7JbpIHpXvx3JE5y1/N8M7cw3M7JZP6xf9VPwCk=; b=hF63dxlwjZr1XWfz0wFPF8aK+bBpgObPx5FV96dn1XgUjryVZSB3AeswumWjA19tM0 80bu3dmKkaU87fG3MDoiFH+Q2whLOhFa1JR/O9tBeeOLwvazW+9PGb/KRihHPwN3Iba/ 1nUna+/DDTAzybsHoBihycpG9O2kkh/ufg2zkOrgF3RF+zQ/nPYHcm09PJXeedqvfgGv nw+N6GTp1z17JxoHF7+tndK3fmFpk/Q7KPzgTYH3/g26HMLah76ro9EQBEYbezprAvtd h8Nv0L+MD45JH+Q/QcH6QXbE5VOEuGyT4XLL0eNPCcMC75KNlr+Jn4TwjTvfmxqMityo ChcA== Received: by 10.66.74.65 with SMTP id r1mr56969910pav.75.1349830005224; Tue, 09 Oct 2012 17:46:45 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id mn5sm104212pbc.12.2012.10.09.17.46.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 17:46:44 -0700 (PDT) From: Peter Crosthwaite To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 10 Oct 2012 10:46:34 +1000 Message-Id: <1349830006-12124-2-git-send-email-peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349830006-12124-1-git-send-email-peter.crosthwaite@xilinx.com> References: <1349830006-12124-1-git-send-email-peter.crosthwaite@xilinx.com> X-Gm-Message-State: ALoCoQlwEXwB/7Xam9ueS0TAMVJpaFJfVz1u6StkyT5Zwkq2hqzQ1JqRS6k9DtKTf8GHBY9Vsqr5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Subject: [Qemu-devel] [PATCH 01/13] ssi: Support for multiple attached devices 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 From: Peter A. G. Crosthwaite Removed assertion that only one device is attached to the SSI bus. When multiple devices are attached, all slaves have their transfer function called for transfers. Each device is responsible for knowing whether or not its CS is active, and if not returning 0. The returned data is the logical or of all responses from the (mulitple) devices. Signed-off-by: Peter A. G. Crosthwaite Acked-by: Peter Maydell --- hw/ssi.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/hw/ssi.c b/hw/ssi.c index e5f14a0..35d0a04 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -2,6 +2,8 @@ * QEMU Synchronous Serial Interface support * * Copyright (c) 2009 CodeSourcery. + * Copyright (c) 2012 Peter A.G. Crosthwaite (peter.crosthwaite@petalogix.com) + * Copyright (c) 2012 PetaLogix Pty Ltd. * Written by Paul Brook * * This code is licensed under the GNU GPL v2. @@ -29,14 +31,6 @@ static int ssi_slave_init(DeviceState *dev) { SSISlave *s = SSI_SLAVE(dev); SSISlaveClass *ssc = SSI_SLAVE_GET_CLASS(s); - SSIBus *bus; - BusChild *kid; - - bus = FROM_QBUS(SSIBus, qdev_get_parent_bus(dev)); - kid = QTAILQ_FIRST(&bus->qbus.children); - if (kid->child != dev || QTAILQ_NEXT(kid, sibling) != NULL) { - hw_error("Too many devices on SSI bus"); - } return ssc->init(s); } @@ -74,16 +68,16 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name) uint32_t ssi_transfer(SSIBus *bus, uint32_t val) { BusChild *kid; - SSISlave *slave; SSISlaveClass *ssc; + uint32_t r = 0; - kid = QTAILQ_FIRST(&bus->qbus.children); - if (!kid) { - return 0; + QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) { + SSISlave *slave = SSI_SLAVE(kid->child); + ssc = SSI_SLAVE_GET_CLASS(slave); + r |= ssc->transfer(slave, val); } - slave = SSI_SLAVE(kid->child); - ssc = SSI_SLAVE_GET_CLASS(slave); - return ssc->transfer(slave, val); + + return r; } static void ssi_slave_register_types(void)