From nobody Tue Oct 28 12:15:15 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 1515004868656284.0944181457405; Wed, 3 Jan 2018 10:41:08 -0800 (PST) Received: from localhost ([::1]:60803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnyK-00009V-PB for importer@patchew.org; Wed, 03 Jan 2018 13:41:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnsT-0003LL-5U for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsQ-0007S2-6s for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:01 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsQ-0007Rv-2O; Wed, 03 Jan 2018 13:34:58 -0500 Received: by mail-qk0-x244.google.com with SMTP id g123so2660738qka.3; Wed, 03 Jan 2018 10:34:57 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.34.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:34:57 -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=mjN0Xl0EufeX2HUblzQO67mWn+xDOBIs3L51QY0wUGY=; b=Ntd5PpxNi49HPxh07DkychvVCh9xqS8AwZ2nflVX2QUkXQx6I5rvvLTQI0rf/VMOVn L8gbdFgmEocqohukhR98ow8bDmwhjY5wfHzJ8hYX6Qg+ryFkpFJ7uNC34tI6iM0+aEbo iVDkimq8WEzuCNHqLtohvprsFRJkEeKuE0YQgNlHw0G5cqY/eX44sGJuOt3BNZ+DV4rf mqJQoEEjiVFO0N2ltR9IW1Es/mJXxEPudAyV8IND8HFfFBzvjP0vyV5URXcWpC6qCzNn v9YR/JqWy01XDOo/6ZegNu2OUlbNWWQh+7RCLCV5LrBGSgLRGp+OLMSy93jDlL09nBAN XzlQ== 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=mjN0Xl0EufeX2HUblzQO67mWn+xDOBIs3L51QY0wUGY=; b=PvDpQ5ojPCKvgqcZFsQEuJSlvl1dGBkj69k1e//gevZtVxh+IBHc3fv2z2HmN8e3UM +eCV6xAWji8tPnxE23vEdqqy3v79eoRwEfJt1RjXAcausXBtcAfkpbInqXomZCUuRWQB dlK7ngT06gLe/k15a9aIBWroPwqrCPDdvuTkgP8qPDJNemSBTwETHlEyYHsqPRAbkxow Txxo4BkzNLUYTXn2aPo+T618ik5XCcDXEheJuOs+EZGMRJOEUcuR7UPYXc5/kBq07P56 XEdsl3sdVI3SpvehW4NaDKDIlXFPloma+Rm0bobGd2dFiZ/MIKcacgNzPTjLnSSE0A2o 2qHQ== X-Gm-Message-State: AKGB3mLiRB5+kTHx6lua+koHsrDZ3bRMUch9eRCRHwu3nSjYbdvwL7ou rfmcAYc7mw4cTuP1Nv9+aBY= X-Google-Smtp-Source: ACJfBovDB2Ys/pymCXAmOmCLSjD/VIrimVSi4U34+I95FO63NbcKs63YO745MUHkUPcfJDi4EYScGw== X-Received: by 10.55.44.66 with SMTP id s63mr2992644qkh.335.1515004497570; Wed, 03 Jan 2018 10:34:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Wed, 3 Jan 2018 15:34:04 -0300 Message-Id: <20180103183418.23730-12-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-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:c09::244 Subject: [Qemu-devel] [PATCH v4 11/25] hw/arm/xilinx_zynq: implement SDHCI Spec v2 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" , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:Xilinx Zynq" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xilinx_zynq.c | 64 ++++++++++++++++++++++++++++++++----------------= ---- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 1836a4ed45..9a106db7b7 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,45 @@ 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; + + /* Compatible with: + * - SD Host Controller Specification Version 2.0 Part A2 + * - SDIO Specification Version 2.0 + * - MMC Specification Version 3.31 + * + * - SDMA (single operation DMA) + * - ADMA1 (4 KB boundary limited DMA) + * - ADMA2 + * + * - up to seven functions in SD1, SD4, but does not support SPI m= ode + * - SD high-speed (SDHS) card + * - SD High Capacity (SDHC) card + * + * - Low-speed, 1 KHz to 400 KHz + * - Full-speed, 1 MHz to 50 MHz (25 MB/sec) + */ + dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); + qdev_prop_set_uint8(dev, "sd-spec-version", 2); + qdev_prop_set_bit(dev, "adma1", true); + qdev_prop_set_bit(dev, "high-speed", true); + qdev_prop_set_uint16(dev, "max-block-length", 1024); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, hci_addr); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[hci_irq - IRQ_OFFSE= T]); + + 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