From nobody Wed Feb 11 05:35:39 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516673698175471.95439031987223; Mon, 22 Jan 2018 18:14:58 -0800 (PST) Received: from localhost ([::1]:55135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edo6x-0001B1-Jg for importer@patchew.org; Mon, 22 Jan 2018 21:14:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edo1n-0005u0-6x for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:09:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edo1k-0003oe-0u for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:09:35 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:37086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edo1j-0003o9-So; Mon, 22 Jan 2018 21:09:31 -0500 Received: by mail-qt0-x244.google.com with SMTP id d54so26146941qtd.4; Mon, 22 Jan 2018 18:09:31 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id j19sm6514120qtc.1.2018.01.22.18.09.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 18:09:30 -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=RLGgs5ob8+3JaVOLgXR0+iUnt5fi/wPyh3+ufpVzmPM=; b=jf9L8C2W487/gJ2nfhzCeo6UAAXULursBfv2+k+Pvn/lAaDdBXCdYjZvy98cAFL9QC wrj9X5Q05HKwTp9DyUoFRcF01/mvCjrDPF5B7t31Xc7u0zZWSwkEKxbo+quUcpkLCQ7+ aD9UX7MXlzdLdizdhtcz9FBrGF5NtsnGFaSqLFHkHOeueJzagE0RYN+4miCrHo2hAySI ulQ+QbWPgSKTzsNgpw5PogQ03mAz/HSDNerESo1AvztWrTES+dao9NEgaSOvtgWLe8tJ E5f3eALdwQmbeLZmoX+Zb3paFWxoWSTyMFcnhOPTuN2CqrvHiP2DzuDaC0iv+VsXhPo9 iUMg== 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=RLGgs5ob8+3JaVOLgXR0+iUnt5fi/wPyh3+ufpVzmPM=; b=XGiu3VXgKMIBwh4CxoXHFcRkn+8l2BSxh00lHTx42aOj9lLDYD+/pkyMoI08qUcCsh Z1qEfRPi8lSRUR8ajGH1zc6y5EXJow7AddmEby+kPDaVhLkkowLWlny9Z5bmQTH+Q2rM a0o/MtXLiRi8yCXWj0NOWcN4XCj2cU413GjJ5O2BkKMZQ94lDhIk4G5OCJtGgbRR7JEI dmi3wd2SES/3s4irFywYo0pzHLnFVM5LlQZcamLP8VXG4vOt9Qk/KB3X5m063QN//Myv RPoYHBhpCFKZqFw+qvY7OyWr0unJqgvk8riTkivFnDfhwn5YuKhFDRamkXgN+/hT+wJ8 drFA== X-Gm-Message-State: AKwxytcFKIgLgz4f+uhI5TjkOm6xalB+5h0OlLqvWgHkx4xk1pZUXlIy nYAGm1YAF9KIOHEgvZbVSAs= X-Google-Smtp-Source: AH8x226rJtsrC9TV6crrJv5GIMrpdqU+jEPtZpimcK25J3JbdTHHOOlzhfQWp2RF4mC0OnzSzFl1RA== X-Received: by 10.237.50.197 with SMTP id z63mr1416335qtd.212.1516673371488; Mon, 22 Jan 2018 18:09:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Mon, 22 Jan 2018 23:08:20 -0300 Message-Id: <20180123020820.1288-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123020820.1288-1-f4bug@amsat.org> References: <20180123020820.1288-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::244 Subject: [Qemu-devel] [PATCH v9 16/16] 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: "Edgar E . Iglesias" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , "open list:Xilinx Zynq" , Marcel Apfelbaum , "Edgar E. Iglesias" 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 checking Xilinx datasheet "UG585" (v1.12.1) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- 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 1836a4ed45..0f76333770 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 094e0570e1..aae2cfc1b5 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 static struct { --=20 2.15.1