From patchwork Tue Oct 30 08:44:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 195329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F02DB2C009B for ; Tue, 30 Oct 2012 19:55:50 +1100 (EST) Received: from localhost ([::1]:34875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7bx-0006vr-4G for incoming@patchwork.ozlabs.org; Tue, 30 Oct 2012 04:55:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7bl-0006uq-F6 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:55:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT7bh-0006kO-3V for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:55:37 -0400 Received: from 38.0.169.217.in-addr.arpa ([217.169.0.38]:35012 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7bg-0006kK-Re for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:55:33 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TT7Qw-0005MK-7s; Tue, 30 Oct 2012 08:44:26 +0000 From: Peter Maydell To: Anthony Liguori Date: Tue, 30 Oct 2012 08:44:22 +0000 Message-Id: <1351586664-20525-27-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351586664-20525-1-git-send-email-peter.maydell@linaro.org> References: <1351586664-20525-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 217.169.0.38 Cc: qemu-devel@nongnu.org, Paul Brook Subject: [Qemu-devel] [PATCH 26/28] hw/sd.c: Fix erase for high capacity cards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Igor Mitsyanko Standard capacity cards SDSC use byte unit address while SDHC and SDXC cards use block unit address (512 bytes) when setting ERASE_START and ERASE_END with CMD32 and CMD33, we have to account for this. Signed-off-by: Igor Mitsyanko Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/sd.c | 17 +++++++++++++---- hw/sd.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index 297580a..b2f211c 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -476,19 +476,28 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert) static void sd_erase(SDState *sd) { - int i, start, end; + int i; + uint64_t erase_start = sd->erase_start; + uint64_t erase_end = sd->erase_end; + if (!sd->erase_start || !sd->erase_end) { sd->card_status |= ERASE_SEQ_ERROR; return; } - start = sd_addr_to_wpnum(sd->erase_start); - end = sd_addr_to_wpnum(sd->erase_end); + if (extract32(sd->ocr, OCR_CCS_BITN, 1)) { + /* High capacity memory card: erase units are 512 byte blocks */ + erase_start *= 512; + erase_end *= 512; + } + + erase_start = sd_addr_to_wpnum(erase_start); + erase_end = sd_addr_to_wpnum(erase_end); sd->erase_start = 0; sd->erase_end = 0; sd->csd[14] |= 0x40; - for (i = start; i <= end; i++) { + for (i = erase_start; i <= erase_end; i++) { if (test_bit(i, sd->wp_groups)) { sd->card_status |= WP_ERASE_SKIP; } diff --git a/hw/sd.h b/hw/sd.h index 4eb9679..d9b97e4 100644 --- a/hw/sd.h +++ b/hw/sd.h @@ -50,6 +50,7 @@ #define READY_FOR_DATA (1 << 8) #define APP_CMD (1 << 5) #define AKE_SEQ_ERROR (1 << 3) +#define OCR_CCS_BITN 30 typedef enum { sd_none = -1,