From patchwork Tue Feb 13 12:00:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 872827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bXBEYHCK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zghvN2jqBz9t3F for ; Tue, 13 Feb 2018 23:40:00 +1100 (AEDT) Received: from localhost ([::1]:51230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZsM-0001gH-9d for incoming@patchwork.ozlabs.org; Tue, 13 Feb 2018 07:39:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHr-0004Ts-28 for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHq-0007p2-6I for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:15 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:53555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHp-0007on-VM for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:14 -0500 Received: by mail-wm0-x244.google.com with SMTP id t74so15607369wme.3 for ; Tue, 13 Feb 2018 04:02:13 -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=GkxjK3tDGD4EJSjLZe5idKtCLDM4t4sdvFLszuMbgE8=; b=bXBEYHCKrytS60Y70TvC2rRl9XjMGGAQRT7FVKoOG/Ss0y0zdnckWWik/cnYbUij9g 6VBPfl4BoRXqXsTvx1TLq0FugfwOQXZ9uNrLSNxVcrWJglCaNlZsOAe9ptNqV+KmFjT+ o8wDORcXV1wUTiWK7OxRU5PSV6w6lvgMDfQoYJ6tmL4Jnmn/fi7x9jT6kGl07qlcehRt xIxGwjVsjdhRpernB5o7cuZnP5nje8ul5UgQvTbq5vBUjbo4Amm1YTeNLdlD+bBtADHb tD96Is7YaY12bx6q9ZYB0i6YLLOOtHWcsBv13tphXWcHLvZNy+k16BCpKq/xLm4U0oKU YlcQ== 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=GkxjK3tDGD4EJSjLZe5idKtCLDM4t4sdvFLszuMbgE8=; b=ka18G5h1EWo530rXLbjg3w+DqX1JCbL6o09PRzOOZ1CPnQGhBMn0uE9l6J/J3qIV5U z4PPVfdYXzenUugdY2bBVOWrSZ1X2SGRK3NV8yPrdZjXOGLSO+62ZHNvnXTGC4ia+l5p 3Z6HjrfF5xn6fWQ9XwgXfUPZYbzKTjBH5KN93R+zWjaa69HtNvkg8Eab22hpp54+pjCs QFw4pSbJ7Bewfs2wpi4do8s1UKuBXHj5sX8ps2w6rqJ4Bui08yp/dbTtVX3uFnBSJOuM Vcag96YvrB+VHb3oqYqr62KmNSa3o2ZVOTl/aF9n6FEJ4Ca5PfaVxdGr+jQ6q7vnXrrb qa2g== X-Gm-Message-State: APf1xPDTxiw6Zrjz5YtVojs5MAk9XJSOgyPjzWutPilFh4zZmNzNfNkx 9VK3ZwPz+BllLR8pWVsjFnh9TKlV X-Google-Smtp-Source: AH8x226uxRmD7SF6+L5zESfmpJKFYYLr/QAz08wlN1dF1RLTrigmFhxDbXAkZTNpdTYl13Qjn4Iz4g== X-Received: by 10.28.111.23 with SMTP id k23mr1166568wmc.69.1518523332455; Tue, 13 Feb 2018 04:02:12 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:02:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:40 +0100 Message-Id: <1518523252-49106-37-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 36/48] hw/arm/bcm2835_peripherals: 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-Id: <20180208164818.7961-24-f4bug@amsat.org> --- hw/arm/bcm2835_peripherals.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 12e0dd1..ca971e8 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -254,14 +254,19 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) memory_region_add_subregion(&s->peri_mr, RNG_OFFSET, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0)); - /* Extended Mass Media Controller */ - object_property_set_int(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg", - &err); - if (err) { - error_propagate(errp, err); - return; - } - + /* Extended Mass Media Controller + * + * Compatible with: + * - SD Host Controller Specification Version 3.0 Draft 1.0 + * - SDIO Specification Version 3.0 + * - MMC Specification Version 4.4 + * + * For the exact details please refer to the Arasan documentation: + * SD3.0_Host_AHB_eMMC4.4_Usersguide_ver5.9_jan11_10.pdf + */ + object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version", &err); + object_property_set_uint(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg", + &err); object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk", &err); if (err) {