From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1amK-0001QX-Qb for qemu-devel@nongnu.org; Wed, 25 Nov 2015 09:10:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1amJ-0003nQ-Nt for qemu-devel@nongnu.org; Wed, 25 Nov 2015 09:10:36 -0500 From: Kevin Wolf Date: Wed, 25 Nov 2015 15:10:21 +0100 Message-Id: <1448460624-16664-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1448460624-16664-1-git-send-email-kwolf@redhat.com> References: <1448460624-16664-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/6] nand: fix flash erase when oob is in memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Ricard Wanderlof For the "main area on file, oob in memory" case, fix the shifts so that we erase the correct number of pages. Signed-off-by: Ricard Wanderl=C3=B6f Signed-off-by: Kevin Wolf --- hw/block/nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/nand.c b/hw/block/nand.c index a68266f..f0e3413 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -712,7 +712,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlas= hState *s) memset(s->storage + (PAGE(addr) << OOB_SHIFT), 0xff, OOB_SIZE << s->erase_shift); i =3D SECTOR(addr); - page =3D SECTOR(addr + (ADDR_SHIFT + s->erase_shift)); + page =3D SECTOR(addr + (1 << (ADDR_SHIFT + s->erase_shift))); for (; i < page; i ++) if (blk_write(s->blk, i, iobuf, 1) < 0) { printf("%s: write error in sector %" PRIu64 "\n", __func= __, i); --=20 1.8.3.1