From nobody Tue Feb 10 07:23:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1598031379; cv=none; d=zohomail.com; s=zohoarc; b=eOtlSbl18L7ZnUYVnVNLcJKjQ9aDKiCREY/jlmV/RcE0Kgun4mdrssB0NwztRrWece1z+rBJiDfNzj4WiSql00U0ZP1lqKyLjSkDbQZ4SK8CO3mA5OSxhADqrlvFtTy1XAv73ZEUNACBkXlSuSsbgffkTJfLD7Lx+SMp0J8PnxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598031379; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0Dd44R7OJJJDfs5YP/o1IXlGifzo41VurSE267jt/Qo=; b=WltRDEyERZ1CyHDIXB6AGV0IeJ+RlqCcjlEbflbvqA96Tvur1gicEdAshNWZN/uff/H9OpM/gAu9Nr/Bgxy3WjQ8bJQsWbxBkOMLRvWY3ucigsm5b81syM7wgoB3jj6JjB1qshrCibcuJtb+FyRCsGebFCUrsmtRY+IAfm+FXHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598031379493901.9039790100244; Fri, 21 Aug 2020 10:36:19 -0700 (PDT) Received: from localhost ([::1]:41506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9Axd-0005OU-Vn for importer@patchew.org; Fri, 21 Aug 2020 13:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9ArD-0001Xe-SD; Fri, 21 Aug 2020 13:29:40 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k9ArC-0001Cq-6l; Fri, 21 Aug 2020 13:29:39 -0400 Received: by mail-wr1-x444.google.com with SMTP id f7so2682176wrw.1; Fri, 21 Aug 2020 10:29:37 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id 32sm5315471wrn.86.2020.08.21.10.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 10:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Dd44R7OJJJDfs5YP/o1IXlGifzo41VurSE267jt/Qo=; b=uixN0IGA9f5HhwbE+r28ZLzMQM119tsozjO7Rrom6I9Sg6S64ypFoEIlp6W9lCBR9M pxbU8bv8A3AyUOHq4+4Fzg0axw3BLuWE2NgSWRQE5y7P6XDX165EXlShFhbdW87LLgs1 Fk/G2Y26V5iMix7ig8oTrdiDuCXxnpcQ0yaAQ869gLtWAUAu511oHTs1uUNRIOs5JW0W 7UIJvAgk8K0dgzliBTWZDl/IVY1V1u6o5fINQojuyFyJa7W2RJ1+MUhC+/NFB42XNB0T THKE5fCSGU1CSjSUFqfHvrSlgyBcM0Vx3uIz2fjbBvUSpuOf0022Wa3yuAND9NxpRiAf /d6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0Dd44R7OJJJDfs5YP/o1IXlGifzo41VurSE267jt/Qo=; b=UswyQHKHKRqlqrQWHOUpLBDnTAGZKFebpnRAf2nfUmu6H555fE2cXD2B9phEyPhqEE gaKG+ifaMgIq2xJRHewzOdeyc+1MgHQrvGsz6dgutFUR4KATOxB3QGY0d0kQ/dz/VgPl Hl7UXwSMccqnjDj7as3rcMHTEi3rmpHCZpfmsOHXirdo37/Utmy/TUpWZJxRQyw+gjbu 3sf7QEtRpZDy/kEejyu3gwP88osJ5iRCxsnX16DdaUTOw1AOAIwECDVvcDIUptwEVTza 1HDdfTnKnOgksxJS8Sy83X2dKA5ew+xu/9lsdzgOA5Oi/jt/oY1+wzWhZcVybyuL5C1k wjAQ== X-Gm-Message-State: AOAM530/0B1iUpmrr/Mw81wD4VyQTZongB0/Bv/G4elgfNGSw5zAna7m v/yh4Ad5SE1KwoeqxRvOi2MlsNGeJYI= X-Google-Smtp-Source: ABdhPJxT3XyIVRf9ma2mA0aLGLaGPNCGAa9b7Uyw77r1ZFQAqJR/bYlqhnnBGRIJMdvt1r9vcsVpGA== X-Received: by 2002:a5d:480b:: with SMTP id l11mr3479004wrq.85.1598030975685; Fri, 21 Aug 2020 10:29:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/23] hw/sd/pl181: Do not create SD card within the SD host controller Date: Fri, 21 Aug 2020 19:29:04 +0200 Message-Id: <20200821172916.1260954-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821172916.1260954-1-f4bug@amsat.org> References: <20200821172916.1260954-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Beniamino Galvani , Michael Walle , qemu-arm@nongnu.org, Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) SD/MMC host controllers provide a SD Bus to plug SD cards, but don't come with SD card plugged in :) Let the machine/board model create and plug the SD cards when required. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell Acked-by: Peter Maydell Message-Id: <20200705204630.4133-8-f4bug@amsat.org> --- hw/arm/integratorcp.c | 13 +++++++++++++ hw/arm/realview.c | 12 ++++++++++++ hw/arm/versatilepb.c | 26 ++++++++++++++++++++++++-- hw/arm/vexpress.c | 11 +++++++++++ hw/sd/pl181.c | 19 +------------------ 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 16c4d750a4f..fe7c2b9d4b1 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -25,6 +25,7 @@ #include "hw/char/pl011.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/sd/sd.h" =20 #define TYPE_INTEGRATOR_CM "integrator_core" #define INTEGRATOR_CM(obj) \ @@ -595,6 +596,7 @@ static void integratorcp_init(MachineState *machine) MemoryRegion *ram_alias =3D g_new(MemoryRegion, 1); qemu_irq pic[32]; DeviceState *dev, *sic, *icp; + DriveInfo *dinfo; int i; =20 cpuobj =3D object_new(machine->cpu_type); @@ -649,6 +651,17 @@ static void integratorcp_init(MachineState *machine) qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_WPROT, = 0)); qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_CARDIN,= 0)); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + 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(dev, "sd-bus"), + &error_fatal); + } + sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL); =20 if (nd_table[0].used) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 3e2360c261f..5f1f36b15cd 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -27,6 +27,7 @@ #include "hw/intc/realview_gic.h" #include "hw/irq.h" #include "hw/i2c/arm_sbcon_i2c.h" +#include "hw/sd/sd.h" =20 #define SMP_BOOT_ADDR 0xe0000000 #define SMP_BOOTREG_ADDR 0x10000030 @@ -69,6 +70,7 @@ static void realview_init(MachineState *machine, qemu_irq mmc_irq[2]; PCIBus *pci_bus =3D NULL; NICInfo *nd; + DriveInfo *dinfo; I2CBus *i2c; int n; unsigned int smp_cpus =3D machine->smp.cpus; @@ -236,6 +238,16 @@ static void realview_init(MachineState *machine, qemu_irq_invert(qdev_get_gpio_in(gpio2, 0))); qdev_connect_gpio_out_named(dev, "card-read-only", 0, mmc_irq[0]); qdev_connect_gpio_out_named(dev, "card-inserted", 0, mmc_irq[1]); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + 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(dev, "sd-bus"), + &error_fatal); + } =20 sysbus_create_simple("pl031", 0x10017000, pic[10]); =20 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 9dc93182b6b..9127579984f 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -25,6 +25,7 @@ #include "hw/block/flash.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/sd/sd.h" =20 #define VERSATILE_FLASH_ADDR 0x34000000 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) @@ -309,8 +310,29 @@ static void versatile_init(MachineState *machine, int = board_id) /* Wire up the mux control signals from the SYS_CLCD register */ qdev_connect_gpio_out(sysctl, 0, qdev_get_gpio_in(dev, 0)); =20 - sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NULL); - sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NULL); + dev =3D sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NU= LL); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + 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(dev, "sd-bus"), + &error_fatal); + } + + dev =3D sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NU= LL); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + 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(dev, "sd-bus"), + &error_fatal); + } =20 /* Add PL031 Real Time Clock. */ sysbus_create_simple("pl031", 0x101e8000, pic[10]); diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 049a0ec2c73..95405f59408 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -43,6 +43,7 @@ #include "hw/cpu/a9mpcore.h" #include "hw/cpu/a15mpcore.h" #include "hw/i2c/arm_sbcon_i2c.h" +#include "hw/sd/sd.h" =20 #define VEXPRESS_BOARD_ID 0x8e0 #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) @@ -628,6 +629,16 @@ static void vexpress_common_init(MachineState *machine) qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_WPR= OT)); qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_CAR= DIN)); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + 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(dev, "sd-bus"), + &error_fatal); + } =20 sysbus_create_simple("pl050_keyboard", map[VE_KMI0], pic[12]); sysbus_create_simple("pl050_mouse", map[VE_KMI1], pic[13]); diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index f6de06ece82..f69488ebac3 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -17,7 +17,6 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" =20 //#define DEBUG_PL181 1 =20 @@ -518,30 +517,14 @@ static void pl181_init(Object *obj) TYPE_PL181_BUS, dev, "sd-bus"); } =20 -static void pl181_realize(DeviceState *dev, Error **errp) -{ - DeviceState *card; - DriveInfo *dinfo; - - /* FIXME use a qdev drive property instead of drive_get_next() */ - card =3D qdev_new(TYPE_SD_CARD); - dinfo =3D drive_get_next(IF_SD); - qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), - &error_fatal); - qdev_realize_and_unref(card, - qdev_get_child_bus(dev, "sd-bus"), - &error_fatal); -} - static void pl181_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); =20 k->vmsd =3D &vmstate_pl181; k->reset =3D pl181_reset; - /* Reason: init() method uses drive_get_next() */ + /* Reason: output IRQs should be wired up */ k->user_creatable =3D false; - k->realize =3D pl181_realize; } =20 static const TypeInfo pl181_info =3D { --=20 2.26.2