From patchwork Fri Dec 29 17:49:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10137323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 60A2C6020A for ; Fri, 29 Dec 2017 18:26:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FA112B530 for ; Fri, 29 Dec 2017 18:26:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4042D2DD51; Fri, 29 Dec 2017 18:26:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D13322B530 for ; Fri, 29 Dec 2017 18:26:23 +0000 (UTC) Received: from localhost ([::1]:49786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUzMM-0006Tw-OD for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Dec 2017 13:26:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUyoc-00049I-MC for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:51:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUyob-0007nP-Sp for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:51:30 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUyob-0007mm-O4; Fri, 29 Dec 2017 12:51:29 -0500 Received: by mail-qk0-x242.google.com with SMTP id x7so36175916qkb.0; Fri, 29 Dec 2017 09:51:29 -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=uny4mSTjMXZBjtnnqOPmWKw33YCFfPu8RUMg8C5c1t0=; b=cpLc+v6e3I8dqakuuPDPaFhWufha/FpkYzTMfEBNWeH2RqXm0z7WOFl8WieIBPoGJi 1lomKsqHFH8hShZlUxSRwLFJ26pWB3r8GzgobsIUdcbbQwXxHOVAR44LpmZUg062OTwZ wW0KL9RroGyMPkv4kVGsG5k796vRfCdPJRPo0WfV3SrlXEMM7q58h1ldfiEGTyk73/bT TDadXylglmnZLWto0dCylJyAB4I89uIhfmm2IoezWQSc5R/LO1FdcN8GIvs+XPq1oXQd r+LKxguZWw8l02KuuMN/cAI/gcTa3JZ6ku5SHPdHyBlteEje+2Kc73u574F9F6sqixe3 T87A== 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=uny4mSTjMXZBjtnnqOPmWKw33YCFfPu8RUMg8C5c1t0=; b=DK2HB0v2w7bvKnwzh203Bp7rfD3Dfl/dULKRHJZZnarsfruQyhwpqq5CKb/n3EFo+W sfoYIvnGjg5SM4NWDe8ZZ0bCvFfVRvy/gBGyLlWqgtREsmt1WVnr+hUTrkDJGp+6mMxK BNg/udqxXLPZ63rHnevuTSqSnjbWxVP/XXLDOC65hOSJBMJllZxKNWjqUyJ7Re30xfil pGhZYlo2/jjN+vqKABkgbpVgfNdV/t1Y9794R77j60Qye6zfAuHyKFDRW7etB8WdOfzJ rtuezdybHMBoi005tusknvm5s9mJDWPjmJXGl6LlWY3VhG4bfTieQPOlJMhJ7sfYc6xl EKOQ== X-Gm-Message-State: AKGB3mKDezZJvUfXN6WrOxXio8ycNw3Hwv4IUkUlir1EIjsoW36hdvR0 tMSlM7krD33tHfNsTGz+Os2KALw8 X-Google-Smtp-Source: ACJfBouTCV+bxuuNyAYlXxQISHppvAXdvEe7RwP7dPtrO0qIuP+7Jz2AImiWIhDZC5c8W2a33OwvNw== X-Received: by 10.55.130.133 with SMTP id e127mr44664762qkd.279.1514569889184; Fri, 29 Dec 2017 09:51:29 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:51:28 -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:26 -0300 Message-Id: <20171229174933.1781-36-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v3 35/42] hw/arm/xilinx_zynqmp: implement SDHCI Spec v3 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 , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/xlnx-zynqmp.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..dacf89c566 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -381,22 +381,38 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name; - - object_property_set_bool(OBJECT(&s->sdhci[i]), true, - "realized", &err); + char *bus_name = g_strdup_printf("sd-bus%d", i); + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); + Object *sdhci = OBJECT(&s->sdhci[i]); + + /* Compatible with: + * - SD Host Controller Specification Version 3.00 + * - SDIO Specification Version 3.0 + * - eMMC Specification Version 4.51 + * + * Host clock rate variable between 0 and 208 MHz + * Transfers the data in SDR104, SDR50, DDR50 modes + * (SDR104 mode: up to 832Mbits/s using 4 parallel data lines) + * Transfers the data in 1 bit and 4 bit SD modes + * UHS speed modes, 1.8V + * voltage switch, tuning commands + */ + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + object_property_set_bool(sdhci, true, "suspend", &err); + object_property_set_bool(sdhci, true, "1v8", &err); + object_property_set_bool(sdhci, true, "64bit", &err); + object_property_set_uint(sdhci, 0b111, "bus-speed", &err); + object_property_set_uint(sdhci, 0b111, "driver-strength", &err); + 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 = 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); }