From nobody Tue Feb 10 16:22:10 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516680183460782.6887925201852; Mon, 22 Jan 2018 20:03:03 -0800 (PST) Received: from localhost ([::1]:32796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpnV-0000by-GV for importer@patchew.org; Mon, 22 Jan 2018 23:02:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpjd-0006BK-1h for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpjb-0002RM-Rt for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:57 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:45933) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpjb-0002R8-Mm; Mon, 22 Jan 2018 22:58:55 -0500 Received: by mail-qt0-x241.google.com with SMTP id x27so26561381qtm.12; Mon, 22 Jan 2018 19:58:55 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id n24sm12447530qta.26.2018.01.22.19.58.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:58:54 -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=0mHP+GrCZYzpSwoDOFPLtU6jbdNgjQf4kSAC2JNN9TU=; b=GCTNcjnwd91JBe4lIuz4JuE43mwY5WpDWEFMsuJ13vLx65mX8U0KAtW/xkU3+JA0h0 9n+qZKQgpkmbSe4lJ2Laa8ociB98gGO+pzRwcV9QlEVPpF2SVGevosW8iomVkZcxHr5C QkYBhRNuDzbFQBdY88c++7E4W357NM9lr4657wHaTP1PiZyZ6V4Npa0tj90iM6GmiI5r JtVTw40sHE0jsi2/V/tmZgqsrHRRk4JGK6wbxQv/FaOV5Ov3uwrqPIKF2gMjDd3syp/H /haVYrc2anEPKlbOU7bVl4611fFJLKo8SKh8LJGSwcSqw0eTUSE7xzB1KyjawcPkRhnB gzzA== 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=0mHP+GrCZYzpSwoDOFPLtU6jbdNgjQf4kSAC2JNN9TU=; b=QyVSmeI1eERM7+pd05maycXRj0J3yHayMcL5HgGxSEc2KaCa8ItCtwm6rf1vVTjN7c 4VDyc8tTMwH0WIoJ+DraFVOuYsXt+4Y+Pq9Ho0qG+XfbGfObEcjn6PLpDoic81hTzNqN 9jq5tmsCCf2aBhqp3DTzHxJt6cfOicwOkJVuQCcWxyti4fmGmn70g3tzD5hHSgguJaQ0 hLTH1XGmesXhImiCLwphMYTdUJhLjax5Qswqm/ZA5Y0t4AGIO5NiwVKJhR1+xYwQ7wA7 UCerG8zxuifll3cnlIwcNifpxuhoZ3nhXhSxasIyZsDbvHbwggKeyToxz0dOOByviBqG /MDA== X-Gm-Message-State: AKwxytf3R1JQzE/4OtTIqNfbXatYK7uReve9JVlXxau84VTqfb7Z67Um oz+D4UXGIn8Odsuyi6sI1go= X-Google-Smtp-Source: AH8x224nvP+RZorObZgjg8rcRfxRG4mBTRonbApHEKN0Gx0IAKzmkAgNTDQ7K4h4YyPGF97sDGvRPQ== X-Received: by 10.200.41.143 with SMTP id 15mr1673676qts.247.1516679935139; Mon, 22 Jan 2018 19:58:55 -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:35 -0300 Message-Id: <20180123035837.16578-5-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::241 Subject: [Qemu-devel] [PATCH v2 4/6] hw/sd/pl181: 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, "open list:ARM PrimeCell and..." 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 --- hw/sd/pl181.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 3ba1f7dd23..ce696c5d7d 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -33,6 +33,7 @@ typedef struct PL181State { SysBusDevice parent_obj; =20 MemoryRegion iomem; + SDBus sdbus; SDState *card; uint32_t clock; uint32_t power; @@ -179,7 +180,7 @@ static void pl181_send_command(PL181State *s) request.cmd =3D s->cmd & PL181_CMD_INDEX; request.arg =3D s->cmdarg; DPRINTF("Command %d %08x\n", request.cmd, request.arg); - rlen =3D sd_do_command(s->card, &request, response); + rlen =3D sdbus_do_command(&s->sdbus, &request, response); if (rlen < 0) goto error; if (s->cmd & PL181_CMD_RESPONSE) { @@ -223,12 +224,12 @@ static void pl181_fifo_run(PL181State *s) int is_read; =20 is_read =3D (s->datactrl & PL181_DATA_DIRECTION) !=3D 0; - if (s->datacnt !=3D 0 && (!is_read || sd_data_ready(s->card)) + if (s->datacnt !=3D 0 && (!is_read || sdbus_data_ready(&s->sdbus)) && !s->linux_hack) { if (is_read) { n =3D 0; while (s->datacnt && s->fifo_len < PL181_FIFO_LEN) { - value |=3D (uint32_t)sd_read_data(s->card) << (n * 8); + value |=3D (uint32_t)sdbus_read_data(&s->sdbus) << (n * 8); s->datacnt--; n++; if (n =3D=3D 4) { @@ -249,7 +250,7 @@ static void pl181_fifo_run(PL181State *s) } n--; s->datacnt--; - sd_write_data(s->card, value & 0xff); + sdbus_write_data(&s->sdbus, value & 0xff); value >>=3D 8; } } @@ -480,10 +481,6 @@ static void pl181_reset(DeviceState *d) =20 /* We can assume our GPIO outputs have been wired up now */ sd_set_cb(s->card, s->cardstatus[0], s->cardstatus[1]); - /* 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 pl181_init(Object *obj) @@ -502,14 +499,26 @@ static void pl181_init(Object *obj) static void pl181_realize(DeviceState *dev, Error **errp) { PL181State *s =3D PL181(dev); + DeviceState *carddev; DriveInfo *dinfo; + Error *err =3D NULL; + + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + dev, "sd-bus"); =20 + /* 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->card =3D sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, false); - if (s->card =3D=3D NULL) { - error_setg(errp, "sd_init 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, "realized", &err); + if (err) { + error_setg(errp, "failed to init SD card: %s", error_get_pretty(er= r)); + return; } + s->card =3D SD_CARD(carddev); } =20 static void pl181_class_init(ObjectClass *klass, void *data) --=20 2.15.1