From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061174; cv=none;
d=zohomail.com; s=zohoarc;
b=c/ulRm0G+EQm5NBM6H6igDOheX47PaldUcUnEJe0IgU+LcmrVpxYLTlt+oxjzujvQhfbNCUk/on7a2jbCwHuLtCkwHxknAGhq5IutFeQ9LMuzT7sTe0rSIAuNG5lBv9S5gH6cZzB8vIxywBs5zea4SpUpxX7U/rktP/VqpQdz5g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061174;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=zcfm9SzMz6jhWF/u427K9kqe8ff3/Kqz7PzZhpvPw/Y=;
b=lBXZpztNxoKnQAO8L5u3yuX0C0xicF7KmGZ7rrv+ECFQTe5LrGVmyQhTSe8rB2VI7/I8gXbwTPLt3KE1AtI5yK/Zvj1IC/c0Np/W2/MeKTEQXYsDdPKYhopC9EMmEUkzwSI5cyxDki3H8oH4IferHH7Mr3GuuwVawrLWu9Z0a7A=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061174683131.5910945557075;
Tue, 28 Jan 2025 02:46:14 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6M-0001An-30; Tue, 28 Jan 2025 05:45:51 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj5y-00017X-LQ
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:27 -0500
Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj5w-0003VC-8g
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:25 -0500
Received: by mail-wr1-x42d.google.com with SMTP id
ffacd0b85a97d-3862a921123so3644476f8f.3
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:23 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:21 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061123; x=1738665923; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=zcfm9SzMz6jhWF/u427K9kqe8ff3/Kqz7PzZhpvPw/Y=;
b=lvyySGqt7lq0rbSP8bQWG3D5JJIQnha6WDTbS8f0gBhdSET/XKxZplK/03361iLEFO
msXZg2uPBynKxEACiheUD1pp1izqqup8wE5URbY3mSjvGekeIYGNdvQ56ulpyG9qCgrP
y9p+yWyYOWJ10OtWvT99IM3EVClFevyAE8052nk0EJEOTQJhdejcn1NvTEcWbkRAR40O
1RepAY8vH9n4SmCN6qTlPYeDfQKwpNXcF60fT5unb9kYsMMWqE1tcvCDo1x988YDFVPK
SpHAAgYW/7mQHFCbbM7Q9WPpoTysvMw6ss/dkhDP1NN8GydyXRrcqOufSjhVWMdt/+YJ
f4Tg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061123; x=1738665923;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=zcfm9SzMz6jhWF/u427K9kqe8ff3/Kqz7PzZhpvPw/Y=;
b=S97vQbNUlEYyHOeB55Cnx3CdFVHycPCvSu/nbsALT97W+EV0jAg+n2eGR1ZT+XS1k+
1RuVpOSSKCKkqn9zDB8119OuJDLnF/SKEIsTaRv5fmYdgIOYZYOTxkhSl03MFFNYDIFE
PbgnMS9CGVARAkQJnG9RPn1f15dChrOdeVUsKFG4AceyV9gkUEkquTcYZvw4MqBenHCw
XuUOJ0msxjK0+SCa/12M6SPXDds4+wq9TRV3JHV/bJaFmK702PrwsGPI+JguIiPkkJFo
JNIf7eSUGTzzMxTsDPrpaERd1/ewWaQRZejw+INoi1aDxWTzX7KL7SpIb7MPcJ1KeG/8
+EBA==
X-Forwarded-Encrypted: i=1;
AJvYcCVujrImU4QuyDYf/M5sbXjf3OUkjTrt7CKrcNC+q8jWLGEqV+Dt/lcU2B3G18aI8atWKZNiJEtiTs8m@nongnu.org
X-Gm-Message-State: AOJu0YwIiVa6GZBev/Z8Wx0u7ECLgGUuitmFnk9Tch+54ON2u07OsKuO
KtaUC6OQGISON++jL3G0VjWEA0DRrLQJWfGVnj7mjyQH4sHObX4ssvQhG27RpAU=
X-Gm-Gg: ASbGnctO0Voa2SsST3+tCl60ew3d9z8aGzDDSOPu9Gj4tbiQTTR8XVltvtTVH8BMpR7
6GdIbiYRi7lzIZJnId9d5Awjiqx2o8sSDt0P8cvVaHj3dcGi8xyvmecU/PAOIEn6jRh1TBrNnCJ
udO88Tsy7VGdWPn493YxOQu4n3EqR6ytULQsQD0VECdbR56hEKnciPfkBSwt3C4d+V9yCO6vrOA
WQqO00TMJJ9A5esq45L3kNXiwIqRMMWVoVdrvi2nwCYDz7xnE+tWV0h8CPjnN9CU890o6KDDZn3
1Fh3CjGYUpPYeHwN39is
X-Google-Smtp-Source:
AGHT+IEFPn5TsGYOw3BklNr6kxn9l6B1DBvNSKo4fKI3KtM7KPlKliQuFmRwIGpyTm8wIsImwOJ/FQ==
X-Received: by 2002:a05:6000:1849:b0:38a:8888:c0b6 with SMTP id
ffacd0b85a97d-38bf57bfcf5mr46327535f8f.51.1738061122744;
Tue, 28 Jan 2025 02:45:22 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 01/11] hw/sd/omap_mmc: Do a minimal conversion to QDev
Date: Tue, 28 Jan 2025 10:45:09 +0000
Message-Id: <20250128104519.3981448-2-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42d;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061175268019000
Content-Type: text/plain; charset="utf-8"
Do a minimal conversion of the omap_mmc device model to QDev.
In this commit we do the bare minimum to produce a working device:
* add the SysBusDevice parent_obj and the usual type boilerplate
* omap_mmc_init() now returns a DeviceState*
* reset is handled by sysbus reset, so the SoC reset function
doesn't need to call omap_mmc_reset() any more
* code that should obviously be in init/realize is moved there
from omap_mmc_init()
We leave various pieces of cleanup to later commits:
* rationalizing 'struct omap_mmc_s *' to 'OMAPMMCState *'
* using gpio lines rather than having omap_mmc_init() directly
set s->irq, s->dma
* switching away from the legacy SD API and instead having
the SD card plugged into a bus
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/arm/omap.h | 15 ++++----
hw/arm/omap1.c | 1 -
hw/sd/omap_mmc.c | 83 +++++++++++++++++++++++++++++++++++--------
3 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 420ed1d5735..6339c5a581e 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -529,12 +529,13 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion =
*sysmem,
omap_clk clk);
=20
/* omap_mmc.c */
-struct omap_mmc_s;
-struct omap_mmc_s *omap_mmc_init(hwaddr base,
- MemoryRegion *sysmem,
- BlockBackend *blk,
- qemu_irq irq, qemu_irq dma[], omap_clk clk);
-void omap_mmc_reset(struct omap_mmc_s *s);
+#define TYPE_OMAP_MMC "omap-mmc"
+OBJECT_DECLARE_SIMPLE_TYPE(omap_mmc_s, OMAP_MMC)
+
+DeviceState *omap_mmc_init(hwaddr base,
+ MemoryRegion *sysmem,
+ BlockBackend *blk,
+ qemu_irq irq, qemu_irq dma[], omap_clk clk);
=20
/* omap_i2c.c */
I2CBus *omap_i2c_bus(DeviceState *omap_i2c);
@@ -601,7 +602,7 @@ struct omap_mpu_state_s {
/* MPU public TIPB peripherals */
struct omap_32khz_timer_s *os_timer;
=20
- struct omap_mmc_s *mmc;
+ DeviceState *mmc;
=20
struct omap_mpuio_s *mpuio;
=20
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index f3a0ac40e48..ea07b9aa31e 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -3716,7 +3716,6 @@ static void omap1_mpu_reset(void *opaque)
omap_uart_reset(mpu->uart[0]);
omap_uart_reset(mpu->uart[1]);
omap_uart_reset(mpu->uart[2]);
- omap_mmc_reset(mpu->mmc);
omap_mpuio_reset(mpu->mpuio);
omap_uwire_reset(mpu->microwire);
omap_pwl_reset(mpu->pwl);
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 1d4e30e6b7b..9cba437f74e 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -21,11 +21,15 @@
=20
#include "qemu/osdep.h"
#include "qemu/log.h"
+#include "qapi/error.h"
#include "hw/irq.h"
+#include "hw/sysbus.h"
#include "hw/arm/omap.h"
#include "hw/sd/sdcard_legacy.h"
=20
-struct omap_mmc_s {
+typedef struct omap_mmc_s {
+ SysBusDevice parent_obj;
+
qemu_irq irq;
qemu_irq *dma;
qemu_irq coverswitch;
@@ -66,7 +70,7 @@ struct omap_mmc_s {
int cdet_enable;
int cdet_state;
qemu_irq cdet;
-};
+} OMAPMMCState;
=20
static void omap_mmc_interrupts_update(struct omap_mmc_s *s)
{
@@ -297,7 +301,7 @@ static void omap_mmc_pseudo_reset(struct omap_mmc_s *ho=
st)
host->fifo_len =3D 0;
}
=20
-void omap_mmc_reset(struct omap_mmc_s *host)
+static void omap_mmc_reset(struct omap_mmc_s *host)
{
host->last_cmd =3D 0;
memset(host->rsp, 0, sizeof(host->rsp));
@@ -328,7 +332,9 @@ void omap_mmc_reset(struct omap_mmc_s *host)
* into any bus, and we must reset it manually. When omap_mmc is
* QOMified this must move into the QOM reset function.
*/
- device_cold_reset(DEVICE(host->card));
+ if (host->card) {
+ device_cold_reset(DEVICE(host->card));
+ }
}
=20
static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size)
@@ -583,29 +589,76 @@ static const MemoryRegionOps omap_mmc_ops =3D {
.endianness =3D DEVICE_NATIVE_ENDIAN,
};
=20
-struct omap_mmc_s *omap_mmc_init(hwaddr base,
- MemoryRegion *sysmem,
- BlockBackend *blk,
- qemu_irq irq, qemu_irq dma[], omap_clk clk)
+DeviceState *omap_mmc_init(hwaddr base,
+ MemoryRegion *sysmem,
+ BlockBackend *blk,
+ qemu_irq irq, qemu_irq dma[], omap_clk clk)
{
- struct omap_mmc_s *s =3D g_new0(struct omap_mmc_s, 1);
+ DeviceState *dev;
+ OMAPMMCState *s;
+
+ dev =3D qdev_new(TYPE_OMAP_MMC);
+ s =3D OMAP_MMC(dev);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
=20
s->irq =3D irq;
s->dma =3D dma;
s->clk =3D clk;
- s->lines =3D 1; /* TODO: needs to be settable per-board */
- s->rev =3D 1;
=20
- memory_region_init_io(&s->iomem, NULL, &omap_mmc_ops, s, "omap.mmc", 0=
x800);
- memory_region_add_subregion(sysmem, base, &s->iomem);
+ memory_region_add_subregion(sysmem, base,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(s), =
0));
=20
/* Instantiate the storage */
s->card =3D sd_init(blk, false);
if (s->card =3D=3D NULL) {
exit(1);
}
+ return dev;
+}
+
+static void omap_mmc_reset_hold(Object *obj, ResetType type)
+{
+ OMAPMMCState *s =3D OMAP_MMC(obj);
=20
omap_mmc_reset(s);
-
- return s;
}
+
+static void omap_mmc_initfn(Object *obj)
+{
+ OMAPMMCState *s =3D OMAP_MMC(obj);
+
+ /* In theory these could be settable per-board */
+ s->lines =3D 1;
+ s->rev =3D 1;
+
+ memory_region_init_io(&s->iomem, obj, &omap_mmc_ops, s, "omap.mmc", 0x=
800);
+ sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
+}
+
+static void omap_mmc_realize(DeviceState *dev, Error **errp)
+{
+}
+
+static void omap_mmc_class_init(ObjectClass *oc, void *data)
+{
+ DeviceClass *dc =3D DEVICE_CLASS(oc);
+ ResettableClass *rc =3D RESETTABLE_CLASS(oc);
+
+ rc->phases.hold =3D omap_mmc_reset_hold;
+ dc->realize =3D omap_mmc_realize;
+}
+
+static const TypeInfo omap_mmc_info =3D {
+ .name =3D TYPE_OMAP_MMC,
+ .parent =3D TYPE_SYS_BUS_DEVICE,
+ .instance_size =3D sizeof(OMAPMMCState),
+ .instance_init =3D omap_mmc_initfn,
+ .class_init =3D omap_mmc_class_init,
+};
+
+static void omap_mmc_register_types(void)
+{
+ type_register_static(&omap_mmc_info);
+}
+
+type_init(omap_mmc_register_types)
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061220; cv=none;
d=zohomail.com; s=zohoarc;
b=jWttWjDVO3DXUAho/k6djtwrhbk1/GiOjI09Yv8OW1oASENw74hxX9feJnyTepRmcnsnwgSTTQ9znuCuxL9LsojanBclt/jIDjnNIwFIsDZ0qsPSPVzNF1EcAi6xo5rjT3GC3lgDFYXsdJPmnASiwoJDZO8TpIN+Ldj0d90+wJ8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061220;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=XrDcp9C2vowFkhJ2ur3N47jalbiWCpVSVZgOh5cHSxg=;
b=kgJnp6a8prq5tLFkwIAWaS1wMUG3s5RWfzRJpqc0QRFJhMNvtMDQvdcqFR0dxwNVWR+M+Z7yh9UaHiJRw6k+xEvm0S6AKTnyK4kISYCJQ1fiWtRvd8czBMnFfpqXx1OM/gwgfYQB0JowqQufLYnieTTRqV0UOW1CLPAtxgopKDg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061220004286.67067781724813;
Tue, 28 Jan 2025 02:47:00 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6R-0001E7-GY; Tue, 28 Jan 2025 05:45:55 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj60-00017d-4s
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:28 -0500
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj5y-0003Vu-Ep
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:27 -0500
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-437a92d7b96so55932205e9.2
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:25 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061124; x=1738665924; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=XrDcp9C2vowFkhJ2ur3N47jalbiWCpVSVZgOh5cHSxg=;
b=QVxxfbk5UOllJQq7NMzjpdzh+Wdu/jcnCk4RG9CYqX/i9QH0RZH0qj4neajXn82Ese
VMeRXePuTYL2Ko/1V9vW7+j7hV3vzpufUSaN3RDh7PMDGT/lgXtDRh3PfC/Zaji6B0s+
ggE0eObxg5r+KCES6M+dvE5b32djQazUNl04q0xkuhZqeTd4Qugb0i+d6MRAEH+a54aS
iAtZS/BhT4nuzq5CFeNxCC+q1pDWP1dREsJsedKEM0lwh1obxGWuXr4mJESxZarUbu6I
zGNimoxCeaXnv3kZaer1WbQrSses6duaKQCxxlGzoxhOXkVj8dDFHeT7RhUffugLUYk9
WPyw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061124; x=1738665924;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=XrDcp9C2vowFkhJ2ur3N47jalbiWCpVSVZgOh5cHSxg=;
b=sfsMuuJQelMzvJq7CJhKUI994tAg88g184MJRnm2IK86V7F5tA03IvLKPGdKGmILk3
/fciAGYaojTrV6xkXi+rjk0sVpGBbXoNRjxVdiSpuvaOf3hu/Q0pRZxkz1AuKgdr+vO7
Kx7ne85v4THpA3GTw9OHbske4ZeY8s+LCV4GAW9Oia4NLYJmQsEHSLgB+3rTKZ+TH2/t
077duDigyJHOM5V1ifY/vZSvWvrIcF9VS9pBRQuT/iid3hXvvQLEX3DhVks/2nRfM68e
lbFVjoVbKkoqFzF+R+Yx/6rmgSrQ696um7EFHA1Qpwqb1hUC4ELd7x56U+27s1vX/JDw
JPfw==
X-Forwarded-Encrypted: i=1;
AJvYcCW1YvldBeFVPlxfcgRuRNdvttiFnzZZ2uVOvJf6JMdOIeuQ4etnh7gIINtNnCt57ha/mOabc2t6/qly@nongnu.org
X-Gm-Message-State: AOJu0YxE2gzjVTbgFAJateYsreQYff9ytCLzgprBmWtBifjNwOc0J5tm
vJk6VTZc9McQm7Y4FWldwOL/VpMnB5z85oS+qfLngpfQRepFHK2FvBUP5nIj1P4=
X-Gm-Gg: ASbGnctm8f+0pLUiAcHDyn10XOFpWZAreVW5k9EMxayUGMEBbJiT/vIsrLmkqXBhyUg
2NmAhMx9l6MMEw04Dx0UCTGHy5WjKOF7xGI+4RIBEgIr6fNVSYbMKDrWCrukhQgRREYTR/DBzlo
KsDdE4JgANVD5nq3HB8C6gDHXF4CVSmjuztGdXgwqgOcBl7c4sNSgXvroSnMkDoSlNKE3jkXyvO
iZ/JZy2Po852wUwo8VeaK70Xgv7a5kkhV90baQPnOmUbwfri7ot56Nw2NgBEhJF+ova2kjAH7N8
u2ZA8GjaDw+TmmDXqvtM
X-Google-Smtp-Source:
AGHT+IGAnMiFAiV+C4yoRdmBlKIi6PJW+NXQlw6VBvZxBqSAqnJ/O775tggZbWvyiyBeRUgPHHDZ8w==
X-Received: by 2002:a05:600c:3114:b0:434:a386:6cf with SMTP id
5b1f17b1804b1-438913bff57mr404650415e9.2.1738061123943;
Tue, 28 Jan 2025 02:45:23 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 02/11] hw/sd/omap_mmc: Convert remaining 'struct omap_mmc_s'
uses to OMAPMMCState
Date: Tue, 28 Jan 2025 10:45:10 +0000
Message-Id: <20250128104519.3981448-3-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061221210019000
Content-Type: text/plain; charset="utf-8"
Mechanically convert the remaining uses of 'struct omap_mmc_s' to
'OMAPMMCState'.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/arm/omap.h | 2 +-
hw/sd/omap_mmc.c | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 6339c5a581e..7d1a1afc4f8 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -530,7 +530,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *s=
ysmem,
=20
/* omap_mmc.c */
#define TYPE_OMAP_MMC "omap-mmc"
-OBJECT_DECLARE_SIMPLE_TYPE(omap_mmc_s, OMAP_MMC)
+OBJECT_DECLARE_SIMPLE_TYPE(OMAPMMCState, OMAP_MMC)
=20
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 9cba437f74e..dd45abc075e 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -27,7 +27,7 @@
#include "hw/arm/omap.h"
#include "hw/sd/sdcard_legacy.h"
=20
-typedef struct omap_mmc_s {
+typedef struct OMAPMMCState {
SysBusDevice parent_obj;
=20
qemu_irq irq;
@@ -72,12 +72,12 @@ typedef struct omap_mmc_s {
qemu_irq cdet;
} OMAPMMCState;
=20
-static void omap_mmc_interrupts_update(struct omap_mmc_s *s)
+static void omap_mmc_interrupts_update(OMAPMMCState *s)
{
qemu_set_irq(s->irq, !!(s->status & s->mask));
}
=20
-static void omap_mmc_fifolevel_update(struct omap_mmc_s *host)
+static void omap_mmc_fifolevel_update(OMAPMMCState *host)
{
if (!host->transfer && !host->fifo_len) {
host->status &=3D 0xf3ff;
@@ -125,7 +125,7 @@ typedef enum {
SD_TYPE_ADTC =3D 3, /* addressed with data transfer */
} MMCCmdType;
=20
-static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir,
+static void omap_mmc_command(OMAPMMCState *host, int cmd, int dir,
MMCCmdType type, int busy,
sd_rsp_type_t resptype, int init)
{
@@ -234,7 +234,7 @@ static void omap_mmc_command(struct omap_mmc_s *host, i=
nt cmd, int dir,
host->status |=3D 0x0001;
}
=20
-static void omap_mmc_transfer(struct omap_mmc_s *host)
+static void omap_mmc_transfer(OMAPMMCState *host)
{
uint8_t value;
=20
@@ -289,19 +289,19 @@ static void omap_mmc_transfer(struct omap_mmc_s *host)
=20
static void omap_mmc_update(void *opaque)
{
- struct omap_mmc_s *s =3D opaque;
+ OMAPMMCState *s =3D opaque;
omap_mmc_transfer(s);
omap_mmc_fifolevel_update(s);
omap_mmc_interrupts_update(s);
}
=20
-static void omap_mmc_pseudo_reset(struct omap_mmc_s *host)
+static void omap_mmc_pseudo_reset(OMAPMMCState *host)
{
host->status =3D 0;
host->fifo_len =3D 0;
}
=20
-static void omap_mmc_reset(struct omap_mmc_s *host)
+static void omap_mmc_reset(OMAPMMCState *host)
{
host->last_cmd =3D 0;
memset(host->rsp, 0, sizeof(host->rsp));
@@ -340,7 +340,7 @@ static void omap_mmc_reset(struct omap_mmc_s *host)
static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size)
{
uint16_t i;
- struct omap_mmc_s *s =3D opaque;
+ OMAPMMCState *s =3D opaque;
=20
if (size !=3D 2) {
return omap_badwidth_read16(opaque, offset);
@@ -433,7 +433,7 @@ static void omap_mmc_write(void *opaque, hwaddr offset,
uint64_t value, unsigned size)
{
int i;
- struct omap_mmc_s *s =3D opaque;
+ OMAPMMCState *s =3D opaque;
=20
if (size !=3D 2) {
omap_badwidth_write16(opaque, offset, value);
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061259; cv=none;
d=zohomail.com; s=zohoarc;
b=ewMchgOQuB1TbtmGTlBv6V24dDCkd597NMqgR4AwvX6LljgyRCj6aoUdVreMPLG4uZTiu8J0/BBw+tGEtIupXzPN973NJ1B6toy0yXyCb1ealB/3kcZ+dYAcnenczxKwCYezh6R2OpFg3PacwmmqonOovwITIwGc1pHRRKYzQ8M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061259;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=kVKf2PwS8I38xe+s6q6G1j7KxzUeSwKx/0XZ7RVEtQ4=;
b=Yo0P3hyNa6VSNB1L6OYczOEqysmzqh25Q7TbetpebkX+JCEzLFs+fq11SWp03DJ1LOUna4RE4ZuaXMoNHtfwj5hbR7qPpGgc5anbWgpHyD8Se8VgTHLgUzrwUSx6c92u2nQF7tW6u6N6e0C8XcriSw7pddy7awzhGZ1oLbpHB8w=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061259770378.1424546890171;
Tue, 28 Jan 2025 02:47:39 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6q-0001SN-03; Tue, 28 Jan 2025 05:46:20 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj62-00018P-4p
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:30 -0500
Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj5y-0003WZ-Vi
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:29 -0500
Received: by mail-wm1-x32a.google.com with SMTP id
5b1f17b1804b1-43618283dedso57778355e9.3
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:26 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.24
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061125; x=1738665925; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=kVKf2PwS8I38xe+s6q6G1j7KxzUeSwKx/0XZ7RVEtQ4=;
b=nob02JZdE4dkqFMj/PwL5Ut1kCqXGMSZmVj9wVeFYkUyr6HsIth3iWovEq10Rm7YrJ
dAG/xmrcTJNc2m3FCNQz2s1CQDSOyURpsnQ/lRdN2X5IBY7R3GPMDNSfzJ8gNaJkEbKD
HAgpFG7pBBEKh44500gFTUE6k8hx6sC9FoApJNOeu18uFy3dhZD5tjYhj9Jt7MDHo3c4
UNS+CWmtFo6KLD1jCYm0h1J2bjk7jTHGg+rrYM0py8/3VF4pR8ZKtwaIqzpnWT8/ms9C
G4EBfRPi+U+A4U3idfJmHKhPhnuJZOh1oNku/XzAHRWSkDPoWPsRcOkLtPxlKZWp/e3r
jHMQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061125; x=1738665925;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=kVKf2PwS8I38xe+s6q6G1j7KxzUeSwKx/0XZ7RVEtQ4=;
b=pEks02IkmCwi/atkLlr5sBexZJwarSSyG3IIEvpZCmEOUYz+eMBo/QxFtq3PVVxBpM
Lq4G++DHOHaSqrk9iZQ0po3R7U7t+qhuiWPyKqs0zKPZPopJ3gG065gXChyRTV8hGqcX
rHeZ2pxiHuSHhJWSOsRdP52UB174q2sQ3iLjEu7ZWF+ik9w5g65YJG53wclMmoCBsRyH
GK8pUGiw+TCopkefHtOKG686544kMTY6gM+wRDUv9N7yFwXcbgXbDoD2BhrGfn2D5FRU
k2PbaXd1ZSYINAaAmZKQwKzm49KBg8SHSHLkXkjpPQ/UNQ/NecFrUbQUjErdC2Ut5bD5
tNDw==
X-Forwarded-Encrypted: i=1;
AJvYcCX2jAxcPJIHdv/EYG8+MpXlyDF8NfyAKWuFlyD1FWEawsMZN3EcC4MJIz91iMbeXU7XJnjWmeW11ei2@nongnu.org
X-Gm-Message-State: AOJu0Yz0n55ZKP5IAo3+F8g/K56bhWT085bIajnr08xRDTxkgziVB+ot
tCtkizUHOtT2IJgFXGBRLt8GKG/BBohfDCj9xwEmcynrvZnp9An1jXZs+AR0L4w=
X-Gm-Gg: ASbGncvO8DtrfnDKPhpQ6XlnTOL/RnM6mS2sp7UbDglRxBvMkfGWUsEo7g56JaLo4Po
RLdwqLxz1kpxALdw4vWThipmsJXQadyj41qK5Lmcp+X1JyxkE2Jz+PiSK2xNmm8IueYK+rwYLZt
W+XrrYrh76W92oEGqMKPopOwvnu6aQVRhjAvEdA36uH2yXTalOGZWRb14VwAB/mcaW03xYOdK6w
Kd1xLJcHc3mgRS0XWrmEepIW4Nj9qSMMlONZVKQsb+oAil3yq+t7sdCvq9qeh9R8ar5iDodpLrG
u8zQJh2fDiGNlSd4roFj
X-Google-Smtp-Source:
AGHT+IEXNaaNlQMw+Wc6UbliAxDgGFEArnZqIVWC/vQY6e5FKfpMJKE9NtXc+tlfNZCNz2zi8fMsnA==
X-Received: by 2002:a05:6000:144e:b0:38a:88bc:d57d with SMTP id
ffacd0b85a97d-38bf56562e1mr36755509f8f.2.1738061124937;
Tue, 28 Jan 2025 02:45:24 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 03/11] hw/sd/omap_mmc: Convert output qemu_irqs to gpio and
sysbus IRQ APIs
Date: Tue, 28 Jan 2025 10:45:11 +0000
Message-Id: <20250128104519.3981448-4-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32a;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061261440019000
Content-Type: text/plain; charset="utf-8"
The omap_mmc device has three outbound qemu_irq lines:
* one actual interrupt line
* two which connect to the DMA controller and are signalled for
TX and RX DMA
Convert these to a sysbus IRQ and two named GPIO outputs.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/sd/omap_mmc.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index dd45abc075e..d497e31a6c5 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -31,7 +31,8 @@ typedef struct OMAPMMCState {
SysBusDevice parent_obj;
=20
qemu_irq irq;
- qemu_irq *dma;
+ qemu_irq dma_tx_gpio;
+ qemu_irq dma_rx_gpio;
qemu_irq coverswitch;
MemoryRegion iomem;
omap_clk clk;
@@ -87,22 +88,22 @@ static void omap_mmc_fifolevel_update(OMAPMMCState *hos=
t)
if (host->fifo_len > host->af_level && host->ddir) {
if (host->rx_dma) {
host->status &=3D 0xfbff;
- qemu_irq_raise(host->dma[1]);
+ qemu_irq_raise(host->dma_rx_gpio);
} else
host->status |=3D 0x0400;
} else {
host->status &=3D 0xfbff;
- qemu_irq_lower(host->dma[1]);
+ qemu_irq_lower(host->dma_rx_gpio);
}
=20
if (host->fifo_len < host->ae_level && !host->ddir) {
if (host->tx_dma) {
host->status &=3D 0xf7ff;
- qemu_irq_raise(host->dma[0]);
+ qemu_irq_raise(host->dma_tx_gpio);
} else
host->status |=3D 0x0800;
} else {
- qemu_irq_lower(host->dma[0]);
+ qemu_irq_lower(host->dma_tx_gpio);
host->status &=3D 0xf7ff;
}
}
@@ -601,12 +602,13 @@ DeviceState *omap_mmc_init(hwaddr base,
s =3D OMAP_MMC(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
=20
- s->irq =3D irq;
- s->dma =3D dma;
s->clk =3D clk;
=20
memory_region_add_subregion(sysmem, base,
sysbus_mmio_get_region(SYS_BUS_DEVICE(s), =
0));
+ qdev_connect_gpio_out_named(dev, "dma-tx", 0, dma[0]);
+ qdev_connect_gpio_out_named(dev, "dma-rx", 0, dma[1]);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
=20
/* Instantiate the storage */
s->card =3D sd_init(blk, false);
@@ -633,6 +635,10 @@ static void omap_mmc_initfn(Object *obj)
=20
memory_region_init_io(&s->iomem, obj, &omap_mmc_ops, s, "omap.mmc", 0x=
800);
sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
+
+ sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+ qdev_init_gpio_out_named(DEVICE(obj), &s->dma_tx_gpio, "dma-tx", 1);
+ qdev_init_gpio_out_named(DEVICE(obj), &s->dma_rx_gpio, "dma-rx", 1);
}
=20
static void omap_mmc_realize(DeviceState *dev, Error **errp)
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061249; cv=none;
d=zohomail.com; s=zohoarc;
b=RXzHFvLv8lefE+05bGUu6sDmH2H3qd0YKtSCWgiUpsY07LUE8wNyb8oCTsx/n2lmPRs4XFriUNkiyQrO55ikWTEQEqAxGUkMHKgAlW8V6JkE5d60uYno7aO8Bqhh1bMuHGDH5IchgyyunfmxfCxVrqFG99tbGUWPvve4e0LxI2s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061249;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=zJjNi5BZ7mcnb7aQo8EZDoTwnCfEh31OBc5WYUuoav8=;
b=i3ihJxXQwZ9gHkZLHtuaLi0xABCZVf65VzKNr4FndosIQDGHgJRAf8M8kVN6LMR/+afkWTZsnqOlMYBtUytSLAdzwgBJfrki39EQBnYscf+ZJMTTO2Q3W396CPCnvORfDmEDSQkB51Z2E8h5EfFjn/DvilRNL3FX8TDeaITq6C0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061249592456.08454326329365;
Tue, 28 Jan 2025 02:47:29 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6c-0001Jz-Ej; Tue, 28 Jan 2025 05:46:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj65-0001A5-Jj
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj5z-0003Wy-SJ
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:31 -0500
Received: by mail-wm1-x330.google.com with SMTP id
5b1f17b1804b1-4361f796586so59796085e9.3
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:27 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.25
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061126; x=1738665926; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=zJjNi5BZ7mcnb7aQo8EZDoTwnCfEh31OBc5WYUuoav8=;
b=c0768Urk5oWd94LArugm4RbjpWTKd0ATVHChZTlS17NkKaurgW8gTFLZ0HHCgRLYft
bQhAb/4QN3cIT98kMrlMWd4fiNDpe9nzd1u9+19OGPtO0stPMPrkmd1rhMbuzYaZ4QbX
8LW65LoBQqgnhdH243//wpla1kUDXtvHquBhi2ZoyRmuua3vlmUoDo5tVK0esSheaHte
/9skiOKMqREr+FCvC+IUTGGvEjPmXOxBc6XLO0vilHDJjIc4B2bsokIKnE4h0APEhvt4
ShHq5AwLjVpNuan9aXkhm2NoTFXfm6q/oAVhiRZB1FwDdM8PttStqZrsRfrqN38ks6lD
hfDw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061126; x=1738665926;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=zJjNi5BZ7mcnb7aQo8EZDoTwnCfEh31OBc5WYUuoav8=;
b=Jr11xek6bgfJpXvLaLltFZE/vHdCxjqqwmaXnhA2jblkGddtUEJlQFYSU5Rl346tdl
pfoMJs6HhsdMdr18VjOlA6NC2KtETbymNbgR7k6PTDXOxnCYKfJ7tQxXQmKezjR98oMl
ZhJSz6jn8adrsnwlrUWpD6Ivy7K2Vg3vIPTyMjLtc12VvrhyUDmaCezjdMMa1tjXLCI3
bQ3vvhVbFsiBAhAKbp7IGLORL035JdQRbrplFOuLGQmHhrZlKjyh2k6KS/oA+cYHk31Y
BAnHxqlogxVopsry26TPaMVLyW72oExT4JE7tNYGgunLVowooUUautgIGhV8HwMwf13j
1wDA==
X-Forwarded-Encrypted: i=1;
AJvYcCUus8XQgrLcWlSDyaWm4oBnHvUgTLCwcUFUL/cZzu8KUIyps3T+h29vcXe+t6GDLnIYg9GBz55GDiYD@nongnu.org
X-Gm-Message-State: AOJu0YxkkODZhMOE8XMpz1y+BmwYu+whmvv5n3+EKZFxdgxMAY8Aa90R
YlEEsW/1TIlr9/HOfK2vVHXC0q+c5CH3NqbrlOPLlQ/fhtcrPPuuQXsWIcJu0D0=
X-Gm-Gg: ASbGnctOpY3cUjLTgh9hIW6HDVu2rdAfuKPgMZiiLXk7tmHryCjhzRBmLgKkf8UFQoV
Uya8NxVaCEa7CqFRXlNPF467UM+P+ypAGRHZPe1EY0VqcPXluqOAicvGQKfsKUZOQ9ShOE8EqBN
Un+lPe7RsxsTc+pIRvah79WPOGuutYb/G3gLqlYzRssRxuisRz1ugzKT25lxRAsBHCrgTutWuYD
u9nHq+SgTkFopKbFtHR/LgYQdBmQYZcNKBmdyv7B1O2UjNwXnIyyOZDgaFtMeVQ+ay5r851uZvQ
HTHqTbZDANWgIOk7tPMt
X-Google-Smtp-Source:
AGHT+IFyEoGh8VTglXIUSHLVwUPwUkq9rIhLJJXEin6fnNArZA+7ryCGz2vFobQJEmwidumuUJPL4Q==
X-Received: by 2002:a5d:6d86:0:b0:388:c75d:be97 with SMTP id
ffacd0b85a97d-38bf564960cmr40457824f8f.11.1738061126031;
Tue, 28 Jan 2025 02:45:26 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 04/11] hw/sd/omap_mmc: Convert to SDBus API
Date: Tue, 28 Jan 2025 10:45:12 +0000
Message-Id: <20250128104519.3981448-5-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::330;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061251486019000
Content-Type: text/plain; charset="utf-8"
Convert the OMAP MMC controller to the new SDBus API:
* the controller creates an SDBus bus
* instead of sd_foo functions on the SDState object, call
sdbus_foo functions on the SDBus
* the board code creates a proper TYPE_SD_CARD object and attaches
it to the controller's SDBus, instead of the controller creating
a card directly via sd_init() that never gets attached to any bus
* because the SD card object is on a bus, it gets reset automatically
by the "traverse the qbus tree resetting things" code, and we don't
need to manually reset the card from the controller reset function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/arm/omap.h | 1 -
hw/arm/omap1.c | 10 +++++++++-
hw/sd/omap_mmc.c | 30 ++++++++++--------------------
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 7d1a1afc4f8..d20c55a8957 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -534,7 +534,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(OMAPMMCState, OMAP_MMC)
=20
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
- BlockBackend *blk,
qemu_irq irq, qemu_irq dma[], omap_clk clk);
=20
/* omap_i2c.c */
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index ea07b9aa31e..15ba0a0d0c4 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -29,6 +29,7 @@
#include "hw/qdev-properties.h"
#include "hw/arm/boot.h"
#include "hw/arm/omap.h"
+#include "hw/sd/sd.h"
#include "system/blockdev.h"
#include "system/system.h"
#include "hw/arm/soc_dma.h"
@@ -3981,11 +3982,18 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryReg=
ion *dram,
warn_report("missing SecureDigital device");
}
s->mmc =3D omap_mmc_init(0xfffb7800, system_memory,
- dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN),
&s->drq[OMAP_DMA_MMC_TX],
omap_findclk(s, "mmc_ck"));
=20
+ if (dinfo) {
+ DeviceState *card =3D qdev_new(TYPE_SD_CARD);
+ qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
+ &error_fatal);
+ qdev_realize_and_unref(card, qdev_get_child_bus(s->mmc, "sd-bus"),
+ &error_fatal);
+ }
+
s->mpuio =3D omap_mpuio_init(system_memory, 0xfffb5000,
qdev_get_gpio_in(s->ih[1], OMAP_INT_KEYBOAR=
D),
qdev_get_gpio_in(s->ih[1], OMAP_INT_MPUIO),
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index d497e31a6c5..46fdeac1121 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -30,13 +30,14 @@
typedef struct OMAPMMCState {
SysBusDevice parent_obj;
=20
+ SDBus sdbus;
+
qemu_irq irq;
qemu_irq dma_tx_gpio;
qemu_irq dma_rx_gpio;
qemu_irq coverswitch;
MemoryRegion iomem;
omap_clk clk;
- SDState *card;
uint16_t last_cmd;
uint16_t sdio;
uint16_t rsp[8];
@@ -158,7 +159,7 @@ static void omap_mmc_command(OMAPMMCState *host, int cm=
d, int dir,
request.arg =3D host->arg;
request.crc =3D 0; /* FIXME */
=20
- rsplen =3D sd_do_command(host->card, &request, response);
+ rsplen =3D sdbus_do_command(&host->sdbus, &request, response);
=20
/* TODO: validate CRCs */
switch (resptype) {
@@ -247,10 +248,10 @@ static void omap_mmc_transfer(OMAPMMCState *host)
if (host->fifo_len > host->af_level)
break;
=20
- value =3D sd_read_byte(host->card);
+ value =3D sdbus_read_byte(&host->sdbus);
host->fifo[(host->fifo_start + host->fifo_len) & 31] =3D value;
if (-- host->blen_counter) {
- value =3D sd_read_byte(host->card);
+ value =3D sdbus_read_byte(&host->sdbus);
host->fifo[(host->fifo_start + host->fifo_len) & 31] |=3D
value << 8;
host->blen_counter --;
@@ -262,10 +263,10 @@ static void omap_mmc_transfer(OMAPMMCState *host)
break;
=20
value =3D host->fifo[host->fifo_start] & 0xff;
- sd_write_byte(host->card, value);
+ sdbus_write_byte(&host->sdbus, value);
if (-- host->blen_counter) {
value =3D host->fifo[host->fifo_start] >> 8;
- sd_write_byte(host->card, value);
+ sdbus_write_byte(&host->sdbus, value);
host->blen_counter --;
}
=20
@@ -328,14 +329,6 @@ static void omap_mmc_reset(OMAPMMCState *host)
host->clkdiv =3D 0;
=20
omap_mmc_pseudo_reset(host);
-
- /* Since we're still using the legacy SD API the card is not plugged
- * into any bus, and we must reset it manually. When omap_mmc is
- * QOMified this must move into the QOM reset function.
- */
- if (host->card) {
- device_cold_reset(DEVICE(host->card));
- }
}
=20
static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size)
@@ -592,7 +585,6 @@ static const MemoryRegionOps omap_mmc_ops =3D {
=20
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
- BlockBackend *blk,
qemu_irq irq, qemu_irq dma[], omap_clk clk)
{
DeviceState *dev;
@@ -610,11 +602,6 @@ DeviceState *omap_mmc_init(hwaddr base,
qdev_connect_gpio_out_named(dev, "dma-rx", 0, dma[1]);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
=20
- /* Instantiate the storage */
- s->card =3D sd_init(blk, false);
- if (s->card =3D=3D NULL) {
- exit(1);
- }
return dev;
}
=20
@@ -643,6 +630,9 @@ static void omap_mmc_initfn(Object *obj)
=20
static void omap_mmc_realize(DeviceState *dev, Error **errp)
{
+ OMAPMMCState *s =3D OMAP_MMC(dev);
+
+ qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, dev, "sd-bus");
}
=20
static void omap_mmc_class_init(ObjectClass *oc, void *data)
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061336; cv=none;
d=zohomail.com; s=zohoarc;
b=ivAMTZCnM9WWGEyNjplKYNhuumOqL8OUHugNA1zU03/i918s69yYh1hGNHJJ/flLUZxNwfONRXqfkDvAPD51rAVJjan6nN5risKZwn/69FqEBP4hVPtcwv0b2U7Jc97XBXjzjOba1YxK+LeguqWfV8z7EVD0svPBQPm+Vd1mlW8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061336;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=FhOuLd7arurLv4UbtgWbigCBbLZ+aw4LgTQlp527aNE=;
b=nFAuXfRqgYyU76S/Io0hLbj98tgSASCnQN6b5YmUYoNhisjB535dtDCTGHNw8/iPc0hiqDePPkEfx5EPirEcVkAmZUVFPLICkbXzfArAuEMJ0B2Bwjp55bhQL03dDxmLMHGDvtKCKyxM2NpmkPEpi9MmaQ8nBXyJvuzL+Bm1u34=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061336643658.0367231650044;
Tue, 28 Jan 2025 02:48:56 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6c-0001Jn-BR; Tue, 28 Jan 2025 05:46:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj66-0001AD-Kl
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj61-0003XV-UV
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:33 -0500
Received: by mail-wr1-x435.google.com with SMTP id
ffacd0b85a97d-3863c36a731so4509380f8f.1
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:28 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061127; x=1738665927; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=FhOuLd7arurLv4UbtgWbigCBbLZ+aw4LgTQlp527aNE=;
b=QNR6j+jEMTAB3Ey+Ulztu9arK5Px/zlCCaMFuRL4dOc26EC3/1IY3CmfM7Hx+1m+qX
8sJoCqLIRnGNvzobko0OnmxLYyLtkpIgPZtv6hR3KSn96+8IG8WBIL6ABvbXwwWVanty
VnG7jbCA19jTeiLIpUnkQ+Q31bSHn14kQIHgryBeXZWlzbhuO3IUiMlNIi0Nv9wXRW9Y
JUb0uH3jh1e0Unryi1kPavNEIlTxXEzbnkGBCPllJgyXuVwcVoa9UUFKmlRvktWVSsEG
BGoUqxDW27cppTqOA7n8GFXT4vvwm4taNfoZJkx7X7LKU99+5Y99XI+NJyae6JwbpQqU
ZckQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061127; x=1738665927;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=FhOuLd7arurLv4UbtgWbigCBbLZ+aw4LgTQlp527aNE=;
b=JcDnt4tugm3Sbdojol237/tq+m7oHhp/fsOeKEJKCmU1HX9soeZkt7KlsgUe8VnjPz
gwk1kWq/l+rfQT5kfXIudzZAEc1j93dVrx169Ts8xFLajzSw0QDCtCIWpl/vej/ROJAi
MGhKVIZTx+vkCjR6igRqiGjukKD8vyPHXI/BqGIS5ttPltclSL08XjRdCfTthCKd/ZB+
Fg7FD+EGZGjhp9Djxy03zfTTdFuyq/ewSgPwU+3ksO2CWkYYwKPTYJdv5YL/jfpj8rPl
NQZvTh05j8SWrf1bf3b15oquKqb5hfzEBC+5UDe9rg+Izga3uyYMc8H/4AVFCoxtb9ca
KLuQ==
X-Forwarded-Encrypted: i=1;
AJvYcCVJuzdJOnnb3DV2Ssp4kxU8/hEjxlJtpVh2eWCt7CIoNe9y4gJYOcqSybZuFkUAsYdvx/Wd1Nzo5+KV@nongnu.org
X-Gm-Message-State: AOJu0YwT18W1cNFPtU0zwf3HinghLdMAQZ2BY4YQ5LoHNh/Odpx+QuwG
vFCV2JB/7QX6i8bhyQIWDpXh8DXeDfsmSdkDhWkkjxVesrZoLwaYj/GLo6Z5dGrn3H3sanHJiva
g
X-Gm-Gg: ASbGncuq3RgaDa7X3YYXq7Nz4uw5yZ74MXTDgb8s5A8y2BnotAUbRa5Oow5ypAaoRis
Yn66Na/wOgwJCj526/ph8ShC/AHYwRwUbR5yt3BRFk8w5ctzeXjB6CtmXXNAU4lI5zl3GJvjuAZ
r4jKkOTJ9hD5MBplAwlJTXD5hUaeugsntIpBR1Yh9azvbnmLQCOd4/ZNp8+m+C9DIWyXdZ1opk2
lDq8WwVRCDk2G1uMKxP+oOh+uoAeic41gFPXVYSe0dyxoTySn3vH03LWn8zNXZN81nJrlfPndcx
KkWU3y2DJ2nfoTTn2I//
X-Google-Smtp-Source:
AGHT+IHbfUIIyfwoAJqzn08bVH/OcKAdoD4vuS5BxpgJhgT0Zn9CQQJqLz6Pkw2ki5aTCxfT+b2yUw==
X-Received: by 2002:a5d:64c2:0:b0:385:df73:2f18 with SMTP id
ffacd0b85a97d-38bf59ed533mr51002112f8f.51.1738061127029;
Tue, 28 Jan 2025 02:45:27 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 05/11] hw/sd/omap_mmc: Use similar API for "wire up omap_clk"
to other OMAP devices
Date: Tue, 28 Jan 2025 10:45:13 +0000
Message-Id: <20250128104519.3981448-6-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::435;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061337863019000
Content-Type: text/plain; charset="utf-8"
The approach we've settled on for handling the omap_clk wiring for
OMAP devices converted to QDev is to have a function omap_foo_set_clk()
whose implementation just sets the field directly in the device's
state struct. (See the "TODO" comment near the top of omap.h.)
Make omap_mmc do the same.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/arm/omap.h | 3 +++
hw/sd/omap_mmc.c | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index d20c55a8957..7cb87ea89cd 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -535,6 +535,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(OMAPMMCState, OMAP_MMC)
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
qemu_irq irq, qemu_irq dma[], omap_clk clk);
+/* TODO: clock framework (see above) */
+void omap_mmc_set_clk(DeviceState *dev, omap_clk clk);
+
=20
/* omap_i2c.c */
I2CBus *omap_i2c_bus(DeviceState *omap_i2c);
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 46fdeac1121..fcec2899afb 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -583,6 +583,13 @@ static const MemoryRegionOps omap_mmc_ops =3D {
.endianness =3D DEVICE_NATIVE_ENDIAN,
};
=20
+void omap_mmc_set_clk(DeviceState *dev, omap_clk clk)
+{
+ OMAPMMCState *s =3D OMAP_MMC(dev);
+
+ s->clk =3D clk;
+}
+
DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem,
qemu_irq irq, qemu_irq dma[], omap_clk clk)
@@ -594,7 +601,7 @@ DeviceState *omap_mmc_init(hwaddr base,
s =3D OMAP_MMC(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
=20
- s->clk =3D clk;
+ omap_mmc_set_clk(dev, clk);
=20
memory_region_add_subregion(sysmem, base,
sysbus_mmio_get_region(SYS_BUS_DEVICE(s), =
0));
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061249; cv=none;
d=zohomail.com; s=zohoarc;
b=HI2SRON/YqoeQFTEsqaxTMuZsu5omVZbPrctNHXmQzTFBCLqixvsLeIkxwWN39SvY5QU3RTE+cU61qVGSOcO8QVtxVf1O2xbbelWajWMt7zFWmJF73ASs8wOjMuk8obXbj067I8croM2kix5vQbDWSUGLAlu0pegtim5lNjIQ/w=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061249;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=5CvEPXzfVhE9gpoEHv/zIext3ELuNXpVwzWWv2pS9vE=;
b=eVzEIXpDcleYvgRpq7By/SqR94jVOuOuSKyaAGZeImn0axvuj9BdyEFRK4YETgx4d4m1qJ+RxSdmz7iHE3TY6ghjNHu3OPWhiwmfPfYwRRQwhAT8AWZVZFhkWjYWs14CbwT+z38QbkInPBAq8ieLcKpGa3PKKW5PPG6GqHqEwlg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061249500876.6291660027747;
Tue, 28 Jan 2025 02:47:29 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6Y-0001I3-VW; Tue, 28 Jan 2025 05:46:03 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj65-0001A7-Tn
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj61-0003Y9-Tl
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:32 -0500
Received: by mail-wm1-x32e.google.com with SMTP id
5b1f17b1804b1-436341f575fso59928975e9.1
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:29 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.27
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:27 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061128; x=1738665928; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=5CvEPXzfVhE9gpoEHv/zIext3ELuNXpVwzWWv2pS9vE=;
b=Zgtsjtsr/LvvOK/IrZPzcg/OPl7/knd3l8j7vjrc5aCMeVqqYL1YImY2a0hynIgCLn
CDnRgqFDy7V+haGw9vvN5MRSvdrJBwzapUniorUZnG1dPdnzPqyWIsfJ5qsO8W9cILAB
KXmuUdPlllurqUlbT1Iv5jWd2L2Y6ssUW8cuNaz6zcWegdDHQ3EbCFj3F2fZ50xim8qD
dvJMsyZMMuoe7fyl8Id05DuYgpBoIP7e6t16udad+AzmDoIgYl8BdVp0k027BIF/eAJb
PyRAfgta8C+UEWlVOiI06CrouCGhxKfsS+71cPCb4TyuOwkk1wsFsOimu3uZG1a1d6DZ
VT0g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061128; x=1738665928;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=5CvEPXzfVhE9gpoEHv/zIext3ELuNXpVwzWWv2pS9vE=;
b=VwwRP3AyoBkCr9o6AN3J0y2BgXBq+j2qJ6LRwZka2e23AnC3uGQeVtsDLvtwp/SQb5
c0hGAeH6ZsoESwj8Vok2zE0rQflEWY9hgoa00n2qNcXv8X6Ywst2sjr6jEH7aEP3yw0u
OgcNw7/TwSKqCXz/cqX/HxtjscN4ansq6pHdhLu+HlO+LXGopwhrUPm57J90e6ibX/yC
HYMSNxV20xUVsVWbszes8hfmpmJIHhTncJ1oGBCAxXhem0F5Ci/snkdAHhFaJtD8rvfj
M3/0ICe/yqoPc7HsdHCoZ0TnGWShV1fWYiV+DLoOZBD2nJCftpzrKTxoSJ70yKKa1uKQ
ELnA==
X-Forwarded-Encrypted: i=1;
AJvYcCU6vxSh2UJNx+Fy35D6f9Vi4k0Ko/+kBiRjmBKy/ZhZ+VdjLGB6kuKM5FhBUbHVCUW3TQ9hJdMUqrV/@nongnu.org
X-Gm-Message-State: AOJu0YzU/5YUI6E0gs3jnYUK+2WYqgN2HuQPpvZqjH3E+uWBuuvskGo2
N00ZX9tWkybpm/2MtU9fktEV23oX9Oq6AxSvbjU0GUOQM494ucPVxbdZ7GpWWb4=
X-Gm-Gg: ASbGncsJVNvHW4fmFZ6Iln+pqNdnQUVYf0lEe/SIbCRmym8rbafl3/aNmLcV4vKaEei
7peDdg4pF3NFJmWgXh3UD/xAiUvAAi5Abcd2n5Vf8wd8xAxilxoz5EyxN/ykIneyE7RT2OMXTbU
xrK/GXuea6i0UyORPzMA6nbfuGMgQ/TE9zoSn876c1JX1/4bU7jOv54N4aDFMXu0qQyhh5+SOc0
QsQhLVBy8mOHjvtHOMZL/LKW7qwAanTYfYgg4MHE3m8bmIBWJHibSPGTJayQCvvyo9Ty/8RF++3
SomrJb+opHoxWaXu0s1S
X-Google-Smtp-Source:
AGHT+IFHKm8LWijzuhpAkrJkJO72SMaHhVd2ZledEOuVmn8ZEefLtGzCTBQcYOD9rG8FlpSoQ019gQ==
X-Received: by 2002:a5d:64ec:0:b0:385:f66a:4271 with SMTP id
ffacd0b85a97d-38bf5649632mr37686789f8f.4.1738061128079;
Tue, 28 Jan 2025 02:45:28 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 06/11] hw/arm/omap1: Inline creation of MMC
Date: Tue, 28 Jan 2025 10:45:14 +0000
Message-Id: <20250128104519.3981448-7-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32e;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061251345019000
Content-Type: text/plain; charset="utf-8"
Our style for other conversions of OMAP devices to qdev has been to
inline the creation and wiring into omap310_mpu_init() -- see for
instance the handling of omap-intc, omap-gpio and omap_i2c. Do
the same for omap-mmc.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/arm/omap1.c | 15 +++++++++++----
hw/sd/omap_mmc.c | 22 ----------------------
2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 15ba0a0d0c4..ca2eb0d1576 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -3981,10 +3981,17 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryReg=
ion *dram,
if (!dinfo && !qtest_enabled()) {
warn_report("missing SecureDigital device");
}
- s->mmc =3D omap_mmc_init(0xfffb7800, system_memory,
- qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN),
- &s->drq[OMAP_DMA_MMC_TX],
- omap_findclk(s, "mmc_ck"));
+
+ s->mmc =3D qdev_new(TYPE_OMAP_MMC);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(s->mmc), &error_fatal);
+ omap_mmc_set_clk(s->mmc, omap_findclk(s, "mmc_ck"));
+
+ memory_region_add_subregion(system_memory, 0xfffb7800,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(s->m=
mc), 0));
+ qdev_connect_gpio_out_named(s->mmc, "dma-tx", 0, s->drq[OMAP_DMA_MMC_T=
X]);
+ qdev_connect_gpio_out_named(s->mmc, "dma-rx", 0, s->drq[OMAP_DMA_MMC_R=
X]);
+ sysbus_connect_irq(SYS_BUS_DEVICE(s->mmc), 0,
+ qdev_get_gpio_in(s->ih[1], OMAP_INT_OQN));
=20
if (dinfo) {
DeviceState *card =3D qdev_new(TYPE_SD_CARD);
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index fcec2899afb..dacbea13aad 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -590,28 +590,6 @@ void omap_mmc_set_clk(DeviceState *dev, omap_clk clk)
s->clk =3D clk;
}
=20
-DeviceState *omap_mmc_init(hwaddr base,
- MemoryRegion *sysmem,
- qemu_irq irq, qemu_irq dma[], omap_clk clk)
-{
- DeviceState *dev;
- OMAPMMCState *s;
-
- dev =3D qdev_new(TYPE_OMAP_MMC);
- s =3D OMAP_MMC(dev);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
-
- omap_mmc_set_clk(dev, clk);
-
- memory_region_add_subregion(sysmem, base,
- sysbus_mmio_get_region(SYS_BUS_DEVICE(s), =
0));
- qdev_connect_gpio_out_named(dev, "dma-tx", 0, dma[0]);
- qdev_connect_gpio_out_named(dev, "dma-rx", 0, dma[1]);
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
-
- return dev;
-}
-
static void omap_mmc_reset_hold(Object *obj, ResetType type)
{
OMAPMMCState *s =3D OMAP_MMC(obj);
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061228; cv=none;
d=zohomail.com; s=zohoarc;
b=Ev6+24jBmuv9/FpkDsaAK8QFnH3XeWQNPGi6cm6T0e4uMa/CFrFy/v+K9c/UgZW3GyPl0MFl/BOnoWHuvQtHC2PJC6+B1GEsO8H7pG/cb92pRrB2N6swYX2G7D0hXmPMhe2FB7QiKm3dheCHSle6Ch39i3NbE4XsSgEWdpUOMik=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061228;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=Ane9GQydmwnJiMFHOBDXlrUGP0wnx1nfccZAfAb02YM=;
b=kvLVPBW6mhhzMHzhjUkL96ij7h6fCdzJyffW0kFni4r+UlbUR9lnbntyoXHPgQFwtdDa1ZrFkdFwkwJb2OWiZbn4BQIG4eAyWTyTQGb3/P+sHp4TywaYT9HHMlLMf/N8QkDZi4LY3IjppEW4TkwUId8Qnd5n80XAtIFBQcMdWT8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061228073171.9358705771374;
Tue, 28 Jan 2025 02:47:08 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6a-0001Ik-7P; Tue, 28 Jan 2025 05:46:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj67-0001AG-5F
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj65-0003Yf-C4
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:34 -0500
Received: by mail-wr1-x42e.google.com with SMTP id
ffacd0b85a97d-38a34e8410bso2720594f8f.2
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:30 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061129; x=1738665929; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=Ane9GQydmwnJiMFHOBDXlrUGP0wnx1nfccZAfAb02YM=;
b=cCXCqCJ/e1UWsRMmFPudHZWLExXOMug/UKklTYM9PaabZTSaiUylVkFZPntU5Qp2Zq
VcIXhuksyMQ3F1A3QIKZ5RhxfEsDX0yCAEMFx4exOzYXu5vk9w87ef2Y/T8BvPyV9ubU
UAoWtnaX5t0ngM/VS1KEv367waKbcZdGE9bQI0366gouE8oFvTLYMnr/eh0oi+cv5l5Y
Iwehg7jUrwYqguGfBTSIRQQDFeIAeAfFOHrAGTsmic3eAV4U3LGCKoq13v0rsK5NC8yn
Y5z1Kg5q7hz2gLVdGoHet3B5H+cUm3syG8Thow/AaXp8UzmOENyImuqdGgXS0cZG6zZr
aNbQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061129; x=1738665929;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=Ane9GQydmwnJiMFHOBDXlrUGP0wnx1nfccZAfAb02YM=;
b=KiVHSopMer39YrojyQF5lMjYGBNT5P8Ivd+JO4swRVIGo963HXW0PBUnVoN6be/PW7
bV7I6Q8dcFr+lU3iDalickpUt5DfyEasJYhWcv1OdyQFWIaquMijJGSw/XqP+jUV5Z3l
EfTqGmo3erPRWlOZ39FcJAyKGgzOl8OsQ2IoHluFCyYAw8yQkqfboc4ja1RXqusmwyqk
nOa/WjCsmffs9es+RLpXXBACjeDevuA2C9xH1WxnakYaLvL4vd2ceQ1jKEvktyoq/CgW
yNqaHEXUt9L1uWYnu0fgawqc/Z99ct+tgPOcCI+qytx7vYqLg+pkO6ssEKU8bbeKABj1
rm+A==
X-Forwarded-Encrypted: i=1;
AJvYcCVELrU4D/5RBOeTdgADuwRh4ULnD1BYWcFb+yQdHiOmMYpivG5WA8WTO4LXirNWhOaMdhmZkaU2j/FD@nongnu.org
X-Gm-Message-State: AOJu0YyIxRJ/mMnH+g7vIZuuctAdT8Yb2/r0mOvDSLajJmlzvsAWAH5e
svZ8n2cQk9efCwhNLGtelp1s1VkHh2kRyxmd35XeGnqi81x+nzHHpVzILc9kMFg=
X-Gm-Gg: ASbGncv2NeiyeUsohzJ698NQcAMiJYkShaw7PCigQ6KpXldebTJcb4tBRXXgbZbskXe
IwxIRVcNrW0kx1L3zxPqV9OQ/kcRjte/QThBOKSLeb8XTbc0MFpAv/iGoRkcC1QPZ6CDGvZz4WD
wGvuq1g2iSu6svZlf7HcuUWSh0XDnkMwR++3r9ikqDMZ1561MsXN8hh2pURJpHp0cIdI+0VrkTZ
P+JKllJ6734XDzw+ua91FH8X7wqqAmB3ZKLmouQ7J/QGDv+HwoTF5oErb8ILTM9/7oo2Mg4GJ0L
gS1dRiKJz8zOeXhk4YBB
X-Google-Smtp-Source:
AGHT+IGWrOckgxgh9bh5+ZiX4ZUdbUmPM93BVig9PJKaw4h39mt2apYtDeRvOXWjYgTyfzz7FuSrgg==
X-Received: by 2002:a05:6000:1f85:b0:38b:e32a:109d with SMTP id
ffacd0b85a97d-38bf59e1d83mr35900134f8f.34.1738061129221;
Tue, 28 Jan 2025 02:45:29 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 07/11] hw/sd/omap_mmc: Remove unused coverswitch qemu_irq
Date: Tue, 28 Jan 2025 10:45:15 +0000
Message-Id: <20250128104519.3981448-8-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42e;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061229471019000
Content-Type: text/plain; charset="utf-8"
The coverswitch qemu_irq is never connected to anything, and the only thing
we do with it is set it in omap_mmc_reset(). Remove it.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/sd/omap_mmc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index dacbea13aad..07d47421bc8 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -35,7 +35,6 @@ typedef struct OMAPMMCState {
qemu_irq irq;
qemu_irq dma_tx_gpio;
qemu_irq dma_rx_gpio;
- qemu_irq coverswitch;
MemoryRegion iomem;
omap_clk clk;
uint16_t last_cmd;
@@ -325,7 +324,6 @@ static void omap_mmc_reset(OMAPMMCState *host)
host->transfer =3D 0;
host->cdet_wakeup =3D 0;
host->cdet_enable =3D 0;
- qemu_set_irq(host->coverswitch, host->cdet_state);
host->clkdiv =3D 0;
=20
omap_mmc_pseudo_reset(host);
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061344; cv=none;
d=zohomail.com; s=zohoarc;
b=KQZLbt0fwK2fXGwdhMVSYRB0pLaqhK3sTcEyK24T+l9kmrFe87EP/BT1b7HmDvbiDiWSB2yJfkYD/TG7Id4NYxMctKPQ2XfU7x/LqPff3XUIIkEEj+WjVKktwMNFyhSmyY/VcCqb+QkAbTZVZ2whExJyFydvUQ1giKuLGV30Hu4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061344;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=E1f0V/uP3+Z6Rm6pHIUK22c1PN0PD4Ozc5f+Izcv90c=;
b=M/QjQv9Z3d7UqH8wHJuFY8wOAR3GvjuGbacywLzoKycC5FTnfwVABnXM3feGgL2BwzNj4hm8STDuczI7keO1Jqm5d477rp5cvaVCxQK187nXx+AsKuiabV+BENtBnvMqDeEyb9+heT8/S+y5Kl00ltQ5u6XRw9+MFlBqNqUtG8w=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061344669541.5720148522201;
Tue, 28 Jan 2025 02:49:04 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6s-0001ag-1Y; Tue, 28 Jan 2025 05:46:27 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj69-0001AV-Fs
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj66-0003ZV-DV
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:37 -0500
Received: by mail-wr1-x430.google.com with SMTP id
ffacd0b85a97d-38a8b17d7a7so2905946f8f.2
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:31 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061130; x=1738665930; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=E1f0V/uP3+Z6Rm6pHIUK22c1PN0PD4Ozc5f+Izcv90c=;
b=k/jo6XOtx1Z4WFxJCq7VqUn9Ym7KcBs0ix8JkMLKFiK4Ws0rd9xAiGlq25uphvrEj2
+yu2uCycaFxQyKiTGa+DT/r73LYKDcQwwUgQA08zajR1cMqXAsAU0t6AooamtaeiluPS
02F+WEV//BLnC0th3jKYBMmGLwSK9FOt5U5qqclIaQU9i8CoFtj2kUyRkz3QvgA5s6bu
wYrZJUO0NZpFNZY/9QnMrc6jNjystFkKJtDN2DOjqvvsIIh/StW0S2Z4rsgJBzgHx0zV
24RHwHEBzdSOm0OLU4IgubK7fBEdXjPSAuU0lqWJBM6LI5hAo0FoojCxdfy8IQou7Lm5
ukaQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061130; x=1738665930;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=E1f0V/uP3+Z6Rm6pHIUK22c1PN0PD4Ozc5f+Izcv90c=;
b=r20wALS0NI1ipujSZ9EPHJdvGXgVcjjBfTuykdrufgLn5sd6sYYUyXkyJwqKmZNTf2
ksnUytog1k9V3E1gqohfBW8Rtyq0vbBd6Nxdtxp1VnjwTvRLa8kVc/Z60Jq/HBViY6gP
uN8klit/ffuA00Dx5dNOxKQA5jFYOmIGhi8N//6rzHN5gWWx9P8ehDyuoNsh7ez3OeN2
oDPENU/r4TA+4jBO1gUXwRkLP712h+K2DjaEF9JNkyuWLyptiBc3L66/tTM6EXgbvftH
rIGwKdpiCOZMvi4dZpgLOSmcXUF8jLtaS9+6JCwI9yBe1UkXopsJP5/5BLmFQFUFf6zL
F6Zw==
X-Forwarded-Encrypted: i=1;
AJvYcCWiRghlnYzO7/8zMz9qDbjoZw+KNH6ZvBkLQGkSOqy6v0A7YR6zPkGm4CocfDTnDwZFI60QVC7+FwyX@nongnu.org
X-Gm-Message-State: AOJu0Yyx1hBulR0M8002yin5uscjqxH3+tzaGhv5m7Nk08721bKBOFXH
w9krRHQf+gfn0ilXr8dx9ICZu08tTe+7c16ftIZhIKPAtvXcDBwiZw5o15jj9o8=
X-Gm-Gg: ASbGncvKSQLqmG4Z1wPm49tbsE5VN79Q6JSHjzpkxmwOKHzaAdB2pqxpaI/hrAmxn3x
5I029ICxwCSGiT1bjn4vu2BSh9yyjWkXx1kXo2YGkcrkuveoGKksD32BmAzqTaxDZAZPSUez4S8
JKZM9okWQCPrROFecHZuLgAr2x/xwANPRYHBXBHnDAjX8CqxyYelXcj3Xx3XHxv9oRDF7Sdxkul
ImZRa3/T+PycYJjm9xpHXyyA8G7QOk4v+6L6IIA6lxX6aLpWEA370W276fNOjV998tmfrsJSwDk
/w0Ff0s7m56xtU39boJZ
X-Google-Smtp-Source:
AGHT+IGmHW76lvNRLCHv3G9HZfLJRYxaAYggNDZvlmXA2sGmkybUXdigPXv9aQd8P9v3MrJLMyEKKw==
X-Received: by 2002:a5d:64a1:0:b0:385:e8dd:b143 with SMTP id
ffacd0b85a97d-38bf56627d7mr34514066f8f.19.1738061130339;
Tue, 28 Jan 2025 02:45:30 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 08/11] hw/sd/omap_mmc: Untabify
Date: Tue, 28 Jan 2025 10:45:16 +0000
Message-Id: <20250128104519.3981448-9-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::430;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061345989019000
Content-Type: text/plain; charset="utf-8"
This is a very old source file, and still has some lingering
hard-coded tabs; untabify it.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
I don't propose to try to bring the whole file up to modern
coding style, but hard-coded tabs are a particular wart.
---
hw/sd/omap_mmc.c | 124 +++++++++++++++++++++++------------------------
1 file changed, 62 insertions(+), 62 deletions(-)
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 07d47421bc8..c1598135f44 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -110,11 +110,11 @@ static void omap_mmc_fifolevel_update(OMAPMMCState *h=
ost)
=20
/* These must match the encoding of the MMC_CMD Response field */
typedef enum {
- sd_nore =3D 0, /* no response */
- sd_r1, /* normal response command */
- sd_r2, /* CID, CSD registers */
- sd_r3, /* OCR register */
- sd_r6 =3D 6, /* Published RCA response */
+ sd_nore =3D 0, /* no response */
+ sd_r1, /* normal response command */
+ sd_r2, /* CID, CSD registers */
+ sd_r3, /* OCR register */
+ sd_r6 =3D 6, /* Published RCA response */
sd_r1b =3D -1,
} sd_rsp_type_t;
=20
@@ -230,7 +230,7 @@ static void omap_mmc_command(OMAPMMCState *host, int cm=
d, int dir,
if (timeout)
host->status |=3D 0x0080;
else if (cmd =3D=3D 12)
- host->status |=3D 0x0005; /* Makes it more real */
+ host->status |=3D 0x0005; /* Makes it more real */
else
host->status |=3D 0x0001;
}
@@ -339,32 +339,32 @@ static uint64_t omap_mmc_read(void *opaque, hwaddr of=
fset, unsigned size)
}
=20
switch (offset) {
- case 0x00: /* MMC_CMD */
+ case 0x00: /* MMC_CMD */
return s->last_cmd;
=20
- case 0x04: /* MMC_ARGL */
+ case 0x04: /* MMC_ARGL */
return s->arg & 0x0000ffff;
=20
- case 0x08: /* MMC_ARGH */
+ case 0x08: /* MMC_ARGH */
return s->arg >> 16;
=20
- case 0x0c: /* MMC_CON */
+ case 0x0c: /* MMC_CON */
return (s->dw << 15) | (s->mode << 12) | (s->enable << 11) |=20
(s->be << 10) | s->clkdiv;
=20
- case 0x10: /* MMC_STAT */
+ case 0x10: /* MMC_STAT */
return s->status;
=20
- case 0x14: /* MMC_IE */
+ case 0x14: /* MMC_IE */
return s->mask;
=20
- case 0x18: /* MMC_CTO */
+ case 0x18: /* MMC_CTO */
return s->cto;
=20
- case 0x1c: /* MMC_DTO */
+ case 0x1c: /* MMC_DTO */
return s->dto;
=20
- case 0x20: /* MMC_DATA */
+ case 0x20: /* MMC_DATA */
/* TODO: support 8-bit access */
i =3D s->fifo[s->fifo_start];
if (s->fifo_len =3D=3D 0) {
@@ -379,42 +379,42 @@ static uint64_t omap_mmc_read(void *opaque, hwaddr of=
fset, unsigned size)
omap_mmc_interrupts_update(s);
return i;
=20
- case 0x24: /* MMC_BLEN */
+ case 0x24: /* MMC_BLEN */
return s->blen_counter;
=20
- case 0x28: /* MMC_NBLK */
+ case 0x28: /* MMC_NBLK */
return s->nblk_counter;
=20
- case 0x2c: /* MMC_BUF */
+ case 0x2c: /* MMC_BUF */
return (s->rx_dma << 15) | (s->af_level << 8) |
(s->tx_dma << 7) | s->ae_level;
=20
- case 0x30: /* MMC_SPI */
+ case 0x30: /* MMC_SPI */
return 0x0000;
- case 0x34: /* MMC_SDIO */
+ case 0x34: /* MMC_SDIO */
return (s->cdet_wakeup << 2) | (s->cdet_enable) | s->sdio;
- case 0x38: /* MMC_SYST */
+ case 0x38: /* MMC_SYST */
return 0x0000;
=20
- case 0x3c: /* MMC_REV */
+ case 0x3c: /* MMC_REV */
return s->rev;
=20
- case 0x40: /* MMC_RSP0 */
- case 0x44: /* MMC_RSP1 */
- case 0x48: /* MMC_RSP2 */
- case 0x4c: /* MMC_RSP3 */
- case 0x50: /* MMC_RSP4 */
- case 0x54: /* MMC_RSP5 */
- case 0x58: /* MMC_RSP6 */
- case 0x5c: /* MMC_RSP7 */
+ case 0x40: /* MMC_RSP0 */
+ case 0x44: /* MMC_RSP1 */
+ case 0x48: /* MMC_RSP2 */
+ case 0x4c: /* MMC_RSP3 */
+ case 0x50: /* MMC_RSP4 */
+ case 0x54: /* MMC_RSP5 */
+ case 0x58: /* MMC_RSP6 */
+ case 0x5c: /* MMC_RSP7 */
return s->rsp[(offset - 0x40) >> 2];
=20
/* OMAP2-specific */
- case 0x60: /* MMC_IOSR */
- case 0x64: /* MMC_SYSC */
+ case 0x60: /* MMC_IOSR */
+ case 0x64: /* MMC_SYSC */
return 0;
- case 0x68: /* MMC_SYSS */
- return 1; /* RSTD */
+ case 0x68: /* MMC_SYSS */
+ return 1; /* RSTD */
}
=20
OMAP_BAD_REG(offset);
@@ -433,7 +433,7 @@ static void omap_mmc_write(void *opaque, hwaddr offset,
}
=20
switch (offset) {
- case 0x00: /* MMC_CMD */
+ case 0x00: /* MMC_CMD */
if (!s->enable)
break;
=20
@@ -448,17 +448,17 @@ static void omap_mmc_write(void *opaque, hwaddr offse=
t,
omap_mmc_update(s);
break;
=20
- case 0x04: /* MMC_ARGL */
+ case 0x04: /* MMC_ARGL */
s->arg &=3D 0xffff0000;
s->arg |=3D 0x0000ffff & value;
break;
=20
- case 0x08: /* MMC_ARGH */
+ case 0x08: /* MMC_ARGH */
s->arg &=3D 0x0000ffff;
s->arg |=3D value << 16;
break;
=20
- case 0x0c: /* MMC_CON */
+ case 0x0c: /* MMC_CON */
s->dw =3D (value >> 15) & 1;
s->mode =3D (value >> 12) & 3;
s->enable =3D (value >> 11) & 1;
@@ -478,27 +478,27 @@ static void omap_mmc_write(void *opaque, hwaddr offse=
t,
omap_mmc_pseudo_reset(s);
break;
=20
- case 0x10: /* MMC_STAT */
+ case 0x10: /* MMC_STAT */
s->status &=3D ~value;
omap_mmc_interrupts_update(s);
break;
=20
- case 0x14: /* MMC_IE */
+ case 0x14: /* MMC_IE */
s->mask =3D value & 0x7fff;
omap_mmc_interrupts_update(s);
break;
=20
- case 0x18: /* MMC_CTO */
+ case 0x18: /* MMC_CTO */
s->cto =3D value & 0xff;
if (s->cto > 0xfd && s->rev <=3D 1)
printf("MMC: CTO of 0xff and 0xfe cannot be used!\n");
break;
=20
- case 0x1c: /* MMC_DTO */
+ case 0x1c: /* MMC_DTO */
s->dto =3D value & 0xffff;
break;
=20
- case 0x20: /* MMC_DATA */
+ case 0x20: /* MMC_DATA */
/* TODO: support 8-bit access */
if (s->fifo_len =3D=3D 32)
break;
@@ -509,18 +509,18 @@ static void omap_mmc_write(void *opaque, hwaddr offse=
t,
omap_mmc_interrupts_update(s);
break;
=20
- case 0x24: /* MMC_BLEN */
+ case 0x24: /* MMC_BLEN */
s->blen =3D (value & 0x07ff) + 1;
s->blen_counter =3D s->blen;
break;
=20
- case 0x28: /* MMC_NBLK */
+ case 0x28: /* MMC_NBLK */
s->nblk =3D (value & 0x07ff) + 1;
s->nblk_counter =3D s->nblk;
s->blen_counter =3D s->blen;
break;
=20
- case 0x2c: /* MMC_BUF */
+ case 0x2c: /* MMC_BUF */
s->rx_dma =3D (value >> 15) & 1;
s->af_level =3D (value >> 8) & 0x1f;
s->tx_dma =3D (value >> 7) & 1;
@@ -535,38 +535,38 @@ static void omap_mmc_write(void *opaque, hwaddr offse=
t,
break;
=20
/* SPI, SDIO and TEST modes unimplemented */
- case 0x30: /* MMC_SPI (OMAP1 only) */
+ case 0x30: /* MMC_SPI (OMAP1 only) */
break;
- case 0x34: /* MMC_SDIO */
+ case 0x34: /* MMC_SDIO */
s->sdio =3D value & (s->rev >=3D 2 ? 0xfbf3 : 0x2020);
s->cdet_wakeup =3D (value >> 9) & 1;
s->cdet_enable =3D (value >> 2) & 1;
break;
- case 0x38: /* MMC_SYST */
+ case 0x38: /* MMC_SYST */
break;
=20
- case 0x3c: /* MMC_REV */
- case 0x40: /* MMC_RSP0 */
- case 0x44: /* MMC_RSP1 */
- case 0x48: /* MMC_RSP2 */
- case 0x4c: /* MMC_RSP3 */
- case 0x50: /* MMC_RSP4 */
- case 0x54: /* MMC_RSP5 */
- case 0x58: /* MMC_RSP6 */
- case 0x5c: /* MMC_RSP7 */
+ case 0x3c: /* MMC_REV */
+ case 0x40: /* MMC_RSP0 */
+ case 0x44: /* MMC_RSP1 */
+ case 0x48: /* MMC_RSP2 */
+ case 0x4c: /* MMC_RSP3 */
+ case 0x50: /* MMC_RSP4 */
+ case 0x54: /* MMC_RSP5 */
+ case 0x58: /* MMC_RSP6 */
+ case 0x5c: /* MMC_RSP7 */
OMAP_RO_REG(offset);
break;
=20
/* OMAP2-specific */
- case 0x60: /* MMC_IOSR */
+ case 0x60: /* MMC_IOSR */
if (value & 0xf)
printf("MMC: SDIO bits used!\n");
break;
- case 0x64: /* MMC_SYSC */
- if (value & (1 << 2)) /* SRTS */
+ case 0x64: /* MMC_SYSC */
+ if (value & (1 << 2)) /* SRTS */
omap_mmc_reset(s);
break;
- case 0x68: /* MMC_SYSS */
+ case 0x68: /* MMC_SYSS */
OMAP_RO_REG(offset);
break;
=20
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061330; cv=none;
d=zohomail.com; s=zohoarc;
b=jQ2YXCw7C0wzgjlwSULdJkPLCyalOuS4ELy9DnJjlYiS3XkGrt/vY3EaAIhWyVJuYyDdofgL8p1RTSccz6X+8cgNzEPHjtIDXBTcZEk+qdKpI5aRvHKGAtdjVN0nn8UVNBHJuAUiB4xl83Rsy9/QqA6ct6hiZDeEZCu96QQn07M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061330;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=P84lmvWRoPuZSyE7d4+2LbnhWUe5f771b5Xano3sRNQ=;
b=JLRS5Y473/DQsp+QslwbrgcyMTZF2ZZ67XjFD6HlP40OO9+IiOC5mfLGsTo236Dkk0Lcrz/japuj9NkCjrGPYGKhiYxHcr06Wnd8EkTIdlOsmOt7ZWlG00i66JnuOQOoeiEwh+oQrwqxogCA+SaspEitmQX54JAV77WMdmkP4E4=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061330846268.9452116826543;
Tue, 28 Jan 2025 02:48:50 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj7V-0002Qu-7F; Tue, 28 Jan 2025 05:47:02 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj6E-0001B3-Ux
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:48 -0500
Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj66-0003a2-Ck
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:42 -0500
Received: by mail-wm1-x329.google.com with SMTP id
5b1f17b1804b1-4363dc916ceso40570275e9.0
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:32 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061131; x=1738665931; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=P84lmvWRoPuZSyE7d4+2LbnhWUe5f771b5Xano3sRNQ=;
b=OQ3aaO2wabwlC+BpjNqzVUObLquPwFMMt1Pp53vcDoOjZJ75SvT4Q2ov2CzqDE2cm1
mHS5miJyb0dfd+Yz3ITcs6DNSssPhO6SrbeDJ/zlxHuYMjVWcJDWB6qmxR0/8Rfx13z1
1hLY74PKeqUEBFH833plgPMxvDGqVaKJdsSUa7keXQVvASzLpdEmOXmss/CdOPmaY/DH
hb0yKcjaFeHONxyEUlgzA9Zrzq+kdF1Dhl/BtrNty9UH02RnlBCYiPLie1WlSdLmw7H7
aiR989cnHWl3FQQwu3iVUq4Ku3mKHN7P1bFeQ8sdSoxiCdEC84uiTJ6YSLafnU4dLqA0
6wvA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061131; x=1738665931;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=P84lmvWRoPuZSyE7d4+2LbnhWUe5f771b5Xano3sRNQ=;
b=YZB+QQAgBIBCAilBlGAk0CxH4OGoc3hTL7ejo71R5lxuIXtfQYQXwbkeQQxWvt9YkZ
RIpPyw/wixGFfdrjVc23xRlOpbJdlPILFh74gzsv+RZz/xgnXTWh3eyLkZ6pBJW3zyWP
P/h5RChzLZNRhmC+RLGkRHRt4cPwcCAXm/qFe/G+X2CuScAzz+BfWEueBMi6jc0eOlJr
V2QULR3PrPapvmI3N14kXXOIraFDE5oiJt6UODUQzZHfYSCfFcAcE0q5uajQc6KZ7xij
Kd56cEEz4eJOt4pMLXc9+hUq+eNqls1vWBfhZnTKHKguW1SXMcJ3+dIX9FN99L0iemQ0
0dPA==
X-Forwarded-Encrypted: i=1;
AJvYcCXicfR5gwNACaKNBxO8BnuS4CbsWtkTgqWuYagR89kf0ZrMcq0xQiSxb5m+MtUhKypl0S3asNA0UyKt@nongnu.org
X-Gm-Message-State: AOJu0Yxe7I16MgGQdm3/QpDrCzQaPuuQ7jLMCwMoOmW7JSilew1mPosJ
nI9w7ok8zJLeLM67uqgMvgVJG6S2f1X8hrq8eHOLMoIi2rS2GmtcWrUkLObqtPM=
X-Gm-Gg: ASbGncumxY3BX7fvGG2r8gzOxf/hVDtmOfrQv9KYuyGwj8LX2dlaJPaaCh3rG3JqXOj
SBHl/qSuqJ8miiYHMKig64SI/Fjrf9wbvtj3RaYXSMU8uDTZ3oNtJKoh2cnyPjqPTSzdmNgvNxx
t+DZADCjt1L9f4E2d4GV+CuBU8IhdH5l1GvZ7gIuiR9ql0O7lDsIAP1HT08AsxPdOrJLTbSnUD1
jVTHltQ2UaCHzeOrUHODszbwnL2rHakeZURr/Fc4s/PP+uDVeE4rJ461jLc/n4OGWtb/KP7g9mj
zdFtP8gJzKC6BtOip2XI
X-Google-Smtp-Source:
AGHT+IFonOX6TnBpot7YarpaWUBW3BkQbxl0LzUrH82xtOvIOM4gdE1qr1Z/XplpzqqMgUOvIQBRcA==
X-Received: by 2002:adf:fb84:0:b0:385:e328:8908 with SMTP id
ffacd0b85a97d-38c49a5d44dmr1754140f8f.29.1738061131513;
Tue, 28 Jan 2025 02:45:31 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 09/11] hw/sd: Remove unused 'enable' method from SDCardClass
Date: Tue, 28 Jan 2025 10:45:17 +0000
Message-Id: <20250128104519.3981448-10-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::329;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061331676019000
Content-Type: text/plain; charset="utf-8"
The SDCardClass has an 'enable' method, but nothing actually invokes it.
The underlying implementation is sd_enable(), which is documented
in sdcard_legacy.h as something that should not be used and was only
present for the benefit of the now-removed nseries boards. Unlike
all the other method pointers in SDCardClass, this one doesn't have
an sdbus_foo() function wrapper in hw/sd/core.c.
Remove the unused method.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/sd/sd.h | 1 -
hw/sd/sd.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index f2458f37b3c..d6bad175131 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -119,7 +119,6 @@ struct SDCardClass {
void (*set_voltage)(SDState *sd, uint16_t millivolts);
uint8_t (*get_dat_lines)(SDState *sd);
bool (*get_cmd_line)(SDState *sd);
- void (*enable)(SDState *sd, bool enable);
bool (*get_inserted)(SDState *sd);
bool (*get_readonly)(SDState *sd);
void (*set_cid)(SDState *sd);
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 0330d432fd0..f781fd1641d 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2831,7 +2831,6 @@ static void sdmmc_common_class_init(ObjectClass *klas=
s, void *data)
sc->read_byte =3D sd_read_byte;
sc->receive_ready =3D sd_receive_ready;
sc->data_ready =3D sd_data_ready;
- sc->enable =3D sd_enable;
sc->get_inserted =3D sd_get_inserted;
sc->get_readonly =3D sd_get_readonly;
}
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061320; cv=none;
d=zohomail.com; s=zohoarc;
b=oHQeXx+V0tjxJqUIoZGXaChsrXWeBsYkPmnX/jeReFp8zsJ4+Sw1JR0yIOta7KjuEl+3CxmA16vjJKKU6Awxo/IIsgs7P9DmFXpDRD1qEemC48x/n3pH0hMGTaQkcmVc9ASeUcAUx9puG/l7ZEebpW/3MFqT0A3QB9g8RSCM6Y4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061320;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=hXVaYgjVnVDD5iua1WW8j0IeQfgPY/QrMi/c0hN7fA0=;
b=mX+kJgJ7w+VcOL4sTEa74v7O2EURBk4XemsUD5OYY6tHL2WOydPfTy9qZ3FK/7pxV3kNI+pK0vWExE+DbsfSTUOiY2/VEUwdDhCRNe1r/fKc00Gh4bUCpfvQDIM32S2OelIaKD6/LgrUOX8BaT3TXp9S+P+E3rucFKfXZwZkLIA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061320302189.8305076614796;
Tue, 28 Jan 2025 02:48:40 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6m-0001QU-4B; Tue, 28 Jan 2025 05:46:19 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj6A-0001Aa-Cf
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj66-0003aR-CK
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:38 -0500
Received: by mail-wm1-x336.google.com with SMTP id
5b1f17b1804b1-436249df846so36373915e9.3
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:33 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.31
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:31 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061133; x=1738665933; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=hXVaYgjVnVDD5iua1WW8j0IeQfgPY/QrMi/c0hN7fA0=;
b=bAOFDtA4g+rPXcWYs7HuUTOMMwlvF+ybNE8I/eRwQXdx9XevaHS+tElu7lhUIKOv+O
fCL3Ppfwrnxzp/ftsP+enVX+1l7WQtGNqeMs/+4+yunPA9aUXOQSShHUi0EWrHt5T4QP
rnh+YDDCOKzBq8qvXDEemMQl/S7Lq0aviGJkJgZVrveivxv/jzXHHZFUAliFCJhgTn9X
ZwKik8SdJT2xzXE7qkxI7uurZ5VdYCzD6a1OOXRXBL8G+/Yjsph60VHC8Xuyw3iGSHDL
7i7+G9udeWc0IIAnamAXdenFzf7f+MvS3Xm58arBApYSSyruUAQrHIKEPJRSw4ocDNYQ
rXYQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061133; x=1738665933;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=hXVaYgjVnVDD5iua1WW8j0IeQfgPY/QrMi/c0hN7fA0=;
b=cn7TqgSkqpYEuTNgUujVqyeg/DVe0RaHkXKT0XXux1bMtk22XawxlmNoGxim10ublR
lVh2xLzHwCx97hgV2WXKd+BjpwnjLXHiruelFiLC7xKWQ8e0QObH7lbiHzGUxY4kchwm
OEfmzC6Yu3H2IqaSU7V2rSDd1KvGp5FY0Hq4zzhuBH/Ekv4XNX/uVE2eCjbmCmBYCZpA
ftzt9Fh8Qu2Al03UxpTA+9ZZZDt5GPvjdNSL878AhYL22Pjs7zIc2HSbF9huSdznL9Cd
rb5fb/BxWbkq1iGYrC0Ern0PSgAcVklus+ztu9R7g/pzxChucWyy//LSE1AUsXsHajN0
xNgA==
X-Forwarded-Encrypted: i=1;
AJvYcCWHNgXFMAQHYi1ngKh5fXeJh1IFDbDlDNybCRfgz4JZkZ0IQkHVQ5KxPSJ3Bgih4mMn3+LoHd0QFsjQ@nongnu.org
X-Gm-Message-State: AOJu0Ywt9Guh08S5OLZvSmMn5Qik6pDkkBO3CP+tMjaBD1kwPw/SqWiy
Mcf1AUS8K4Q36dN1iP0avOEvjoKnAA+kMbUIojIYiDixjruIJS3ZD8JUdck1Qz4=
X-Gm-Gg: ASbGncupN8nCX0GnZHQKp0v3wdDhV80+0dulq2WHYgfKelxaqMTFpIBvNWjNn7uiNWm
kZtGYKGwJR41GW2/e5gQZL1nTdN+6iPBTEfqSQjiN7FB4nSg3tnDsS4aWYV3j1FL8Vx+cpCvXCH
wNsAxr22M7Ko+NH40i1t1mG1u4wnQAbli/UJPjib+P4R9oLY18y++4fAFC2PcxE3LSf7IJVfbO8
wxly3omojj6FxwNZ8bgEGc8DVA3S/PKPrLDfba4yhamNI1EvrZruzRBeJRWP12yh1jrsG3FYmrE
Hot8INZuV9De9qT7XDulL8PEfJZRRas=
X-Google-Smtp-Source:
AGHT+IHdfdmcessB+hZG8W9W3RnvmRXTWvd0tabLhAzYELYnjqeYjVtbaB05wL7wh9Gg1ZzMVAyaGg==
X-Received: by 2002:a5d:648a:0:b0:38b:f44b:8663 with SMTP id
ffacd0b85a97d-38bf57c0ac9mr37236217f8f.55.1738061132720;
Tue, 28 Jan 2025 02:45:32 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 10/11] hw/sd: Remove unused legacy functions,
stop killing mammoths
Date: Tue, 28 Jan 2025 10:45:18 +0000
Message-Id: <20250128104519.3981448-11-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::336;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061321810019000
Content-Type: text/plain; charset="utf-8"
The sdcard_legacy.h header defines function prototypes for the "legacy"
SD card API, which was used by non-qdevified SD controller models.
We've now converted the only remaining non-qdev SD controller, so
we can drop the legacy API.
Entirely unused functions:
sd_init(), sd_set_cb(), sd_enable()
Functions which now become static inside sd.c (they are the
underlying implementations of methods on SDCardClass):
sd_do_command(), sd_write_byte(), sd_read_byte()
Removal of sd_init() means that we can also remove the
me_no_qdev_me_kill_mammoth_with_rocks flag, the codepaths that were
only reachable when it was set, and the inserted_cb and readonly_cb
qemu_irq lines that went with that.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/sd/sdcard_legacy.h | 50 -----------------------
hw/sd/omap_mmc.c | 2 +-
hw/sd/sd.c | 77 ++++-------------------------------
3 files changed, 9 insertions(+), 120 deletions(-)
delete mode 100644 include/hw/sd/sdcard_legacy.h
diff --git a/include/hw/sd/sdcard_legacy.h b/include/hw/sd/sdcard_legacy.h
deleted file mode 100644
index 0dc38895551..00000000000
--- a/include/hw/sd/sdcard_legacy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * SD Memory Card emulation (deprecated legacy API)
- *
- * Copyright (c) 2006 Andrzej Zaborowski <balrog@zabor.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef HW_SDCARD_LEGACY_H
-#define HW_SDCARD_LEGACY_H
-
-#include "hw/sd/sd.h"
-
-/* Legacy functions to be used only by non-qdevified callers */
-SDState *sd_init(BlockBackend *blk, bool is_spi);
-int sd_do_command(SDState *card, SDRequest *request, uint8_t *response);
-void sd_write_byte(SDState *card, uint8_t value);
-uint8_t sd_read_byte(SDState *card);
-void sd_set_cb(SDState *card, qemu_irq readonly, qemu_irq insert);
-
-/* sd_enable should not be used -- it is only used on the nseries boards,
- * where it is part of a broken implementation of the MMC card slot switch
- * (there should be two card slots which are multiplexed to a single MMC
- * controller, but instead we model it with one card and controller and
- * disable the card when the second slot is selected, so it looks like the
- * second slot is always empty).
- */
-void sd_enable(SDState *card, bool enable);
-
-#endif /* HW_SDCARD_LEGACY_H */
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index c1598135f44..d31456ad236 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -25,7 +25,7 @@
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "hw/arm/omap.h"
-#include "hw/sd/sdcard_legacy.h"
+#include "hw/sd/sd.h"
=20
typedef struct OMAPMMCState {
SysBusDevice parent_obj;
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index f781fd1641d..74bb7f39bbf 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -39,7 +39,6 @@
#include "hw/registerfields.h"
#include "system/block-backend.h"
#include "hw/sd/sd.h"
-#include "hw/sd/sdcard_legacy.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qemu/bitmap.h"
@@ -120,10 +119,6 @@ typedef struct SDProto {
struct SDState {
DeviceState parent_obj;
=20
- /* If true, created by sd_init() for a non-qdevified caller */
- /* TODO purge them with fire */
- bool me_no_qdev_me_kill_mammoth_with_rocks;
-
/* SD Memory Card Registers */
uint32_t ocr;
uint8_t scr[8];
@@ -177,8 +172,6 @@ struct SDState {
uint32_t data_offset;
size_t data_size;
uint8_t data[512];
- qemu_irq readonly_cb;
- qemu_irq inserted_cb;
QEMUTimer *ocr_power_timer;
bool enable;
uint8_t dat_lines;
@@ -892,17 +885,10 @@ static void sd_cardchange(void *opaque, bool load, Er=
ror **errp)
trace_sdcard_ejected();
}
=20
- if (sd->me_no_qdev_me_kill_mammoth_with_rocks) {
- qemu_set_irq(sd->inserted_cb, inserted);
- if (inserted) {
- qemu_set_irq(sd->readonly_cb, readonly);
- }
- } else {
- sdbus =3D SD_BUS(qdev_get_parent_bus(dev));
- sdbus_set_inserted(sdbus, inserted);
- if (inserted) {
- sdbus_set_readonly(sdbus, readonly);
- }
+ sdbus =3D SD_BUS(qdev_get_parent_bus(dev));
+ sdbus_set_inserted(sdbus, inserted);
+ if (inserted) {
+ sdbus_set_readonly(sdbus, readonly);
}
}
=20
@@ -1000,48 +986,6 @@ static const VMStateDescription sd_vmstate =3D {
},
};
=20
-/* Legacy initialization function for use by non-qdevified callers */
-SDState *sd_init(BlockBackend *blk, bool is_spi)
-{
- Object *obj;
- DeviceState *dev;
- SDState *sd;
- Error *err =3D NULL;
-
- obj =3D object_new(is_spi ? TYPE_SD_CARD_SPI : TYPE_SD_CARD);
- dev =3D DEVICE(obj);
- if (!qdev_prop_set_drive_err(dev, "drive", blk, &err)) {
- error_reportf_err(err, "sd_init failed: ");
- return NULL;
- }
-
- /*
- * Realizing the device properly would put it into the QOM
- * composition tree even though it is not plugged into an
- * appropriate bus. That's a no-no. Hide the device from
- * QOM/qdev, and call its qdev realize callback directly.
- */
- object_ref(obj);
- object_unparent(obj);
- sd_realize(dev, &err);
- if (err) {
- error_reportf_err(err, "sd_init failed: ");
- return NULL;
- }
-
- sd =3D SD_CARD(dev);
- sd->me_no_qdev_me_kill_mammoth_with_rocks =3D true;
- return sd;
-}
-
-void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
-{
- sd->readonly_cb =3D readonly;
- sd->inserted_cb =3D insert;
- qemu_set_irq(readonly, sd->blk ? !blk_is_writable(sd->blk) : 0);
- qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
-}
-
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
{
trace_sdcard_read_block(addr, len);
@@ -2196,8 +2140,8 @@ static bool cmd_valid_while_locked(SDState *sd, unsig=
ned cmd)
return cmd_class =3D=3D 0 || cmd_class =3D=3D 7;
}
=20
-int sd_do_command(SDState *sd, SDRequest *req,
- uint8_t *response) {
+static int sd_do_command(SDState *sd, SDRequest *req,
+ uint8_t *response) {
int last_state;
sd_rsp_type_t rtype;
int rsplen;
@@ -2349,7 +2293,7 @@ static bool sd_generic_read_byte(SDState *sd, uint8_t=
*value)
return false;
}
=20
-void sd_write_byte(SDState *sd, uint8_t value)
+static void sd_write_byte(SDState *sd, uint8_t value)
{
int i;
=20
@@ -2478,7 +2422,7 @@ void sd_write_byte(SDState *sd, uint8_t value)
}
}
=20
-uint8_t sd_read_byte(SDState *sd)
+static uint8_t sd_read_byte(SDState *sd)
{
/* TODO: Append CRCs */
const uint8_t dummy_byte =3D 0x00;
@@ -2561,11 +2505,6 @@ static bool sd_data_ready(SDState *sd)
return sd->state =3D=3D sd_sendingdata_state;
}
=20
-void sd_enable(SDState *sd, bool enable)
-{
- sd->enable =3D enable;
-}
-
static const SDProto sd_proto_spi =3D {
.name =3D "SPI",
.cmd =3D {
--=20
2.34.1
From nobody Thu Apr 10 21:13:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738061194; cv=none;
d=zohomail.com; s=zohoarc;
b=DclhvRkQSnVsl2uh+ljZ27xTzBsILSbphu32JVqloYe+1azT+V6NOh2e668aTzAE0Ri1XqJrw3ozoib3AxrzmEizKuGVJ9ycpBzvZ2ZH99N6sm/CBBgyTQkTRBKGuM/r/PaEpIPtT0l8wBGU2stCEYl9DEhdEZmEdQPQzfaPBTk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738061194;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=yra2hKs7hlszYhHH5kmHgDMQvYtSgS7xsph+xNM9Ghs=;
b=bz7fuXrKSZf8weL5gnYSmWlIoYHxtr0JL8qJ7AnEchPB6jP8J5AlwrVwdt+k1IsKNXn5iInbvujKUfH7469wmHRHqw1sn2BqLXKSaDg/jIBE2d5OXT9qX6/QUCU4Ba6wXX8vHh5lV91P/qVy+zR/KTosF+xGsTDPifjK5SYcw2M=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738061194937956.0713753395777;
Tue, 28 Jan 2025 02:46:34 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tcj6a-0001JY-V9; Tue, 28 Jan 2025 05:46:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj6A-0001Ab-Ly
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:39 -0500
Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1tcj67-0003bc-6e
for qemu-devel@nongnu.org; Tue, 28 Jan 2025 05:45:38 -0500
Received: by mail-wm1-x330.google.com with SMTP id
5b1f17b1804b1-43618283d48so38515065e9.1
for <qemu-devel@nongnu.org>; Tue, 28 Jan 2025 02:45:34 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c2a1c418esm13920133f8f.95.2025.01.28.02.45.32
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 28 Jan 2025 02:45:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738061134; x=1738665934; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=yra2hKs7hlszYhHH5kmHgDMQvYtSgS7xsph+xNM9Ghs=;
b=vzZb2v0yKdSlAauETvb1y/k4M0l9G3KtplqvCVytpdVkdgLhT305L5aReMngP11SWn
C2ZvcXIemzqUhFiTeIQ0TL8wTwHIFwa+wyYLNYJ2nZ5J68f85YFNYKNhSwc4+tBd27Q5
z6qU/S5jRHZR1B7Qat5xVC3JIyBrJv2yVBs6tDcIhORl18GY7ZKndQNJ5GpMWVe8KICY
OyPEp7AU8X3JUCkKey6g3fXWL50v/tGbZNLhdk4NVbKkssvp9LFW+YYhL7dcUhgOgEuj
vWB9JGBWDbt+7n69+JSLeXiJ2gOAgtYqXqriK/RWqHA/fQ/kMODdZfht5K4DKIcVraBo
o0+g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738061134; x=1738665934;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=yra2hKs7hlszYhHH5kmHgDMQvYtSgS7xsph+xNM9Ghs=;
b=soGGzlC2X4qK/jQ5RMkku/VQ32M/ROfYZuWrK+w3x9dDTW9q53oRmr8//wjBy3BsQ7
wRpw8zpD7MdUqvPERSCtpdQ8vb3D61mwoPL/hJX3ZkKmT5q/R5sbNp7S2wNz5PJWC61u
AMVqmSwnVQBc9gRVFTlByBUotqSlZ7Ky1FvMhO/XMtQJ3uIyBLkCl+gfHqX8gHiVXrGN
sKi2t8z2MKmkdLl8GiANRGHn+bI8fILFxX5BsKmlvCS9e6IPBk6QeF5lUqNUBIKHbEzv
kPtz0+rzlwbUDTL/NPF5CEy8SR850z7y6pgCKBCQqDbRGgseHu09vGWzcQzldlsKbAVR
Xoag==
X-Forwarded-Encrypted: i=1;
AJvYcCUr0wRqb5EtKa27gx4BhCqBGxpkty4fmYBDSV4CwqGZ40VYyuRRwjFTm0g/WUetwcN6ETnjbTZfYl2W@nongnu.org
X-Gm-Message-State: AOJu0Yxfk3pRzEm5e4d4YdMRXfO6mXCQL87gw8P+2HuATcjy01/3sfeH
eVcTWJ674mz43l7Eftiqg4A/3BKKO3C0z1JwBj9OjrS9U4eIWsjmdFFnQDjZ8PQ=
X-Gm-Gg: ASbGncuzjAxb+u/YvkkTJOrbuMV/RFclw/nBoCqa4nYYqBoAyGM9SK9WbMzfGRwUyLd
yhXFWZOdoe9Mc/XqNclas5ACIMk6OupGGZqK+VlgGe+7u0+OR+PTtFl3C/HX79EvipkCbIhHeLu
uEa/yhwxYzeb9o8N35h6HjK1YhFTbEQ1qhCduVqqB86FxjL4B0pFbE78U4VubmhxdBM5wTwXcs+
5Rib4tB/t0rtLR+iwDyTdQOi2sqFFEsAThm/TVnCTBjln+gGir6fnBp0a/BUUc0zP8sxu0bvYeT
YaxIqhXFjO8rsUT18TPP
X-Google-Smtp-Source:
AGHT+IHJQIHsgS2vIceUXb5NbV5V2E7pVcZuWAJal1HSPfUJxu+5dwI+aQG7JJZJDOYP+NCRrr2/PQ==
X-Received: by 2002:adf:a1cc:0:b0:38a:a074:9f3c with SMTP id
ffacd0b85a97d-38bf5663dbcmr35230039f8f.16.1738061133781;
Tue, 28 Jan 2025 02:45:33 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Bin Meng <bmeng.cn@gmail.com>, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH 11/11] hw/sd: Remove unused SDState::enable
Date: Tue, 28 Jan 2025 10:45:19 +0000
Message-Id: <20250128104519.3981448-12-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250128104519.3981448-1-peter.maydell@linaro.org>
References: <20250128104519.3981448-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::330;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738061197166019000
Content-Type: text/plain; charset="utf-8"
Now that sd_enable() has been removed, SD::enable is set to true in
sd_instance_init() and then never changed. So we can remove it.
Note that the VMSTATE_UNUSED() size argument should be '1', not
'sizeof(bool)', as noted in the CAUTION comment in vmstate.h.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/sd/sd.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 74bb7f39bbf..e541c57f8c3 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -173,7 +173,6 @@ struct SDState {
size_t data_size;
uint8_t data[512];
QEMUTimer *ocr_power_timer;
- bool enable;
uint8_t dat_lines;
bool cmd_line;
};
@@ -292,12 +291,12 @@ static const char *sd_acmd_name(SDState *sd, uint8_t =
cmd)
=20
static uint8_t sd_get_dat_lines(SDState *sd)
{
- return sd->enable ? sd->dat_lines : 0;
+ return sd->dat_lines;
}
=20
static bool sd_get_cmd_line(SDState *sd)
{
- return sd->enable ? sd->cmd_line : false;
+ return sd->cmd_line;
}
=20
static void sd_set_voltage(SDState *sd, uint16_t millivolts)
@@ -976,7 +975,7 @@ static const VMStateDescription sd_vmstate =3D {
VMSTATE_UINT32(data_offset, SDState),
VMSTATE_UINT8_ARRAY(data, SDState, 512),
VMSTATE_UNUSED_V(1, 512),
- VMSTATE_BOOL(enable, SDState),
+ VMSTATE_UNUSED(1),
VMSTATE_END_OF_LIST()
},
.subsections =3D (const VMStateDescription * const []) {
@@ -2146,7 +2145,7 @@ static int sd_do_command(SDState *sd, SDRequest *req,
sd_rsp_type_t rtype;
int rsplen;
=20
- if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable) {
+ if (!sd->blk || !blk_is_inserted(sd->blk)) {
return 0;
}
=20
@@ -2297,8 +2296,9 @@ static void sd_write_byte(SDState *sd, uint8_t value)
{
int i;
=20
- if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable)
+ if (!sd->blk || !blk_is_inserted(sd->blk)) {
return;
+ }
=20
if (sd->state !=3D sd_receivingdata_state) {
qemu_log_mask(LOG_GUEST_ERROR,
@@ -2429,8 +2429,9 @@ static uint8_t sd_read_byte(SDState *sd)
uint8_t ret;
uint32_t io_len;
=20
- if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable)
+ if (!sd->blk || !blk_is_inserted(sd->blk)) {
return dummy_byte;
+ }
=20
if (sd->state !=3D sd_sendingdata_state) {
qemu_log_mask(LOG_GUEST_ERROR,
@@ -2664,7 +2665,6 @@ static void sd_instance_init(Object *obj)
=20
sd->proto =3D sc->proto;
sd->last_cmd_name =3D "UNSET";
- sd->enable =3D true;
sd->ocr_power_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, sd_ocr_poweru=
p, sd);
}
=20
--=20
2.34.1