From patchwork Mon Jan 23 16:05:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Langsdorf X-Patchwork-Id: 137397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D611EB6FA7 for ; Tue, 24 Jan 2012 03:05:52 +1100 (EST) Received: from localhost ([::1]:56127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpMOu-0006Pe-KS for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2012 11:05:44 -0500 Received: from eggs.gnu.org ([140.186.70.92]:60688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpMOc-0006Kg-TF for qemu-devel@nongnu.org; Mon, 23 Jan 2012 11:05:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpMOY-00079u-AX for qemu-devel@nongnu.org; Mon, 23 Jan 2012 11:05:26 -0500 Received: from smtp201.dfw.emailsrvr.com ([67.192.241.201]:44498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpMOY-00079o-3k for qemu-devel@nongnu.org; Mon, 23 Jan 2012 11:05:22 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp10.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id A99BC1B8256; Mon, 23 Jan 2012 11:05:20 -0500 (EST) X-Virus-Scanned: OK Received: by smtp10.relay.dfw1a.emailsrvr.com (Authenticated sender: mark.langsdorf-AT-calxeda.com) with ESMTPSA id 629CB1B8213; Mon, 23 Jan 2012 11:05:20 -0500 (EST) From: Mark Langsdorf To: qemu-devel@nongnu.org Date: Mon, 23 Jan 2012 10:05:21 -0600 Message-Id: <1327334725-3145-3-git-send-email-mark.langsdorf@calxeda.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1327334725-3145-1-git-send-email-mark.langsdorf@calxeda.com> References: <1327092420-10814-1-git-send-email-mark.langsdorf@calxeda.com> <1327334725-3145-1-git-send-email-mark.langsdorf@calxeda.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 67.192.241.201 Cc: peter.maydell@linaro.org, mark.langsdorf@calxeda.com, i.mitsyanko@gmail.com, Rob Herring , edgar.iglesias@gmail.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v14 2/6] ahci: add support for non-PCI based controllers 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: Rob Herring Add support for ahci on sysbus. Signed-off-by: Rob Herring Signed-off-by: Mark Langsdorf Reviewed-by: Andreas Färber --- Changes from v10-v13 None Changes from v9 Changed typedef struct names to CamelCase Changes from v7, v8 None Changes from v5, v6 Skipped Changes from v4 replaced all references to Plat|plat_ with sysbus_ made the number of ports into a qdev property added dummy migration support Changes from v3 Renamed plat-ahci to sysbus-ahci Changes from v1, v2 Corrected indentation of PlatAHCIState members Made plat_ahci_info into a single structure, not a list hw/ide/ahci.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 0af201d..0309dd6 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "monitor.h" #include "dma.h" @@ -1214,3 +1215,46 @@ void ahci_reset(void *opaque) ahci_reset_port(&d->ahci, i); } } + +typedef struct SysbusAHCIState { + SysBusDevice busdev; + AHCIState ahci; + uint32_t num_ports; +} SysbusAHCIState; + +static const VMStateDescription vmstate_sysbus_ahci = { + .name = "sysbus-ahci", + .unmigratable = 1, +}; + +static int sysbus_ahci_init(SysBusDevice *dev) +{ + SysbusAHCIState *s = FROM_SYSBUS(SysbusAHCIState, dev); + ahci_init(&s->ahci, &dev->qdev, s->num_ports); + + sysbus_init_mmio(dev, &s->ahci.mem); + sysbus_init_irq(dev, &s->ahci.irq); + + qemu_register_reset(ahci_reset, &s->ahci); + return 0; +} + +static SysBusDeviceInfo sysbus_ahci_info = { + .qdev.name = "sysbus-ahci", + .qdev.size = sizeof(SysbusAHCIState), + .qdev.vmsd = &vmstate_sysbus_ahci, + .qdev.props = (Property[]) { + DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, num_ports, 1), + DEFINE_PROP_END_OF_LIST(), + }, + .init = sysbus_ahci_init, + + +}; + +static void sysbus_ahci_register(void) +{ + sysbus_register_withprop(&sysbus_ahci_info); +} + +device_init(sysbus_ahci_register);