From nobody Mon Feb 9 17:24:33 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 1518526174434214.6764466330867; Tue, 13 Feb 2018 04:49:34 -0800 (PST) Received: from localhost ([::1]:52849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ela1d-0002Hf-K4 for importer@patchew.org; Tue, 13 Feb 2018 07:49:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHz-0004c3-Bb for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHt-0007qa-DJ for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:23 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:36690) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHt-0007qD-7D for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:17 -0500 Received: by mail-wr0-x244.google.com with SMTP id y3so18370530wrh.3 for ; Tue, 13 Feb 2018 04:02:17 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.02.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:02:15 -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=8TXvoyxtOFyD96NHc3YPokMt+WWoQHowbHUgj6/bpvc=; b=VlWiAfVVOWfZ6ScOsfSuy7lEvtzJMy63Z5gYi3NrlKYfkhPIm1YaJuXpk+qtsVsS+O lgn9k0pr+MRFfKAGGwWJaFljNqlMA7FtGwOt6/RlcSE9Ul5zdgKsewHphc0tithNQtrk SvfhuZ/QUX2xZQewi3CHRIHbaaXE2AcUpiOaBvKRl63mQzUcHC0YQm8g/fHLupdLF1kx iF22vOus6Re4OnkWapmJz+iHFNMHrz0ui5rbRdty1QOjo6nD75Bjil5jjRYQekBrjw7T Thfsk9J7VSeVIkkACo1Uyk2W3N5j5vWs0zf2JNLEIxibiI9FC0k5Ju37rYePsCqdv6+x CibQ== 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=8TXvoyxtOFyD96NHc3YPokMt+WWoQHowbHUgj6/bpvc=; b=J7N6yucEpRmfEzecQ1xquanOb4C3c6sYXUTyZepnZVHGeXXgQ3F0xTkv+IlLO/wuk5 GO4+OC8ymku8Mm1nXz2iBEVEJDLdtctzljVBoXf7QeGPfA6ehyOxHIBJQb9sup+CJTuG AdIaURGOaq3vb7wiUQo4lQnTfIm69MsVw0iqGlSaepIcJmZnV63dbsA9A4JPah9NS5TX 94DtAB5ub+f/Y22J2rzWXAo7Ca5FoRqkXjSIQABoiT+h42GN4o6JI67vLUTJz5ZdY4JP 8em65gOWhFuVtSbCOC8ec+oOZwIbfWS0M5e17RqZPxKO668Keopk2dGyEVW8HPP7CQfI TeYQ== X-Gm-Message-State: APf1xPAIed7qwXRo/T+OOCIcUmgLcfom8NOrohzBnrCgPby9xY89SNHa iW6mErqy/ZDV4U+4eQhmPyY6tkKF X-Google-Smtp-Source: AH8x226+kYiFoBxNcEAbUMvEOIlK+kq3TSD/RxlcJLJ8x8TJGGP5nx0IZimiQV93DQWwm1wP7NguJw== X-Received: by 10.223.165.81 with SMTP id j17mr1025861wrb.173.1518523335748; Tue, 13 Feb 2018 04:02:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:43 +0100 Message-Id: <1518523252-49106-40-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::244 Subject: [Qemu-devel] [PULL 39/48] 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: =?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 "UG1085" (v1.7) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-Id: <20180208164818.7961-27-f4bug@amsat.org> --- 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 ca398c4..e39ad73 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 1.8.3.1