Message ID | 20180215221325.7611-2-f4bug@amsat.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bXtFcF3Z"; 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 3zj9lN2P3wz9t3G for <incoming@patchwork.ozlabs.org>; Fri, 16 Feb 2018 09:23:12 +1100 (AEDT) Received: from localhost ([::1]:37131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1emRvq-0006s6-AC for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 17:23:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1emRmb-0004eM-Ky for qemu-devel@nongnu.org; Thu, 15 Feb 2018 17:13:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1emRmZ-0004yt-CO for qemu-devel@nongnu.org; Thu, 15 Feb 2018 17:13:37 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:45768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1emRmZ-0004yb-7K for qemu-devel@nongnu.org; Thu, 15 Feb 2018 17:13:35 -0500 Received: by mail-qk0-x242.google.com with SMTP id g2so1548440qkd.12 for <qemu-devel@nongnu.org>; Thu, 15 Feb 2018 14:13:35 -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=X6r1Lr+WqLcAkN/z10LaYSD3k/6fsub4nKFXwBth+tI=; b=bXtFcF3ZRH2oK4bVMz2HYwd/tPdP8tTKE3vgp48ti5+3y3Zoh576hYuRZlMQrPnvZh qrrNntaNPz+SdgfUS2ipp6zEAG0gEwaTsvSQ0Ipek5u0HTtSvRkWlDTzYkh4XKD+yJ9y Fm3KrxfAXFzIbZ5rRnPLbklSP3MblHCC20br8BUSifRuyOMS45iGUAinBVWLo8T0Fhsl u/j62xMcTTwIWs9qPn4igeJtn5QKUXFxIzDsEFI4A+YXGjUFuKOTSPHB6nUdUssVZg/m w6dKpAxGlub6J+NkPj7scFXC4MgWSvuNAv7luPT9/15uCefL+lqXHXTYl+iPHxWhRDhw /d7g== 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=X6r1Lr+WqLcAkN/z10LaYSD3k/6fsub4nKFXwBth+tI=; b=DHtEdYok+KGqhALEyJhHXgUfEIEOvZ5WgoxxyL8pnBa55AXuIlQNdfdpeM5+u3teZ8 fs+M+ZDG87HTbHMSQADbwwUoevdLUaJosVUbiDMw+rSnlSOn/83vD/ljj2v1haGZ9E1D ze1dWoTd5nSiztELVW2zJA8lO6dBcZmlPaWD7nd3fGO/JGadzWjvnZyeaeNjzzHX7O3H smSECN1mY/UUitVSKIBQOnqCHPJLM66ktvcPfj25eHeON2jJ/pfJYncbxD/dP71YBWUu /NIu/4wvfjAvivX68jhZ+Y0llMxq/CEUUG6iq1Xb7WtW2HZYXS567rcRw7NgWl/rzD3b kcbA== X-Gm-Message-State: APf1xPDR+6ePkAav7uuvcqliyzY2DnivP52dqsz0hwtxiLkgHl/kUV67 v5h/xp6RgvGfGpPpOdZkvH8= X-Google-Smtp-Source: AH8x227rgFvImNvTzRiMvOI7b9xzN8aDatBlbq68BB79+OT3cGU3Vkp+ADECYFsBckRKpVPn0jJLgg== X-Received: by 10.55.190.65 with SMTP id o62mr6759669qkf.348.1518732814831; Thu, 15 Feb 2018 14:13:34 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t5sm10732075qtn.44.2018.02.15.14.13.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 14:13:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: Alistair Francis <alistair.francis@xilinx.com>, Peter Maydell <peter.maydell@linaro.org>, Igor Mitsyanko <i.mitsyanko@gmail.com> Date: Thu, 15 Feb 2018 19:13:06 -0300 Message-Id: <20180215221325.7611-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215221325.7611-1-f4bug@amsat.org> References: <20180215221325.7611-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 v4 01/20] sdcard: Don't always set the high capacity bit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: "Edgar E . Iglesias" <edgar.iglesias@xilinx.com>, Prasad J Pandit <pjp@fedoraproject.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
SDCard: bugfixes, support UHS-I (part 5)
|
expand
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index fbee87afef..9dfbd65ac8 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -291,6 +291,10 @@ static void sd_ocr_powerup(void *opaque) /* card power-up OK */ sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_POWER_UP, 1); + + if (sd->size > 1 * G_BYTE) { + sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_CAPACITY, 1); + } } static void sd_set_scr(SDState *sd) @@ -395,7 +399,6 @@ static void sd_set_csd(SDState *sd, uint64_t size) sd->csd[13] = 0x40; sd->csd[14] = 0x00; sd->csd[15] = 0x00; - sd->ocr |= 1 << 30; /* High Capacity SD Memory Card */ } }