From patchwork Sun Aug 2 16:44:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin O'Connor X-Patchwork-Id: 502916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B552C1402D6 for ; Mon, 3 Aug 2015 02:45:28 +1000 (AEST) Received: from localhost ([::1]:56429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLwO6-0000in-Op for incoming@patchwork.ozlabs.org; Sun, 02 Aug 2015 12:45:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLwNH-0007we-99 for qemu-devel@nongnu.org; Sun, 02 Aug 2015 12:44:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZLwNE-0003ap-2d for qemu-devel@nongnu.org; Sun, 02 Aug 2015 12:44:35 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:34445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLwND-0003ah-S2 for qemu-devel@nongnu.org; Sun, 02 Aug 2015 12:44:31 -0400 Received: by qgeu79 with SMTP id u79so75630263qge.1 for ; Sun, 02 Aug 2015 09:44:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=+HIJiCEJ+B3ST54fZNYUiKxDPEmXfDkQ2fqb+ownJEs=; b=StwAt6Ryk5avxsidyGgwc+0WCC29JS2KXDRURIOj4v89tkxvQ1ROAve6kWnpqt87A6 w4EMRQPSkenMrHP7wfF0ARr+9gqodjd8lRnsT59lIu3bRSqIuGBT75UzUjQli+hNwm6K WFVQryFFd6JK2nIEh8V+C07zwfOZpUEzRflGVL52pGwcGyN0h8G/VcToyr0uedxAd5uY /E1hBHLVqwZF09Oj8DcpDN4smokWtwqesLGV+LTobpGLeuS+8ndj+hsLeAaLHI8Cv83l GKX2UMznFbEmpQKV/vCGAOFdwhm8L3/W6Pq9qsjkI0pLAkGva/o8wd1ziqp1bfQ4Livo HeNQ== X-Gm-Message-State: ALoCoQmWqaxdRp3RZbjjGzx0e7DU1jm1mctKXOu/iKs0dlI4xbHU45VgYgVWHXjNAYYHL86u9z3m X-Received: by 10.141.23.130 with SMTP id z124mr21039239qhd.55.1438533870648; Sun, 02 Aug 2015 09:44:30 -0700 (PDT) Received: from localhost (209-122-232-221.c3-0.avec-ubr1.nyr-avec.ny.cable.rcn.com. [209.122.232.221]) by smtp.gmail.com with ESMTPSA id 126sm5466456qhc.49.2015.08.02.09.44.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 09:44:29 -0700 (PDT) From: Kevin O'Connor To: qemu-devel@nongnu.org, Markus Armbruster , Paolo Bonzini , Stefan Hajnoczi Date: Sun, 2 Aug 2015 12:44:16 -0400 Message-Id: <1438533856-27393-1-git-send-email-kevin@koconnor.net> X-Mailer: git-send-email 1.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.53 Subject: [Qemu-devel] [PATCHv2] sdhci: Pass drive parameter to sdhci-pci via qdev property 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 19109131 disabled the sdhci-pci support because it used drive_get_next(). This patch reenables sdhci-pci and changes it to pass the drive via a qdev property - for example: -device sdhci-pci,drive=drive0 -drive id=drive0,if=sd,file=myimage Signed-off-by: Kevin O'Connor Reviewed-by: Stefan Hajnoczi --- v2: - Don't call blk_detach_dev() in sdhci pci code - instead change sd_init() to use blk_attach_dev() instead of blk_attach_dev_nofail(). --- hw/sd/sd.c | 4 +++- hw/sd/sdhci.c | 32 +++++++++++++++++++------------- hw/sd/sdhci.h | 2 ++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a1ff465..88c4fda 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -493,7 +493,9 @@ SDState *sd_init(BlockBackend *blk, bool is_spi) sd->blk = blk; sd_reset(sd); if (sd->blk) { - blk_attach_dev_nofail(sd->blk, sd); + /* Attach dev if not already attached. (This call ignores an + * error return code if sd->blk is already attached.) */ + blk_attach_dev(sd->blk, sd); blk_set_dev_ops(sd->blk, &sd_block_ops, sd); } vmstate_register(NULL, -1, &sd_vmstate, sd); diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index e63367b..6e01de7 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1142,13 +1142,9 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) } } -static void sdhci_initfn(SDHCIState *s) +static void sdhci_initfn(SDHCIState *s, BlockBackend *blk) { - DriveInfo *di; - - /* FIXME use a qdev drive property instead of drive_get_next() */ - di = drive_get_next(IF_SD); - s->card = sd_init(di ? blk_by_legacy_dinfo(di) : NULL, false); + s->card = sd_init(blk, false); if (s->card == NULL) { exit(1); } @@ -1214,7 +1210,8 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ -static Property sdhci_properties[] = { +static Property sdhci_pci_properties[] = { + DEFINE_BLOCK_PROPERTIES(SDHCIState, conf), DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), @@ -1226,7 +1223,7 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) SDHCIState *s = PCI_SDHCI(dev); dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ - sdhci_initfn(s); + sdhci_initfn(s, s->conf.blk); s->buf_maxsz = sdhci_get_fifolen(s); s->fifo_buffer = g_malloc0(s->buf_maxsz); s->irq = pci_allocate_irq(dev); @@ -1253,9 +1250,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_properties; - /* Reason: realize() method uses drive_get_next() */ - dc->cannot_instantiate_with_device_add_yet = true; + dc->props = sdhci_pci_properties; } static const TypeInfo sdhci_pci_info = { @@ -1265,10 +1260,21 @@ static const TypeInfo sdhci_pci_info = { .class_init = sdhci_pci_class_init, }; +static Property sdhci_sysbus_properties[] = { + DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, + SDHC_CAPAB_REG_DEFAULT), + DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void sdhci_sysbus_init(Object *obj) { SDHCIState *s = SYSBUS_SDHCI(obj); - sdhci_initfn(s); + DriveInfo *di; + + /* FIXME use a qdev drive property instead of drive_get_next() */ + di = drive_get_next(IF_SD); + sdhci_initfn(s, di ? blk_by_legacy_dinfo(di) : NULL); } static void sdhci_sysbus_finalize(Object *obj) @@ -1295,7 +1301,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_properties; + dc->props = sdhci_sysbus_properties; dc->realize = sdhci_sysbus_realize; /* Reason: instance_init() method uses drive_get_next() */ dc->cannot_instantiate_with_device_add_yet = true; diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h index 3352d23..e2de92d 100644 --- a/hw/sd/sdhci.h +++ b/hw/sd/sdhci.h @@ -26,6 +26,7 @@ #define SDHCI_H #include "qemu-common.h" +#include "hw/block/block.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/sd.h" @@ -239,6 +240,7 @@ typedef struct SDHCIState { }; SDState *card; MemoryRegion iomem; + BlockConf conf; QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer;