From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751011AbcDQS7m (ORCPT ); Sun, 17 Apr 2016 14:59:42 -0400 Received: from down.free-electrons.com ([37.187.137.238]:59991 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750831AbcDQS7m convert rfc822-to-8bit (ORCPT ); Sun, 17 Apr 2016 14:59:42 -0400 Date: Sun, 17 Apr 2016 20:59:38 +0200 From: Boris Brezillon To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= Cc: linux-mtd@lists.infradead.org, Richard Weinberger , David Woodhouse , Brian Norris , linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH V2 09/11] mtd: nand: read ECC algorithm from the new field Message-ID: <20160417205938.71fcabf3@bbrezillon> In-Reply-To: <1460913104-27388-10-git-send-email-zajec5@gmail.com> References: <1460750052-16285-1-git-send-email-zajec5@gmail.com> <1460913104-27388-1-git-send-email-zajec5@gmail.com> <1460913104-27388-10-git-send-email-zajec5@gmail.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 17 Apr 2016 19:11:42 +0200 Rafał Miłecki wrote: > Now we have all drivers properly setting this new field we can start > using it. For a very short period of time we should support both values: > NAND_ECC_SOFT and NAND_ECC_SOFT_BCH treating them the same. It's because > of_get_nand_ecc_mode may still be setting NAND_ECC_SOFT_BCH. > > Signed-off-by: Rafał Miłecki > --- > V2: Move SOFT-related code to separated functions > Add missing checks for SOFT before checking Hamming vs. BCH > --- > drivers/mtd/nand/nand_base.c | 116 ++++++++++++++++++++++++++----------------- > 1 file changed, 71 insertions(+), 45 deletions(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c [...] > > @@ -4154,7 +4217,9 @@ int nand_scan_tail(struct mtd_info *mtd) > /* > * If no default placement scheme is given, select an appropriate one. > */ > - if (!mtd->ooblayout && (ecc->mode != NAND_ECC_SOFT_BCH)) { > + if (!mtd->ooblayout && > + (ecc->mode == NAND_ECC_SOFT || ecc->mode == NAND_ECC_SOFT_BCH) && > + ecc->algo != NAND_ECC_BCH) { Sorry, I got this wrong in my previous review. It should be if (!mtd->ooblayout && ((ecc->mode != NAND_ECC_SOFT && ecc->mode != NAND_ECC_SOFT_BCH) || ecc->algo != NAND_ECC_BCH) { otherwise we're only addressing the software ECC case, and IIRC, some drivers rely on these default layouts for their HW ECC implementation. The rest looks good to me. Thanks, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com