From nobody Tue Oct 28 04:18:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151542691954621.37291029634639; Mon, 8 Jan 2018 07:55:19 -0800 (PST) Received: from localhost ([::1]:41339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZle-0002ol-J9 for importer@patchew.org; Mon, 08 Jan 2018 10:55:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZbD-00020k-3y for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:44:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYZbC-0007eb-5k for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:44:31 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:38935) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYZbC-0007eO-1Z; Mon, 08 Jan 2018 10:44:30 -0500 Received: by mail-qt0-x243.google.com with SMTP id k19so14107212qtj.6; Mon, 08 Jan 2018 07:44:29 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u36sm7832382qtc.58.2018.01.08.07.44.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 07:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dctjlJrLf/olfOPXWL5Ft0nhp9i7UsrVEwFlGfD+eoA=; b=KKaCCKSLJr7NSOI6QZ72TsA+Rb1MA0kZrdi456ruSnsJqsX34UfBU60L4Q8a0gMRkl 3Km4e5SDS7160fdjB8dSIEh6uIk+tpC21Itm9s2aRLrbSq5FmKD9OM77hetytuvW+H/q sFmUb/FtwSs8lueL+MWXp8Pkz98OOuVttKsR/StbLBAmD2gE4yVyXyjsGnRwMtDF6Pam 5uPuPG1Lg+JtgaLvdjHED4Xwu/D0VYR0pxJlh476apRCwpRfJrN4X4fc+c7VFR5FupB1 1yEkIg2z65c46EQMI3E3GiWqXUdN6eG6SothtIIGkd3HDX80AmK5Zmnlv2I0qeT0Oio1 3kAg== 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=dctjlJrLf/olfOPXWL5Ft0nhp9i7UsrVEwFlGfD+eoA=; b=S0kgObsw9M9R5TZQG3JyOHA+NBOqiHHez1/Ojj07j4B5byDqn3UH4N54yMpAdZ4Zum +/AWPpfEoKOoMJ+pPpR6bx/9plkjz3VCpL8gUUQvg3QK8veyrOPT6eWu+dAqGf5Drirg OqfmCtIonU9N/5wlKVtaub+CoG/q7Td50ohznwrnvf/nC/i2sJE/j9hZuwIaJiABwia+ iJqs7b4Ii/bK/NL+kZFxh3z1nKEEkNecXMvxM+rltEzUtk7rJgHrDyE4xzTJ9ne341Et aoWhTzohZ5fevXQEYu4BW1uaEBYiijiax/0LLboqerqhFJJMJxcXgy5kXk1vFTmrT9Du mPiA== X-Gm-Message-State: AKwxytdAOpiGuJyiaQNTJpvBzlO0KRvzcmyuGsP9Gdj+gG1ttONZ8QBN glz7VMyGmOWyewePpz0pmwk= X-Google-Smtp-Source: ACJfBov33jNaNxwI+e/eoyRANr81HOCFFIJCZjdNYII8u6joA3eDtw9Bhk6PZPqySukHHjYzBTxzTg== X-Received: by 10.237.33.243 with SMTP id m48mr16593933qtc.87.1515426269501; Mon, 08 Jan 2018 07:44:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrey Smirnov , Igor Mitsyanko Date: Mon, 8 Jan 2018 12:42:45 -0300 Message-Id: <20180108154303.6522-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108154303.6522-1-f4bug@amsat.org> References: <20180108154303.6522-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v5 13/31] hw/arm/xilinx_zynq: use the "arasan, sdhci-4.9a" device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Prasad J Pandit , =?UTF-8?q?Gr=C3=A9gory=20Estrade?= , qemu-devel@nongnu.org, Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Krzysztof Kozlowski , Jean-Christophe Dubois , Sai Pavan Boddu , qemu-arm@nongnu.org, Clement Deschamps , Andrew Baumann , "Edgar E. Iglesias" , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xilinx_zynq.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 1836a4ed45..55872d5678 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -165,10 +165,8 @@ static void zynq_init(MachineState *machine) MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *ext_ram =3D g_new(MemoryRegion, 1); MemoryRegion *ocm_ram =3D g_new(MemoryRegion, 1); - DeviceState *dev, *carddev; + DeviceState *dev; SysBusDevice *busdev; - DriveInfo *di; - BlockBackend *blk; qemu_irq pic[64]; int n; =20 @@ -247,27 +245,22 @@ static void zynq_init(MachineState *machine) gem_init(&nd_table[0], 0xE000B000, pic[54-IRQ_OFFSET]); gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]); =20 - dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]); - - di =3D drive_get_next(IF_SD); - blk =3D di ? blk_by_legacy_dinfo(di) : NULL; - carddev =3D qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CAR= D); - qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); - object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); - - dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); - - di =3D drive_get_next(IF_SD); - blk =3D di ? blk_by_legacy_dinfo(di) : NULL; - carddev =3D qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CAR= D); - qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); - object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); + for (n =3D 0; n < 2; n++) { + int hci_irq =3D n ? 79 : 56; + hwaddr hci_addr =3D n ? 0xE0101000 : 0xE0100000; + DriveInfo *di; + BlockBackend *blk; + DeviceState *carddev; + + dev =3D sysbus_create_varargs("arasan,sdhci-4.9a", + hci_addr, pic[hci_irq - IRQ_OFFSET], N= ULL); + di =3D drive_get_next(IF_SD); + blk =3D di ? blk_by_legacy_dinfo(di) : NULL; + carddev =3D qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD= _CARD); + qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); + object_property_set_bool(OBJECT(carddev), true, "realized", + &error_fatal); + } =20 dev =3D qdev_create(NULL, TYPE_ZYNQ_XADC); qdev_init_nofail(dev); --=20 2.15.1