From nobody Tue Feb 10 14:49:14 2026 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514570937057926.674862368758; Fri, 29 Dec 2017 10:08:57 -0800 (PST) Received: from localhost ([::1]:48948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUz5L-0000q5-Rm for importer@patchew.org; Fri, 29 Dec 2017 13:08:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUyoJ-0003si-C5 for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:51:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUyoI-0007UF-8X for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:51:11 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:38447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUyoI-0007Ts-3K; Fri, 29 Dec 2017 12:51:10 -0500 Received: by mail-qk0-x244.google.com with SMTP id l19so19374453qke.5; Fri, 29 Dec 2017 09:51:09 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.51.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:51:09 -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=Xa05MEsLwIB1ud2EkO9CujvXBHOURSQTLFB5TANpE8fzO5Gu9IPOFmUlW8LKZXpoyn fxJVND5bdRP2XST7aR1XFe6M++5u4vQC7DP7EsMh8Qh2i5DUmPwKsUM+/NfzhkMCerZ4 qOKKq3HZt0aIBbF+py0JZjnl/yrgjewFcGIbGqXmP5C6pShdC3AforspPvVMHWyw1tlK +UUhfBb+zfN20ZUPTUfmR1917dbwZEWv5q+Sz+PlWY4ZBEC3XRoivVJkrtr7AnGAksok F3LNl/D2QlmZeopoCgDr3GsS2vKhuN8sABYvmTJuGV1OE/FP1z6h9aVSopfZdi2RcIxn WX6g== 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=IokVP2/IU4Crxt9EoOV7lMWhRfyXOQSVX8NBgo3UEbLf/Fs/9e2wpWurdxavEvHgLF LHZPrzwOiDelCM46aj7q/glx/JGKWfC7Aep38DJRCmoeASOyjPpSezNHhK5aVRkYydOZ gHk5EdOsfhiTnyCD2ETnZEJBHNlo5dwoGe+Wl0YbRGKPfQ9RR4Aa6M4sSJY8JtdxZ6bi tDZXa5g05U73UTjjTncR3tQCCdKJXwe4a/L4cCePhsBYWkogP8/vP7Z11nXj3tGWwVnd WyEMxmH9kGzO3sKqI7cB4rFc0d5zlBAhSn4YMFfBYHwOnYd6JtalG3w046wvLONaSUex jfew== X-Gm-Message-State: AKGB3mJjUR4sw1zVjt82d6CWSGAOl1JY20zDjgu5+AjEl+paEdPU89fy 63tnkvjXfL3CRq2AHYZZLh0= X-Google-Smtp-Source: ACJfBoud94Cw2c8XxHVaQBNOTXV3UqjPPCZYkvhnj9FHPSl0Bl/dtQevx8gqMQmXe4nc6p7m63XAEg== X-Received: by 10.55.93.195 with SMTP id r186mr44634356qkb.77.1514569869479; Fri, 29 Dec 2017 09:51:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Fri, 29 Dec 2017 14:49:19 -0300 Message-Id: <20171229174933.1781-29-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-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 v3 28/42] 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