From patchwork Fri Jul 27 19:29:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 173772 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 5D4662C0095 for ; Sat, 28 Jul 2012 05:52:48 +1000 (EST) Received: from localhost ([::1]:39299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuqEs-000372-Cj for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 15:30:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuqEb-0002uJ-Hf for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuqEZ-0004Lt-Qw for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:30:01 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:64680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuqEZ-0004LG-Ll for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:29:59 -0400 Received: from eusync3.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M7U00JX63IX0690@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Jul 2012 20:30:33 +0100 (BST) Received: from idodo.rnd.samsung.ru ([106.109.9.173]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0M7U00EB53HNEH40@eusync3.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Jul 2012 20:29:58 +0100 (BST) From: Igor Mitsyanko To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 23:29:39 +0400 Message-id: <1343417387-13953-5-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1343417387-13953-1-git-send-email-i.mitsyanko@samsung.com> References: <1343417387-13953-1-git-send-email-i.mitsyanko@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.13 Cc: kwolf@redhat.com, peter.maydell@linaro.org, benoit.canet@gmail.com, wdongxu@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, e.voevodin@samsung.com, armbru@redhat.com, andrew.zaborowski@intel.com, kyungmin.park@samsung.com, pbonzini@redhat.com, Igor Mitsyanko Subject: [Qemu-devel] [PATCH V4 04/12] 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 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 --- 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;