From patchwork Fri Oct 18 23:02:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 3070741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99820BF924 for ; Sat, 19 Oct 2013 00:29:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAA7F20386 for ; Sat, 19 Oct 2013 00:29:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD94D20489 for ; Sat, 19 Oct 2013 00:29:04 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXJ99-0004wx-4g; Fri, 18 Oct 2013 23:07:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXJ96-0001Uc-RD; Fri, 18 Oct 2013 23:07:52 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXJ58-0000yO-Mr; Fri, 18 Oct 2013 23:03:48 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id D52EA8A2; Sat, 19 Oct 2013 01:03:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (unknown [190.2.98.212]) by mail.free-electrons.com (Postfix) with ESMTPA id 428EB890; Sat, 19 Oct 2013 01:03:24 +0200 (CEST) From: Ezequiel Garcia To: , Subject: [PATCH v2 11/27] mtd: nand: pxa3xx: Disable OOB on arbitrary length commands Date: Fri, 18 Oct 2013 20:02:38 -0300 Message-Id: <1382137374-21251-12-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1382137374-21251-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1382137374-21251-1-git-send-email-ezequiel.garcia@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131018_190346_927624_8F1DE62F X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.7 (-) Cc: Lior Amsalem , Thomas Petazzoni , Jason Cooper , Tawfik Bayouk , Daniel Mack , Ezequiel Garcia , Gregory Clement , Brian Norris , Willy Tarreau X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP READID, STATUS and PARAM (aka ONFI read paramater page) don't read the OOB area. Set the oob_size to zero and prevent it. Also, add a comment clarifying the use of pxa3xx_set_datasize() which is only applicable on data read/write commands. Signed-off-by: Ezequiel Garcia --- drivers/mtd/nand/pxa3xx_nand.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 83ba036..95e2ce3 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -302,6 +302,11 @@ static void pxa3xx_nand_set_timing(struct pxa3xx_nand_host *host, nand_writel(info, NDTR1CS0, ndtr1); } +/* + * Set the data and OOB size, depending on the selected + * spare and ECC configuration. + * Only applicable to READ0, READOOB and PAGEPROG commands. + */ static void pxa3xx_set_datasize(struct pxa3xx_nand_info *info) { int oob_enable = info->reg_ndcr & NDCR_SPARE_EN; @@ -661,6 +666,7 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command, info->ndcb1 = (column & 0xFF); info->ndcb3 = 256; info->data_size = 256; + info->oob_size = 0; break; case NAND_CMD_READID: @@ -671,6 +677,7 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command, info->ndcb1 = (column & 0xFF); info->data_size = 8; + info->oob_size = 0; break; case NAND_CMD_STATUS: info->buf_count = 1; @@ -679,6 +686,7 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command, | command; info->data_size = 8; + info->oob_size = 0; break; case NAND_CMD_ERASE1: