From patchwork Tue Jul 31 01:02:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 174125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8792C2C0086 for ; Tue, 31 Jul 2012 11:01:42 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sw0oO-0003oS-6U; Tue, 31 Jul 2012 00:59:48 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sw0oJ-0003ld-2H for linux-mtd@lists.infradead.org; Tue, 31 Jul 2012 00:59:43 +0000 Received: by pbbrq13 with SMTP id rq13so11599453pbb.36 for ; Mon, 30 Jul 2012 17:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=9V1KYZ2ZsEhDeEHzhJjxj5CxwjpeHpGHNdFRpTVWT6U=; b=lA6LYnx2vHBXiWpDUNOVDU08myu8Iwx5f0b42skbON440ccIF2eZx3E2u0W9ANoFUP kYiVVsoQtWo2e1xmwp3nnQMBqblo/wY1prmphuXQJqr0F2ttEOnI+atgSrmhb3XOrlmo TP2DEgxBXBt1o3M6WnehouWKe3Cm/039iKvMq5IpEpEkPEjKByph7MJ+WRkyd+LD75AV zPxcZJf8tKG9d90YnScI9H5WcSYQIhOUUoghFQeEzJPOwK3gSLSGLHAjjqlIJglwQANn OB2M913MggvgbX4LcIyVqZWP1lvESStLT/1EkTQI5J1GAd8uTPh4hBeUQZJUe2/W3P/U k51A== Received: by 10.68.195.97 with SMTP id id1mr39894745pbc.91.1343696364385; Mon, 30 Jul 2012 17:59:24 -0700 (PDT) Received: from ld-irv-0074.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPS id qi8sm8924714pbc.36.2012.07.30.17.59.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 17:59:23 -0700 (PDT) From: Brian Norris To: Artem Bityutskiy Subject: [PATCH RESEND] mtd: nand: allow NAND_NO_SUBPAGE_WRITE to be set from driver Date: Mon, 30 Jul 2012 18:02:17 -0700 Message-Id: <1343696537-2564-1-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.11.3 X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: Scott Wood , David Woodhouse , Marek Vasut , Brian Norris , linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The NAND_CHIPOPTIONS_MSK has limited utility and is causing real bugs. It silently masks off at least one flag that might be set by the driver (NAND_NO_SUBPAGE_WRITE). This breaks the GPMI NAND driver and possibly others. Really, as long as driver writers exercise a small amount of care with NAND_* options, this mask is not necessary at all. Thus, kill it. From Huang Shijie: "I tested this patch on imx6q-arm2 board with Micron MT29F32G08QAA. it works fine, thanks." Signed-off-by: Brian Norris Tested-by: Huang Shijie Cc: Marek Vasut Tested-by: Marek Vasut --- Hello Artem/David, GPMI NAND has needed this patch for some time, and I think it was agreed on by a few. I'm resending to get acknowledgment from a maintainer. drivers/mtd/nand/nand_base.c | 7 ++----- include/linux/mtd/nand.h | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ead301a..996cc48 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2909,8 +2909,6 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, if (le16_to_cpu(p->features) & 1) *busw = NAND_BUSWIDTH_16; - chip->options &= ~NAND_CHIPOPTIONS_MSK; - pr_info("ONFI flash detected\n"); return 1; } @@ -3074,9 +3072,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, mtd->erasesize <<= ((id_data[3] & 0x03) << 1); } } - /* Get chip options, preserve non chip based options */ - chip->options &= ~NAND_CHIPOPTIONS_MSK; - chip->options |= type->options & NAND_CHIPOPTIONS_MSK; + /* Get chip options */ + chip->options |= type->options; /* * Check if chip is not a Samsung device. Do not clear the diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 6dce5a7..eeb7015 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -206,9 +206,6 @@ typedef enum { #define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \ && (chip->page_shift > 9)) -/* Mask to zero out the chip options, which come from the id table */ -#define NAND_CHIPOPTIONS_MSK 0x0000ffff - /* Non chip related options */ /* This option skips the bbt scan during initialization. */ #define NAND_SKIP_BBTSCAN 0x00010000