From nobody Tue Feb 10 16:22:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516680201396454.6916565655829; Mon, 22 Jan 2018 20:03:21 -0800 (PST) Received: from localhost ([::1]:32804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpns-0000qQ-N5 for importer@patchew.org; Mon, 22 Jan 2018 23:03:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpjf-0006EB-ND for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:59:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpje-0002Uj-P7 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:59 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpje-0002Ty-LK for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:58 -0500 Received: by mail-qt0-x242.google.com with SMTP id z11so26573487qtm.3 for ; Mon, 22 Jan 2018 19:58:58 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id n24sm12447530qta.26.2018.01.22.19.58.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:58:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vC5Rjp8B9ERLFSPMdDNt9s4OJde4W0rGxmCdYVqNyEU=; b=Fh4BXiv6fKdTbdiQFgdWfy9+ddFAZxQIWEqObgY//vnUoOQnlPkqK6i+eTWo51APU8 g4NmjBi1Wrxnq0r0fMs0dI9mlp87VJG9RQpIfukBO4PqPcSogwZEKLs6M2NjUT7wRbd8 kjSzyLLMhEZt3AIvTPBI0mg9sT4JPimT5M+4r6YrVBEzFv+hQIqufH0AUYZ5VH1GOf76 BrmbE9aPL5m/BrI4Z1T8j4qufX1g7Cu8blXl1QzM7f+JLpoHh88+Mc7lx4az37X8FJpv sDXJadz9WrworwYWyqo5jKDLJusHD4pqcQYSzZRDrXHO70IpbUEiVzkTFz1vnCf5JpA0 wKkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vC5Rjp8B9ERLFSPMdDNt9s4OJde4W0rGxmCdYVqNyEU=; b=IPlrTHCyEFQqzCWwcNKp0cgnU4pY20mEilmGxLU/FKR3jrNYCiuWPaIInl6rp7KgE8 077erZALs8UdiBZoijnbz+ZLiYlJY3pbM8hSaCZu24e+1PnzSZ89pO/hezsJWniS5AuU 8W20BCyiuKbg9ss2N7sqVcto5EnMePD6FotnZjaNj0PRyQEdd+xa7DbbObdQAZuoNc41 8DXe7Jm8+r0md85lsMhof8dj0LGlLI5pZ0VKMvTubqSDpDMCpVuReuycm1tRSmyVKDLv YLiAkN9oq19gG83dIV/zfosKpvgQWRCiKyhkFUkMh5vuukXWYhuF/gjZRlYIJ1m5vXxO d70A== X-Gm-Message-State: AKwxytemJ+lwg3mdi5g9sKD6BBM1VeJHgUakuU9+QDNa4gIsatEc/+L7 Sph36riV5+XyHE2Tqqc7iLE= X-Google-Smtp-Source: AH8x226MEP499GsR98C/7haSc48EvWyXpO0iEr36DEiPzhOXy5KnkO0SdZs7eJK0RuT8QuW9++xAgA== X-Received: by 10.200.46.139 with SMTP id h11mr1614831qta.111.1516679938058; Mon, 22 Jan 2018 19:58:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Michael Walle Date: Tue, 23 Jan 2018 00:58:36 -0300 Message-Id: <20180123035837.16578-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123035837.16578-1-f4bug@amsat.org> References: <20180123035837.16578-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 5/6] hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 On reset the bus will reset the card, we can now drop the device_reset() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/ssi-sd.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index f88f509e0a..ae04b6641b 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -47,7 +47,7 @@ typedef struct { int32_t arglen; int32_t response_pos; int32_t stopping; - SDState *sd; + SDBus sdbus; } ssi_sd_state; =20 #define TYPE_SSI_SD "ssi-sd" @@ -100,7 +100,7 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t= val) request.arg =3D (s->cmdarg[0] << 24) | (s->cmdarg[1] << 16) | (s->cmdarg[2] << 8) | s->cmdarg[3]; DPRINTF("CMD%d arg 0x%08x\n", s->cmd, request.arg); - s->arglen =3D sd_do_command(s->sd, &request, longresp); + s->arglen =3D sdbus_do_command(&s->sdbus, &request, longresp); if (s->arglen <=3D 0) { s->arglen =3D 1; s->response[0] =3D 4; @@ -177,7 +177,7 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t= val) DPRINTF("Response 0x%02x\n", s->response[s->response_pos]); return s->response[s->response_pos++]; } - if (sd_data_ready(s->sd)) { + if (sdbus_data_ready(&s->sdbus)) { DPRINTF("Data read\n"); s->mode =3D SSI_SD_DATA_START; } else { @@ -190,8 +190,8 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t= val) s->mode =3D SSI_SD_DATA_READ; return 0xfe; case SSI_SD_DATA_READ: - val =3D sd_read_data(s->sd); - if (!sd_data_ready(s->sd)) { + val =3D sdbus_read_data(&s->sdbus); + if (!sdbus_data_ready(&s->sdbus)) { DPRINTF("Data read end\n"); s->mode =3D SSI_SD_CMD; } @@ -242,13 +242,24 @@ static const VMStateDescription vmstate_ssi_sd =3D { static void ssi_sd_realize(SSISlave *d, Error **errp) { ssi_sd_state *s =3D FROM_SSI_SLAVE(ssi_sd_state, d); + DeviceState *carddev; DriveInfo *dinfo; + Error *err =3D NULL; =20 + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + DEVICE(d), "sd-bus"); + + /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo =3D drive_get_next(IF_SD); - s->sd =3D sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, true); - if (s->sd =3D=3D NULL) { - error_setg(errp, "Device initialization failed."); + carddev =3D qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + if (dinfo) { + qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), = &err); + } + object_property_set_bool(OBJECT(carddev), true, "spi", &err); + object_property_set_bool(OBJECT(carddev), true, "realized", &err); + if (err) { + error_setg(errp, "failed to init SD card: %s", error_get_pretty(er= r)); return; } } @@ -264,11 +275,6 @@ static void ssi_sd_reset(DeviceState *dev) s->arglen =3D 0; s->response_pos =3D 0; s->stopping =3D 0; - - /* Since we're still using the legacy SD API the card is not plugged - * into any bus, and we must reset it manually. - */ - device_reset(DEVICE(s->sd)); } =20 static void ssi_sd_class_init(ObjectClass *klass, void *data) --=20 2.15.1