Message ID | 20180103212436.15762-21-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="TSIr1dlp"; 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 3zBkv531Bvz9s7c for <incoming@patchwork.ozlabs.org>; Thu, 4 Jan 2018 08:43:13 +1100 (AEDT) Received: from localhost ([::1]:37870 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 1eWqoZ-0000PD-BN for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 16:43:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1eWqYH-0003GX-5s for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1eWqYA-0000Cd-En for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:21 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:46602) 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 1eWqYA-0000Bv-5q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:14 -0500 Received: by mail-qk0-x242.google.com with SMTP id b132so3256461qkc.13 for <qemu-devel@nongnu.org>; Wed, 03 Jan 2018 13:26:14 -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=SYEcZmYePa9FZIRq4vMILYj8fbduE+fDUMm3YKE8BoM=; b=TSIr1dlpj8JxgnzQOXLO1QOdLn+f6kueZwMujBoYgTbmiG5UadyN1Av7oxJ4FPD4Xw IOJ+tD3NXwpAkaVXbQB0PtpTpWCN5KHUy1g1SF1suS4em6NiFVsf0Kv/30abR+rnHhB5 4gWTeqb2s5gB3ZySe34UGoZOAN23oQWBdakey/uUwNym35jQ9XrpApxbrDVXM8xWp8aw QBvDukm4ZLxKonJhnnVrQLQlSgRvUJr9mTEmIOyk0qxmbjVva2pr6wOeQm2luWl4wkK9 1BPupo0SM5xdYA+/bEms9xwvYVSeWkjoiMX7D1BIbZqD0wDOh4ShMNouYB8C+LBBRvCA c1ug== 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=SYEcZmYePa9FZIRq4vMILYj8fbduE+fDUMm3YKE8BoM=; b=Hy5DLj6vG1FN2zf2W8wFtg1dxpVlYkiRvF31T3RbQRg+2+qizvmMiNSykKHnZ1rA/0 VuSSPfdfALrXaR/YtpeBpgizSVru9sn5YWFoV0qlglnHxScEzq4JDxWHF/fLIREaZmEp IlwumeX2Iy9YGiZOyRE++65DnlNXed0H33tI4kyCV5Rt12rTO3BuuAJ8z7kbUNY8T4v4 u8dm1bbANgOeGRBVNvi+n6XGt2r6aHO8ODJDRk2KttX1JjqZCPj+N/jQk9ECW5M6OfFE pfFswJE8jht7oOuAxJ6XxWPd49FA6dlGnHfX+CoeZPrIjPH8KO9nzL6t72bRukydAakz a/WQ== X-Gm-Message-State: AKGB3mJRwsysMi/qLaAZJ5lX0QVQMIT+0qQqzdedF8shhOX2vC6PafP9 UO6o4OQpNOUAcooFfy99PMU= X-Google-Smtp-Source: ACJfBouYVWYo1dMHMChFSEGn5Bnjlb8Et2rC8+2xoGbKXkPTxdG0wTEoySsgerTzVUaxX/QFbxMMAw== X-Received: by 10.55.16.80 with SMTP id a77mr3355844qkh.148.1515014773750; Wed, 03 Jan 2018 13:26:13 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:26:13 -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>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Olbrich <m.olbrich@pengutronix.de>, Andrzej Zaborowski <balrogg@gmail.com> Date: Wed, 3 Jan 2018 18:24:31 -0300 Message-Id: <20180103212436.15762-21-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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 v2 20/25] 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>, Peter Crosthwaite <crosthwaite.peter@gmail.com>, =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= <f4bug@amsat.org>, qemu-devel@nongnu.org, Paul Brook <paul@codesourcery.com>, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> 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: housekeeping, improve SPI, introduce new Specs
|
expand
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a7cede8da6..16a8a7411d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -318,6 +318,7 @@ static uint16_t sd_crc16(void *message, size_t width) return shift_reg; } +FIELD(OCR, CARD_CAPACITY, 30, 1); /* 0:SDSC, 1:SDHC/SDXC */ FIELD(OCR, CARD_POWER_UP, 31, 1); #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ @@ -336,6 +337,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->capacity >= sd_capacity_sdhc) { + sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_CAPACITY, 1); + } } static void sd_reset_scr(SDState *sd) @@ -440,7 +445,6 @@ static void sd_reset_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 */ } }
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 <alistair.francis@xilinx.com> and Peter Ogden <ogden@xilinx.com> from qemu/xilinx tag xilinx-v2015.4] Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)