From nobody Tue Feb 10 15:29:23 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 1518190007300980.3933843373302; Fri, 9 Feb 2018 07:26:47 -0800 (PST) Received: from localhost ([::1]:33004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekAZa-0002wl-5I for importer@patchew.org; Fri, 09 Feb 2018 10:26:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekA5h-0002hf-H6 for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:55:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekA5g-0005q0-Ln for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:55:53 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:41210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekA5g-0005ps-Fq; Fri, 09 Feb 2018 09:55:52 -0500 Received: by mail-qt0-x241.google.com with SMTP id a9so4245436qtj.8; Fri, 09 Feb 2018 06:55:52 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id b29sm747841qkb.28.2018.02.09.06.55.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 06:55:51 -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=5qaGRwDZfwX37p33tGyHNiBbUOeIBUssXi21Pjx552M=; b=rVhuzKvORaISLKAs5lYk2tjXOpjAiin4NZqvyvyJvY6IigHYW6i4xgUG2qOrak3S2V tjMZHozrT82oBxi6XL22GP8mFnBnpnn4N/Pb8hiQ/ZQbx1l8Ul/848Uz7s0DYJUi+eui 2oeaVeiKHnssfLQkcuoS/lqY1rGEhtPcjoGV8DLao1a9bkYz9XUlRn3PQOUExOG5vdfA t5IZpQ1kaCZgfISBh14BBXGdq6CeJCSXRGpCsOVx+qw/MY85IQezzexquHEGRZVdcoj+ dbWnOqBcX++q0PCgqTSxsPYunXMDLn7lJzLOVlh2qHky6HnUAzx6cYIyqyMJK4xmNew4 1qkw== 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=5qaGRwDZfwX37p33tGyHNiBbUOeIBUssXi21Pjx552M=; b=hXh0thoY16OP3/tWYyF0dACSv9wNtiPo2UUbbf6sDjOSS/jqUZlIgiods09BOO5SPO LfJE8yPjhz/APViDtiNKwA966E3hrmPCPT+AhCzJqWjGf5phVmmkuMg2hbSY6d+zaGog uakn4mWNeTli6XPj5TlJS/WsP2gOp9B84Y7jGzNDAvtoVtVenmBYM1TKEXp11gb/mnTt h2/OMtxfUTRg8S8i7lq220JGLhbhNJharw68zfoY+mjmk/yrKE2+/ZbOlXMLGfBtlar0 lIlwnQwXE9rftjtQ+FyeQf1CvgvRQ+ODxGRnoy+Unrh1ygWSOuQHWOYUYx2mLGGlNbnL sxEw== X-Gm-Message-State: APf1xPCOg5XK8wd2bpK6lnnbwYGjsYsm5kMx5zCiPLc/BQzbZk9N7Qgo wfQtJFhpkfDx83srRHYTQLddd8FP X-Google-Smtp-Source: AH8x225lRbMK02Ja6UIV9PXtrgzW3P922qfV7bYptIzairrWgwlXUDEDQsASRs0eDTbv7BwVDPivqw== X-Received: by 10.200.42.168 with SMTP id b37mr4783587qta.321.1518188151949; Fri, 09 Feb 2018 06:55:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Fri, 9 Feb 2018 11:54:26 -0300 Message-Id: <20180209145430.26007-27-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209145430.26007-1-f4bug@amsat.org> References: <20180209145430.26007-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::241 Subject: [Qemu-devel] [PATCH v12 26/30] hw/arm/xilinx_zynqmp: fix the capabilities/spec version 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" , Peter Maydell , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "open list:Xilinx ZynqMP" , "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 "UG1085" (v1.7) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xlnx-zynqmp.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index ca398c4159..e39ad73bec 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -53,6 +53,8 @@ #define IPI_ADDR 0xFF300000 #define IPI_IRQ 64 =20 +#define SDHCI_CAPABILITIES 0x280737ec6481 /* Datasheet: UG1085 (v1.7) */ + static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] =3D { 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, }; @@ -387,22 +389,27 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Err= or **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name; - - object_property_set_bool(OBJECT(&s->sdhci[i]), true, - "realized", &err); + char *bus_name =3D g_strdup_printf("sd-bus%d", i); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(&s->sdhci[i]); + Object *sdhci =3D OBJECT(&s->sdhci[i]); + + /* Compatible with: + * - SD Host Controller Specification Version 3.00 + * - SDIO Specification Version 3.0 + * - eMMC Specification Version 4.51 + */ + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &er= r); + object_property_set_bool(sdhci, true, "realized", &err); if (err) { error_propagate(errp, err); return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - sdhci_addr[i]); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - gic_spi[sdhci_intr[i]]); + sysbus_mmio_map(sbd, 0, sdhci_addr[i]); + sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); + /* Alias controller SD bus to the SoC itself */ - bus_name =3D g_strdup_printf("sd-bus%d", i); - object_property_add_alias(OBJECT(s), bus_name, - OBJECT(&s->sdhci[i]), "sd-bus", + object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", &error_abort); g_free(bus_name); } --=20 2.16.1