From nobody Mon Feb 9 17:59:05 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518525466739302.48473050625614; Tue, 13 Feb 2018 04:37:46 -0800 (PST) Received: from localhost ([::1]:50943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZqD-0007iA-KI for importer@patchew.org; Tue, 13 Feb 2018 07:37:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHo-0004Tg-79 for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHi-0007lj-3U for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:12 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:46900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHh-0007lQ-QO for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:06 -0500 Received: by mail-wr0-x242.google.com with SMTP id 34so8109274wre.13 for ; Tue, 13 Feb 2018 04:02:05 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.02.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:02:03 -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=mIOHMvAaN/aXHyMuBY5Q7L5DeTZ8Wylyg4sJdhRC2Xc=; b=YpNQ6ZKq1UKA4nlzMJ6K5B8E9IjFOXGF+tAn/FGRRrnq7ULnr2bnWXU4PbF6ejX804 ofBDbXipdFxa3unBPjL/PdANpOldIy9h3Gl18qIjldO+bcyX40GHYmWE33wMYk5PbX+9 9Gc9zTdAUEY5rAri3KWSokzvRmuDwE4OL00XyQDkoc3lkfQikyp4hhi83JNzTuNe8+Wp zIBawbsWFDeOOH/mTPGwFWBirNWDQLxLyG6SWb4MD+J1u3b96Sy3RzJ8ZtHd6NCVQYwn DGLf4pXnWcqRZVoTy259ko8PZMZZ3t/c1fmHzRBYnTSGygeE255OAzlSysPZEfmUBMS7 QEtA== 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=mIOHMvAaN/aXHyMuBY5Q7L5DeTZ8Wylyg4sJdhRC2Xc=; b=XPHNRwLSa7u4XlgbgXivPWGvCxslPH4H2p4AMC9eEREIomJ5uNw1RZHlOWsxaa7EX0 yZub+fMPRdZa7TO3Z+FjL6F25N6isBA3qu8n00l4wyQ18N+mvO/PYcZIDkqB7V+nUZ70 lhZdWSx4tQOSLmZRQasiJXuqK3Ig9r5MN0vwsNzfl2tcX7VpWfWyfar2dPQbAIMsJkpE 0KObmG/JVLEQ0XKQH4kHpX/vniD98VUZCN2V+YLljpW/43VFrDTnTCNM9aBroGn005WS eEOPWYJ1p7C0xpNTkmaa0/z4tSDuAfaSbAdkdyfc3dI6V9J8f3YrbF1Cn1UsIjeRY/lb YYKg== X-Gm-Message-State: APf1xPAxOsgoHOMOQ8W3bBxHLxTVnUPDZdQdaWfK7Z0WAbBfOJBIEBWX Ak/JgtP6sOKcx6Z2n4RXoQiy9c84 X-Google-Smtp-Source: AH8x225Ia8/iAIgjVG2OfU0BRoaZ1605sl9jEm3ZMtVV3PEXlvXBMHr2AnTR70boVQF36qybNUvRrA== X-Received: by 10.223.139.11 with SMTP id n11mr1078925wra.91.1518523324128; Tue, 13 Feb 2018 04:02:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:33 +0100 Message-Id: <1518523252-49106-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> References: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> 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: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 29/48] hw/arm/xilinx_zynq: fix the capabilities register to match the datasheet 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 checking Xilinx datasheet "UG585" (v1.12.1) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-Id: <20180208164818.7961-17-f4bug@amsat.org> --- hw/arm/xilinx_zynq.c | 53 ++++++++++++++++++++++++++++--------------------= ---- tests/sdhci-test.c | 5 +++++ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 1836a4e..0f76333 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -61,6 +61,8 @@ static const int dma_irqs[8] =3D { #define SLCR_XILINX_UNLOCK_KEY 0xdf0d #define SLCR_XILINX_LOCK_KEY 0x767b =20 +#define ZYNQ_SDHCI_CAPABILITIES 0x69ec0080 /* Datasheet: UG585 (v1.12.1) = */ + #define ARMV7_IMM16(x) (extract32((x), 0, 12) | \ extract32((x), 12, 4) << 16) =20 @@ -165,10 +167,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 +247,32 @@ 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 + */ + dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); + qdev_prop_set_uint8(dev, "sd-spec-version", 2); + qdev_prop_set_uint64(dev, "capareg", ZYNQ_SDHCI_CAPABILITIES); + 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); diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c index 3e9a5bf..18e8965 100644 --- a/tests/sdhci-test.c +++ b/tests/sdhci-test.c @@ -41,6 +41,11 @@ static const struct sdhci_t { /* Exynos4210 */ { "arm", "smdkc210", {0x12510000, 2, 0, {1, 0x5e80080} } }, + + /* Zynq-7000 */ + { "arm", "xilinx-zynq-a9", /* Datasheet: UG585 (v1.12.1) */ + {0xe0100000, 2, 0, {1, 0x69ec0080} } }, + }; =20 typedef struct QSDHCI { --=20 1.8.3.1