Message ID | 546C8B7F.6030600@ti.com |
---|---|
State | Accepted |
Commit | 775a9134f4398ca98a10af8cc3cf9b664017267f |
Headers | show
Return-Path: <patchwork-forward+bncBD45J6OZZMOBBQMXWKRQKGQEBOZ6QLI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 014E3241C9 for <linaro@patches.linaro.org>; Wed, 19 Nov 2014 12:23:31 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf325547lam.6 for <linaro@patches.linaro.org>; Wed, 19 Nov 2014 04:23:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=3CAzEe6PexKd/VbES7LDzoCJs/wnY0DB8O71y3tKKKc=; b=hYeVI2Lu6gZD7sCo1AH6Ez2SARYe4xdX6lSfQOClLN0/Bg+hZu8gMmb305CNMv4MiC 5s97lmQkvlpS+yUi/PCNdXvX4Qg5RJQZGHdrOJGwxSo8zCCTamrMwsy1SqoZ7RnpG0NV hihppYIjgPex4uSdJ0MuIv9Y1L22EgkCctpCwk25jHoQ6brp1Pi1sS4DPnx5Uz5aGatT LEPPTOAyOb4hVHrR+lFfl6yqYiMwaudJetS1JZn4aBvavO/V2G3yOecYJ6ZAjU4/CcAp B+2j/+nKyJYA6LMtnOG9KMqhhIfc9g5/udl1HxXPMhVsJB3QnqPnn7htBV59g2BaYCUp f83g== X-Gm-Message-State: ALoCoQmmhXDfm17lV/gm7dc03Paa9YAT5AfmTXO5aOOE94Bm73PRfvLN5+3OSAZ+LNypExyFSE3F X-Received: by 10.180.189.116 with SMTP id gh20mr703814wic.2.1416399809906; Wed, 19 Nov 2014 04:23:29 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.72 with SMTP id j8ls1075955lag.105.gmail; Wed, 19 Nov 2014 04:23:29 -0800 (PST) X-Received: by 10.152.43.197 with SMTP id y5mr2074728lal.82.1416399809749; Wed, 19 Nov 2014 04:23:29 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id g8si1650714laa.47.2014.11.19.04.23.29 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 04:23:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id s18so391433lam.35 for <patchwork-forward@linaro.org>; Wed, 19 Nov 2014 04:23:29 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr5161053lbc.34.1416399809495; Wed, 19 Nov 2014 04:23:29 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp72185lbc; Wed, 19 Nov 2014 04:23:28 -0800 (PST) X-Received: by 10.68.222.103 with SMTP id ql7mr30244312pbc.58.1416399807725; Wed, 19 Nov 2014 04:23:27 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vt3si2550116pbc.51.2014.11.19.04.23.27 for <multiple recipients>; Wed, 19 Nov 2014 04:23:27 -0800 (PST) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbaKSMXZ (ORCPT <rfc822;nicolas.dechesne@linaro.org> + 5 others); Wed, 19 Nov 2014 07:23:25 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:58803 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753748AbaKSMWy (ORCPT <rfc822;linux-omap@vger.kernel.org>); Wed, 19 Nov 2014 07:22:54 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id sAJCMQ0P006810; Wed, 19 Nov 2014 06:22:26 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sAJCMQwA019320; Wed, 19 Nov 2014 06:22:26 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 19 Nov 2014 06:22:25 -0600 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id sAJCMNw1005556; Wed, 19 Nov 2014 06:22:23 -0600 Message-ID: <546C8B7F.6030600@ti.com> Date: Wed, 19 Nov 2014 14:22:23 +0200 From: Roger Quadros <rogerq@ti.com> User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: <computersforpeace@gmail.com>, <dwmw2@infradead.org>, <tony@atomide.com> CC: <ezequiel@vanguardiasur.com.ar>, <linux-mtd@lists.infradead.org>, <linux-omap@vger.kernel.org>, <pekon@pek-sem.com>, "Rini, Tom" <trini@ti.com> Subject: [PATCH v2] mtd: nand: omap: Fix NAND enumeration on 3430 LDP References: <1415185258-11747-1-git-send-email-rogerq@ti.com> In-Reply-To: <1415185258-11747-1-git-send-email-rogerq@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit |
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 3b357e9..10d07dd 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1741,13 +1741,6 @@ static int omap_nand_probe(struct platform_device *pdev) goto return_error; } - /* check for small page devices */ - if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW)) { - dev_err(&info->pdev->dev, "small page devices are not supported\n"); - err = -EINVAL; - goto return_error; - } - /* re-populate low-level callbacks based on xfer modes */ switch (pdata->xfer_type) { case NAND_OMAP_PREFETCH_POLLED:
3430LDP has NAND flash with 32 bytes OOB size which is sufficient to hold BCH8 codes but the small page check introduced in commit b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") considers anything below 64 bytes unsuitable for BCH4/8/16. There is another bug in that code where it doesn't skip the check for OMAP_ECC_HAM1_CODE_SW. Get rid of that small page check code as it is insufficient and redundant because we are checking for OOB available bytes vs ecc layout before calling nand_scan_tail(). Fixes: b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") Reported-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/mtd/nand/omap2.c | 7 ------- 1 file changed, 7 deletions(-)