From patchwork Fri Apr 27 15:50:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 155531 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 79940B6FBE for ; Sat, 28 Apr 2012 01:51:37 +1000 (EST) Received: from localhost ([::1]:48307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnSJ-0005Y7-7U for incoming@patchwork.ozlabs.org; Fri, 27 Apr 2012 11:51:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnS4-0005XP-25 for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SNnRx-0006tD-Sq for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:19 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:48333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnRx-0006sh-N1 for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:13 -0400 Received: from euspt1 (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0M3500M4GAP5KZ@mailout2.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:51:05 +0100 (BST) Received: from dodo.rnd.samsung.ru ([106.109.8.162]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M35001L4AOZLZ@spt1.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:51:11 +0100 (BST) Date: Fri, 27 Apr 2012 19:50:50 +0400 From: Igor Mitsyanko In-reply-to: <1335541859-28829-1-git-send-email-i.mitsyanko@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335541859-28829-5-git-send-email-i.mitsyanko@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.4.1 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1335541859-28829-1-git-send-email-i.mitsyanko@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.12 Cc: peter.maydell@linaro.org, Igor Mitsyanko , e.voevodin@samsung.com, quintela@redhat.com, kyungmin.park@samsung.com, michael@walle.cc, paul@codesourcery.com, m.kozlov@samsung.com, afaerber@suse.de, d.solodkiy@samsung.com Subject: [Qemu-devel] [PATCH V3 04/13] hw/sd.c: favour SD card type (SDSC or SDHC) when performing erase 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 SDSC cards use byte unit address and SDHC and SDXC Cards use block unit address (512 bytes) when setting ERASE_START and ERASE_END with CMD32 and CMD33, we need to account for this. Signed-off-by: Igor Mitsyanko --- hw/sd.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index d0674d5..f7aa580 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -482,8 +482,10 @@ static void sd_erase(SDState *sd) return; } - start = sd_addr_to_wpnum(sd->erase_start); - end = sd_addr_to_wpnum(sd->erase_end); + start = sd_addr_to_wpnum(sd->ocr & (1 << 30) ? + (uint64_t)sd->erase_start * 512 : sd->erase_start); + end = sd_addr_to_wpnum(sd->ocr & (1 << 30) ? + (uint64_t)sd->erase_end * 512 : sd->erase_end); sd->erase_start = 0; sd->erase_end = 0; sd->csd[14] |= 0x40;