From patchwork Thu Feb 22 15:22:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 129280 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp728771lja; Thu, 22 Feb 2018 07:40:48 -0800 (PST) X-Google-Smtp-Source: AH8x226cKDBx77q86X9WKgxDTsGTml4MW/EH/OZ8qIqaF0wweNgAGzOJtSD2fZ9eWhevm1p1Whpv X-Received: by 10.13.232.21 with SMTP id r21mr5151601ywe.395.1519314048274; Thu, 22 Feb 2018 07:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519314048; cv=none; d=google.com; s=arc-20160816; b=U0eDikQzArBfGMu4XT0CwauZqFsDQ2s6I+/7bD8xEgt5zojG1nFCfdE7YDI58SxXDd lb9FVUgJHibmmlf7ovoakDTg8bkzyvCqPeK7LCmzq7eEz4TfpHTK1YOEN0PHPo3SiK+0 RFVf6UNy4G/2uecYI3Ii5qjHcxPwu+/VvUkeC78JTNg6murLMZwdjk9C2H8uSmP3w+8q tlYVmUTAdEx+utK0fxapRue3gda/3chPlNl6rctcI9EX8xvyERgpZHkiXQzPOsqNTJ6h gSBBMEfd0MrKjv34zlNlBD3QiY0icA2+BCvSyX/LP7Rgc1q7JiH2AKhiHJFFHvW//HQg iymA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=0gUEcE41n7dWOGmgmDxH8Ts6hGHhAfx/49KpA2kuH00=; b=erKg8XJWyJH/Muc5P9MmYZQi7XUnyHHMaQ62BnQpTg/3S3DnJNUYviDeC6FbeDcdau sguym7fHssCxrp/sJKtDG3rUX99y7jtDxqODuHWZCOlYSIDtXHV9A3258fNqEjuxEHk8 q7uP9+swt5itXRTCih8PSStK2VpTubdKvbdEcbhq80uV1Hw2Eqd+EqG4ZbBgFGqBAEWA eZ88dkzkKPwJ3/HLbE3h38vTnsK//nMlK+HogLWjfhvPb0AV+KV/RAKRQqZjSVjD40XY cJuGYyLW5gsb1oFQo6VN3cX259Ulm1IovfLEHY8lWttYsSrtmSd4EdKl1vVAKcUEeviu L8/Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b4-v6si53566yba.100.2018.02.22.07.40.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Feb 2018 07:40:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoszE-0003HS-Lw for patch@linaro.org; Thu, 22 Feb 2018 10:40:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eosif-0004sU-Q5 for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eosie-0001k4-T8 for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:37 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eosie-0001ix-Mc for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:36 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eosid-00024C-O4 for qemu-devel@nongnu.org; Thu, 22 Feb 2018 15:23:35 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 22 Feb 2018 15:22:52 +0000 Message-Id: <20180222152307.7499-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180222152307.7499-1-peter.maydell@linaro.org> References: <20180222152307.7499-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 17/32] 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Don't set the high capacity bit by default as it will be set if required in the sd_set_csd() function. [based on a patch from Alistair Francis and Peter Ogden from qemu/xilinx tag xilinx-v2015.4] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20180215221325.7611-2-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/sd/sd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.16.1 diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 706cb52668..cc347ff782 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -290,6 +290,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) @@ -394,7 +398,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 */ } }