qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vincent Palatin <vpalatin@chromium.org>
To: Qemu devel <qemu-devel@nongnu.org>
Cc: Vincent Palatin <vpalatin@chromium.org>
Subject: [Qemu-devel] [PATCH 1/7] sd: do not add one sector to the disk size
Date: Mon, 25 Jul 2011 16:19:05 -0700	[thread overview]
Message-ID: <1311635951-11047-2-git-send-email-vpalatin@chromium.org> (raw)
In-Reply-To: <1311635951-11047-1-git-send-email-vpalatin@chromium.org>

This leads to random off-by-one error.
When the size of the SD is exactly 1GB, the emulation was returning a
wrong SDHC CSD descriptor.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
---
 hw/sd.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/hw/sd.c b/hw/sd.c
index cedfb20..f48d589 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -393,9 +393,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
     } else {
         sect = 0;
     }
-    sect <<= 9;
-
-    size = sect + 1;
+    size = sect << 9;
 
     sect = (size >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT)) + 1;
 
-- 
1.7.3.1

  reply	other threads:[~2011-07-25 23:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-25 23:19 [Qemu-devel] sd: add SDHCI and eMMC support Vincent Palatin
2011-07-25 23:19 ` Vincent Palatin [this message]
2011-07-25 23:19 ` [Qemu-devel] [PATCH 2/7] sd: fix card size checking on R/W accesses Vincent Palatin
2011-07-30  5:50   ` andrzej zaborowski
2011-07-25 23:19 ` [Qemu-devel] [PATCH 3/7] block: add eMMC block device type Vincent Palatin
2011-07-25 23:19 ` [Qemu-devel] [PATCH 4/7] sd: add eMMC support Vincent Palatin
2011-07-25 23:19 ` [Qemu-devel] [PATCH 5/7] sd: add PCI ids for SDHCI controller Vincent Palatin
2011-07-25 23:19 ` [Qemu-devel] [PATCH 6/7] sd: add SD Host Controller (SDHCI) emulation Vincent Palatin
2011-07-25 23:19 ` [Qemu-devel] [PATCH 7/7] sd: compile SDHCI on PCI platforms Vincent Palatin
2011-12-13 16:38 ` [Qemu-devel] sd: add SDHCI and eMMC support Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311635951-11047-2-git-send-email-vpalatin@chromium.org \
    --to=vpalatin@chromium.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).