From nobody Fri Oct 24 20:22:34 2025 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 1518748345276369.16805316812156; Thu, 15 Feb 2018 18:32:25 -0800 (PST) Received: from localhost ([::1]:57246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVp2-0007BB-BH for importer@patchew.org; Thu, 15 Feb 2018 21:32:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVml-0005RW-Jf for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmk-0002Vq-Hy for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:03 -0500 Received: from mail-ua0-x241.google.com ([2607:f8b0:400c:c08::241]:35954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmk-0002Vg-DQ for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:02 -0500 Received: by mail-ua0-x241.google.com with SMTP id i15so1108168uak.3 for ; Thu, 15 Feb 2018 18:30:02 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:01 -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=Ouj1tqjUbLRGKZoruiEsmhvDzM/+AsJn0wUcFNnLHkg=; b=VD3JGK0imj6atcJm2g+CVEeD1ifWqTFDCIJLB57sxp4mA27morEl6G3NzR7IbegdcW mYm7QkcSGNTvyTHl2w/6EqTR5W0z+7o/Wc+RWSZV325U0gvTxERcP9x8du3QPNMzN/CU D1HvGnfh9o0etVDyWbiHeCQFc1E/v33QBf64eyvOaAT3sw/H8h6XdrDHkoxJjdMkDOZO yL+O4fVhC/xRuQQiRe50tMU1WObQAMCm7O+J/2ImhblrHZ5TbxQvbgtrAkL9tnX/uozA m40m1pRCCuhsywDQuYeoptNpv25Cj9sM5zqU2oFRcJmtF5crcn0MraVoA9ExlFZDT9PN ISNA== 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=Ouj1tqjUbLRGKZoruiEsmhvDzM/+AsJn0wUcFNnLHkg=; b=ji/KvyXKxfjOBvxU8/YS83muvgiWgDw9dvz9UnrH8aVrU/AdQT6bIEtlteHPb2d2t3 OnRT2qa4ON6H1rhqqyMzsdcHOOi3IdpVoQLpLbvHyXVORN5cd9q7PFlJlkZCR/f3eFgj ATfmeGL+fo01dM11Ky5Ct8Y+Nf3F1mfzHGpjPcOKOynDZMrNjY7x/v+bWz8WdBfr/t7Z jx65M5l6r5QBbt4uqrs2//vfnUdexf1i1A992xf5FyuCVHXMT4ApeDjTBZpEpwqt4D34 TY1aTmVUX6Czm16NlFhibmCY/ZF/zFKFJjyT4HL0y7P4dH9q/sVL2o+ToOZonn2K/eu6 FPSw== X-Gm-Message-State: APf1xPBZ1NuLqA8cd+fGlbq2yLk4MPctMXrgVgSmjgI1d2R/DRxlOCh8 L93s9zjUsyv1q3CXn7ar2vppARDGJW0= X-Google-Smtp-Source: AH8x225TtRAmipiyCVI4Y+lkBgQpKepiBqqxtw0KFmLjBDd0YXB8S1Hhcg682mMuPywQrKfU5fAybg== X-Received: by 10.176.13.130 with SMTP id i2mr3756028uak.85.1518748201893; Thu, 15 Feb 2018 18:30:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:28 -0300 Message-Id: <20180216022933.10945-4-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-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:400c:c08::241 Subject: [Qemu-devel] [PATCH v3 3/7] hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it 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, Michael Walle 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 using the sdbus_*() API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Acked-by: Michael Walle --- hw/sd/milkymist-memcard.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index a8e65892c7..5570c1e9a0 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -69,7 +69,7 @@ struct MilkymistMemcardState { SysBusDevice parent_obj; =20 MemoryRegion regs_region; - SDState *card; + SDBus sdbus; =20 int command_write_ptr; int response_read_ptr; @@ -105,7 +105,7 @@ static void memcard_sd_command(MilkymistMemcardState *s) req.crc =3D s->command[5]; =20 s->response[0] =3D req.cmd; - s->response_len =3D sd_do_command(s->card, &req, s->response+1); + s->response_len =3D sdbus_do_command(&s->sdbus, &req, s->response + 1); s->response_read_ptr =3D 0; =20 if (s->response_len =3D=3D 16) { @@ -150,10 +150,10 @@ static uint64_t memcard_read(void *opaque, hwaddr add= r, r =3D 0xffffffff; } else { r =3D 0; - r |=3D sd_read_data(s->card) << 24; - r |=3D sd_read_data(s->card) << 16; - r |=3D sd_read_data(s->card) << 8; - r |=3D sd_read_data(s->card); + r |=3D sdbus_read_data(&s->sdbus) << 24; + r |=3D sdbus_read_data(&s->sdbus) << 16; + r |=3D sdbus_read_data(&s->sdbus) << 8; + r |=3D sdbus_read_data(&s->sdbus); } break; case R_CLK2XDIV: @@ -207,10 +207,10 @@ static void memcard_write(void *opaque, hwaddr addr, = uint64_t value, if (!s->enabled) { break; } - sd_write_data(s->card, (value >> 24) & 0xff); - sd_write_data(s->card, (value >> 16) & 0xff); - sd_write_data(s->card, (value >> 8) & 0xff); - sd_write_data(s->card, value & 0xff); + sdbus_write_data(&s->sdbus, (value >> 24) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 16) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 8) & 0xff); + sdbus_write_data(&s->sdbus, value & 0xff); break; case R_ENABLE: s->regs[addr] =3D value; @@ -251,10 +251,6 @@ static void milkymist_memcard_reset(DeviceState *d) for (i =3D 0; i < R_MAX; i++) { s->regs[i] =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->card)); } =20 static void milkymist_memcard_init(Object *obj) @@ -270,15 +266,23 @@ static void milkymist_memcard_init(Object *obj) static void milkymist_memcard_realize(DeviceState *dev, Error **errp) { MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(dev); + DeviceState *carddev; BlockBackend *blk; DriveInfo *dinfo; + Error *err =3D NULL; =20 + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + dev, "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); blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; - s->card =3D sd_init(blk, false); - if (s->card =3D=3D NULL) { - error_setg(errp, "failed to init SD card"); + carddev =3D qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + qdev_prop_set_drive(carddev, "drive", blk, &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; } s->enabled =3D blk && blk_is_inserted(blk); --=20 2.16.1