From nobody Tue Oct 28 12:15:19 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 1514997011418884.4460451226569; Wed, 3 Jan 2018 08:30:11 -0800 (PST) Received: from localhost ([::1]:57201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlve-0000Zl-M5 for importer@patchew.org; Wed, 03 Jan 2018 11:30:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlq1-00048l-D1 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWlpz-00051a-K7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:21 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWlpz-00051O-FR; Wed, 03 Jan 2018 11:24:19 -0500 Received: by mail-qt0-x243.google.com with SMTP id 33so2736894qtv.1; Wed, 03 Jan 2018 08:24:19 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 102sm839393qkx.85.2018.01.03.08.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 08:24:18 -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=NhfOyUelkpNc4QsRDgwmgWrhckHiJ/ZUYuYm5Hq80/o=; b=H/Q2OcvO7rJKMhtAZCku86PKLQdlq7KAIQTDgUh6/fO1NdT6RLfgiJKuqmj26TEkE6 hnzJwr7EUx545i+3bBOOETgdyeyupisCGSLZPElxozUskNcchhStKpYpth7/gzBGSMEn adizXIdNaxDjN/IcCOEmFQPE81MAUsNO90ZpXkNrJNx6E1M3kjrraVS7YM8uEM7nhYaD H7zlsXzF6+DkkaRwxOf5pqtV+jymRA8Dg4TROisg55BrifNyd+f6einIS4K74+4O11Q5 JVfARGL+hBGHejVrnapABjq8U7v8LM0Hz+V47oSdrkI+Yflkeml5uyCK8X3j8DbI73R9 YlpQ== 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=NhfOyUelkpNc4QsRDgwmgWrhckHiJ/ZUYuYm5Hq80/o=; b=GGikwBfu1/Y/OBFwkvtkzh5GL9STICe1CiX+AEunIsmEFuCC5EBiHfAFagvwWZg8pq 7k+ToFwED9O6YlTrk7a8L63U5ehX7PSOenFULANwFWkVgJsHuHsPNczOSEvl7xGMEty+ 9EOP9/he1lHiaKGx1poHQwrDc0pfGi9bmOAzbZiSgcrPy+PGpIGYoqDacJ/UTJ4dv/TY xL5Pm5OemCHBYTcReu/s/rs91dLr43qVdcJ65k77hRv7zecQ1rbiKhurGS7Ns5G3iOdV n2t5oWsxR7lVDAL0Iw/jMVLw3g8P+i4KWd/BQix/ri2x+YbK70M9jPa7xYz/KyLJqwWJ BHxA== X-Gm-Message-State: AKGB3mIXQzf5nxwo27sZ4P1bMftNhtGC1NatDG2AIxFiixPzK0L3bkTP ja6dq/f7RmQPozIydVONOkw= X-Google-Smtp-Source: ACJfBouuwT5Fn5D/ewTjAn7MIdMXEUMr9v0cSn0ldHCUTJAdNabdhUN9vl5dN+5MA0mJCUAXBK/L/g== X-Received: by 10.237.55.9 with SMTP id i9mr2410920qtb.164.1514996658972; Wed, 03 Jan 2018 08:24:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell Date: Wed, 3 Jan 2018 13:23:58 -0300 Message-Id: <20180103162400.10396-5-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:c0d::243 Subject: [Qemu-devel] [PATCH 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: 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/pl181.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 55c8098ecd..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; } } @@ -498,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; =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); - 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