From nobody Tue Oct 28 12:15:20 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 1514996910733371.3172547291506; Wed, 3 Jan 2018 08:28:30 -0800 (PST) Received: from localhost ([::1]:57150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlu1-0007G4-VQ for importer@patchew.org; Wed, 03 Jan 2018 11:28:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlpy-00045v-5C for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWlpx-00050Q-4z for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:18 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36753) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWlpx-000506-0d; Wed, 03 Jan 2018 11:24:17 -0500 Received: by mail-qk0-x241.google.com with SMTP id g123so2161140qka.3; Wed, 03 Jan 2018 08:24:16 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 102sm839393qkx.85.2018.01.03.08.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 08:24:16 -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=RTc1e3AR/OMsnSccX4Hi9/3/0aB/T5uBUr1Z5g+RhdM=; b=UACM9sHqdtD8CI8vjWBcxDkiR4gUsoQF1igbXJy3vV1waCo6E9GP/lffIWurxRJVJL UNFo8f0NDdCbQHvKpdQuiWVC8lg/NGAt5XNvspgGi6DMYPoAeWR1bNFAGCR5Ek2GynLP MSJkOF8uq62Nof1gcrYdoX9/Seq+glsFxqa9iYUlOwN1ZfHKdt0/3Xzbfofz7/Bxj8Ef CtSe5pH6ykd3EZtlpCfy2qUdlGcHsCgBsYnd7l948KEqihZwRelnBR2Y1l8VZcHtafLe lp84SevcaT/WOvPkPkSZVj/M0hqdhv7yp90aE1DdM9bLCtYE6+Jj4IVATjojfbAq5OMF zd6Q== 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=RTc1e3AR/OMsnSccX4Hi9/3/0aB/T5uBUr1Z5g+RhdM=; b=tdRSBY7UN97JrpUwM0C/66TrbmHVF8+xrry+nd3/s7aJn55NGVIjzi4c2tLE7WNd4i Z582p1F6HVOLZKLGFq2fomKdcCAaw3VznsznRlXd7frc/tf/Idwwmb29FXATtLmRy9Vq +R5yZBqzE2od0BZfg9VQ2e/tXrJ7CJ1y2u856SgVs+BMOcux07KQ+o5O3VDIelpsgYyi csewukQf3gadoN5Zi1EqSbtkncE8lbUJrJcChH7medSMMpHjj/GRCyk/fGASIHiF0znF epeRGZtpNzPwZe1EkmBUmbPz8OlldwnN9nCQe4UHOR5fN+xrRJ6XXErvk+ypbjmjH8o0 4cJw== X-Gm-Message-State: AKGB3mK1VgC4VBcWZwYuRkVqH0cDLGwDdlWKDSI/9tAPmIZ5Zfw7iwFe n9Bc6YH7v2IhBHV4zIQsIKQ= X-Google-Smtp-Source: ACJfBoutYM5bpTl5wXxAajVy0w6VLT23n9D20Gta9M0HPGLu94RHR476nBV9ugekez2eenhx2Th84Q== X-Received: by 10.55.189.130 with SMTP id n124mr2313166qkf.297.1514996656574; Wed, 03 Jan 2018 08:24:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Michael Walle Date: Wed, 3 Jan 2018 13:23:57 -0300 Message-Id: <20180103162400.10396-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103162400.10396-1-f4bug@amsat.org> References: <20180103162400.10396-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:c09::241 Subject: [Qemu-devel] [PATCH 3/6] 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: qemu-arm@nongnu.org, =?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 using the sdbus_*() API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/milkymist-memcard.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 5df3a0f815..9f4c7dad63 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -68,7 +68,7 @@ struct MilkymistMemcardState { SysBusDevice parent_obj; =20 MemoryRegion regs_region; - SDState *card; + SDBus sdbus; =20 int command_write_ptr; int response_read_ptr; @@ -104,7 +104,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) { @@ -149,10 +149,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: @@ -206,10 +206,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; @@ -266,15 +266,23 @@ static int milkymist_memcard_init(SysBusDevice *dev) 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.15.1