From nobody Mon Feb 9 05:01:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524522152282190.2625316841719; Mon, 23 Apr 2018 15:22:32 -0700 (PDT) Received: from localhost ([::1]:55675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAjqp-0004yx-6Z for importer@patchew.org; Mon, 23 Apr 2018 18:22:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAinK-0002aB-Ti for qemu-devel@nongnu.org; Mon, 23 Apr 2018 17:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAinK-0007Ml-0h for qemu-devel@nongnu.org; Mon, 23 Apr 2018 17:14:42 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:47055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAinD-0007KJ-RW; Mon, 23 Apr 2018 17:14:35 -0400 Received: by mail-wr0-x244.google.com with SMTP id d1-v6so44984441wrj.13; Mon, 23 Apr 2018 14:14:35 -0700 (PDT) Received: from gobelin.wifirst.net (eth-east-parth2-46-193-67-82.wb.wifirst.net. [46.193.67.82]) by smtp.gmail.com with ESMTPSA id q4-v6sm10570433wrd.33.2018.04.23.14.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 14:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RTmG9wIIaNvIarrOjKQUwsApUBgwYWTSUUcowxvQFGg=; b=Sa2WhBTQunEfAD6VRI/gvgJRy9mDD3naOZC3tZyS4ZZlx0UduQ/5/FPJNea4AWKDY0 K8pVnJwuxtfGTn110PQMt4/hLpb6+S7EgoeDG3/IysTPA7kFC6WZjF8YAoZQvdT6rmzH TI9fBgntBXl029b5uBiCa1FtY8U/y3G2k1CTYZLjNoqi48BKJ9/y6G62xeCqnvMuE7vt 6ENripV66PQpiYMM9M1O4Ul3Cx28lwleGONJZKROclSJPgfDxZovwNxpQhYOHL9blr8X pLzD1HwxEYTpeZc5BHcGGB0vLYi/cb+yLuIbFlyU//F/Gqcewc3NCuSi/DyxuClje0Qw kzIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RTmG9wIIaNvIarrOjKQUwsApUBgwYWTSUUcowxvQFGg=; b=bJ7YU0NV3PEx8jadw9VUoMHiJbESFArMl2aojfkN39/IXSQUOImPViy1PNzLfjWZQS iZALKa6RvVhXxW9vdleUTYX6A+5SM0aZu8Kb5Jee6k2mwkIDlCsvc/5GB8s8/XV0nuf/ 5gdtxbNC5UYHs5wQCzsgC3gbX5Vtcd2EFwabE7RqP7d087hYncJz7biFt8e8mYL+xdmM 7e62xxJl3xnSB/JJDZcGkzr0xNCDx+5OcPUS5s/HkBuyGsX9EYDrml+yGQp1E7M7D4yl mZUCdVHUDpB/StFKd0GPxWBOJLbO3CMFFdqvlNFk4S/OkqbVcEUsWjQkH7y7SIN4f8gp xgRg== X-Gm-Message-State: ALQs6tDgMEOzx5Qdpi5mQA1UgN8rBA72SSU93jp46qmAIoYiWmWlebcp 8zopkYZWHdveeZjtGgVq10M= X-Google-Smtp-Source: AIpwx48fYeASIBkuZsyT/sUKEGqjUH5KDupqFI6sw7fH3vgOqs78ue7j1ystUzUDUBeV4Q3JDA7ahA== X-Received: by 2002:adf:a4da:: with SMTP id h26-v6mr17373461wrb.164.1524518074548; Mon, 23 Apr 2018 14:14:34 -0700 (PDT) From: Karl Beldan X-Google-Original-From: Karl Beldan To: Kevin Wolf , Max Reitz Date: Mon, 23 Apr 2018 21:14:20 +0000 Message-Id: <20180423211420.6917-1-karl.beldan+oss@gmail.com> X-Mailer: git-send-email 2.16.1.72.g5be1f00 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 X-Mailman-Approved-At: Mon, 23 Apr 2018 18:21:15 -0400 Subject: [Qemu-devel] [PATCH] hw/block/nand: Fix bad offset in nand_blk_load for on-drive OOB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The logic wants 512-byte aligned blk ops. To switch to byte-based block accesses, the fixed commit changed the blk read offset, PAGE_START(addr) >> 9 with PAGE_START(addr) which min alignment, for on-drive OOB, is the min OOB size. Consequently the reads are offset by PAGE_START(addr) & 0x1ff. Fixes: 9fc0d361cc41 ("nand: Switch to byte-based block access") Cc: Eric Blake Signed-off-by: Karl Beldan --- 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 919cb9b803..ed587f60f0 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -788,7 +788,7 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashSt= ate *s, OOB_SIZE); s->ioaddr =3D s->io + SECTOR_OFFSET(s->addr) + offset; } else { - if (blk_pread(s->blk, PAGE_START(addr), s->io, + if (blk_pread(s->blk, PAGE_START(addr) & ~0x1ff, s->io, (PAGE_SECTORS + 2) << BDRV_SECTOR_BITS) < 0) { printf("%s: read error in sector %" PRIu64 "\n", __func__, PAGE_START(addr) >> 9); --=20 2.16.1.72.g5be1f00