From patchwork Tue Jan 12 14:05:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 42726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E12281007D4 for ; Wed, 13 Jan 2010 01:18:32 +1100 (EST) Received: from localhost ([127.0.0.1]:50287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUhVO-0006Km-3M for incoming@patchwork.ozlabs.org; Tue, 12 Jan 2010 09:13:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUhSH-0005nQ-Fa for qemu-devel@nongnu.org; Tue, 12 Jan 2010 09:10:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUhSC-0005lE-S6 for qemu-devel@nongnu.org; Tue, 12 Jan 2010 09:10:44 -0500 Received: from [199.232.76.173] (port=53001 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUhSC-0005l4-Ef for qemu-devel@nongnu.org; Tue, 12 Jan 2010 09:10:40 -0500 Received: from miranda.se.axis.com ([193.13.178.8]:37791) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NUhSB-0007fz-Rt for qemu-devel@nongnu.org; Tue, 12 Jan 2010 09:10:40 -0500 Received: from edde (edgar.se.axis.com [10.93.151.1]) by miranda.se.axis.com (8.13.4/8.13.4/Debian-3sarge3) with SMTP id o0CEAY8M025719; Tue, 12 Jan 2010 15:10:34 +0100 Received: by edde (sSMTP sendmail emulation); Tue, 12 Jan 2010 15:05:35 +0100 From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 12 Jan 2010 15:05:32 +0100 Message-Id: <1263305132-23157-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1263305132-23157-1-git-send-email-edgar.iglesias@gmail.com> References: <1263305132-23157-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: "Edgar E. Iglesias" , Jean-Hugues Deschenes Subject: [Qemu-devel] [PATCH 1/1] nand: Correct random data reads. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Random reading depends on having the last row/page latched and not beeing clobbered between read and any following random reads. Also, s->iolen must be updated when loading the io/data register with randomly accessed flash data. Signed-off-by: Edgar E. Iglesias --- hw/nand.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/nand.c b/hw/nand.c index 838f8bc..40d5a6a 100644 --- a/hw/nand.c +++ b/hw/nand.c @@ -212,6 +212,7 @@ static void nand_reset(NANDFlashState *s) static void nand_command(NANDFlashState *s) { + unsigned int offset; switch (s->cmd) { case NAND_CMD_READ0: s->iolen = 0; @@ -233,8 +234,12 @@ static void nand_command(NANDFlashState *s) case NAND_CMD_NOSERIALREAD2: if (!(nand_flash_ids[s->chip_id].options & NAND_SAMSUNG_LP)) break; - - s->blk_load(s, s->addr, s->addr & ((1 << s->addr_shift) - 1)); + offset = s->addr & ((1 << s->addr_shift) - 1); + s->blk_load(s, s->addr, offset); + if (s->gnd) + s->iolen = (1 << s->page_shift) - offset; + else + s->iolen = (1 << s->page_shift) + (1 << s->oob_shift) - offset; break; case NAND_CMD_RESET: @@ -380,12 +385,15 @@ void nand_setio(NANDFlashState *s, uint8_t value) if (s->cmd != NAND_CMD_RANDOMREAD2) { s->addrlen = 0; - s->addr = 0; } } if (s->ale) { - s->addr |= value << (s->addrlen * 8); + unsigned int shift = s->addrlen * 8; + unsigned int mask = ~(0xff << shift); + unsigned int v = value << shift; + + s->addr = (s->addr & mask) | v; s->addrlen ++; if (s->addrlen == 1 && s->cmd == NAND_CMD_READID) @@ -435,6 +443,7 @@ uint8_t nand_getio(NANDFlashState *s) return 0; s->iolen --; + s->addr++; return *(s->ioaddr ++); } @@ -633,9 +642,6 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, offset, PAGE_SIZE + OOB_SIZE - offset); s->ioaddr = s->io; } - - s->addr &= PAGE_SIZE - 1; - s->addr += PAGE_SIZE; } static void glue(nand_init_, PAGE_SIZE)(NANDFlashState *s)