From patchwork Thu Mar 1 09:48:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 143979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [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 832AF1007D4 for ; Thu, 1 Mar 2012 20:51:10 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S32do-0003cV-7i; Thu, 01 Mar 2012 09:49:40 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S32dX-0003Vt-MB for linux-mtd@lists.infradead.org; Thu, 01 Mar 2012 09:49:24 +0000 Received: by eekb45 with SMTP id b45so151087eek.36 for ; Thu, 01 Mar 2012 01:49:22 -0800 (PST) Received-SPF: pass (google.com: domain of hechtb@googlemail.com designates 10.14.194.134 as permitted sender) client-ip=10.14.194.134; Authentication-Results: mr.google.com; spf=pass (google.com: domain of hechtb@googlemail.com designates 10.14.194.134 as permitted sender) smtp.mail=hechtb@googlemail.com; dkim=pass header.i=hechtb@googlemail.com Received: from mr.google.com ([10.14.194.134]) by 10.14.194.134 with SMTP id m6mr2687167een.4.1330595362685 (num_hops = 1); Thu, 01 Mar 2012 01:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ABuPZ1cHmrNnFs3H++k2socVnMn5tlUJ8PekbJYxzok=; b=JoDn2Pz92ojedKSD6XTp+z/WNWfmFgos9n8puXeAmFVOO449sKIREUwimIFc4nTR3y TMUi0n3rpxAx3f2yubE1neCtRlxa8vJz+/9dWg2PvAy7u9cbwrsTRD04Kb9tEqX7STOL 1MSpxX3dwU5IgeqdLqKzPWUm0WKsCEzZImoYI= Received: by 10.14.194.134 with SMTP id m6mr2070482een.4.1330595362598; Thu, 01 Mar 2012 01:49:22 -0800 (PST) Received: from localhost.localdomain ([89.204.153.40]) by mx.google.com with ESMTPS id n17sm5432919eei.3.2012.03.01.01.49.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 01:49:22 -0800 (PST) From: Bastian Hecht To: linux-sh@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH v3 3/7] mtd: sh_flctl: Expand the READID command to 8 bytes Date: Thu, 1 Mar 2012 10:48:37 +0100 Message-Id: <1330595321-2728-3-git-send-email-hechtb@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330595321-2728-1-git-send-email-hechtb@gmail.com> References: <1330595321-2728-1-git-send-email-hechtb@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (hechtb[at]googlemail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Magnus Damm , Laurent Pichart 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 base code wants to read out 8 bytes in the READID command. Reflect this in the driver code. Signed-off-by: Bastian Hecht --- changelog: There was an inconsistency between patch 2/7 and 3/7. An empty_fifo() call has been moved around to correct it. drivers/mtd/nand/sh_flctl.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index 9291066..407acb5 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -320,6 +320,7 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va break; case NAND_CMD_READID: flcmncr_val &= ~SNAND_E; + flcmdcr_val |= CDSRC_E; addr_len_bytes = ADRCNT_1; break; case NAND_CMD_STATUS: @@ -559,13 +560,18 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, case NAND_CMD_READID: set_cmd_regs(mtd, command, command); - set_addr(mtd, 0, 0); - flctl->read_bytes = 4; + /* READID is always performed using an 8-bit bus */ + if (flctl->chip.options & NAND_BUSWIDTH_16) + column <<= 1; + set_addr(mtd, column, 0); + + flctl->read_bytes = 8; writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */ empty_fifo(flctl); start_translation(flctl); - read_datareg(flctl, 0); /* read and end */ + read_fiforeg(flctl, flctl->read_bytes, 0); + wait_completion(flctl); break; case NAND_CMD_ERASE1: