From patchwork Fri Jul 6 07:51:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Sahu X-Patchwork-Id: 940308 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J4Gu6S1U"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="TKNhtI6B"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="GvHrZ+Ed"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41MRm70smRz9s4r for ; Fri, 6 Jul 2018 17:52:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=u7sIdYIm+qJQziW3awK3QdKDH8OXBynqfL2zSqiyVZU=; b=J4Gu6S1UUILAHWJUlORqBsadU4 rj0Ey2CzNx8aPqpS5VtCjVtt4j9CvTZ0EDlJCYiM//iYse73OTCRjXayKesTgr++maBDlXlOmNPHi jWr3Aj+Qz2KvDbX0i9KHl2taWFMl+af7gLLuIRWlOeM5t/h54fMgOOMqNByTTbcuShGUmd0XD9m+s 1LQdfDlGbTbEFZNAPu7Q8d78fy7Vd7d2sRnRFIztGptgQKGIm6zjBtNAtjH1/z2DERxwCH0uvqwHf xIsyX9CuAf4y2Gtd8Z6CIfsP8LQ61hNMBtGyQaLuW1e/FotA5pv+u3sE/EJde3qFK9uUEw40edJS5 CYchn/Ug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbLXr-0004Ua-2I; Fri, 06 Jul 2018 07:52:47 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbLXT-00041V-Cw for linux-mtd@lists.infradead.org; Fri, 06 Jul 2018 07:52:26 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C9C6C60BB2; Fri, 6 Jul 2018 07:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530863539; bh=r0Q0qfHL2HVUBrbGxftFmmShEafGFWihXs3+FZ8buVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TKNhtI6Bnhnvj+l8dtVISSTDbAS7ms+1MUduFkQMGuZRp18nYQSb9qA3UPHUXM8Uj vjVdYeSxPp6FGnLQA9ESOszQGWjzLzJSBw4fCc5k4NtCGkG/Lb/tGHNFzjoz3hHIeO BzGG048KeSvRdQVzFz0XO5j6r23LD8WY+rUiIqtQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from absahu-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: absahu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 16C8E60B71; Fri, 6 Jul 2018 07:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530863537; bh=r0Q0qfHL2HVUBrbGxftFmmShEafGFWihXs3+FZ8buVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GvHrZ+EdoscvKza1SJ9xwdhT9Nuxtn/tld39SYZqsG83ZGG4ZALKvilARa3f0ME+3 zEK7bmztMWUT2lDZOHVpZRMlwYiK18SOokkcboOjs6K7x3GRYgb/MBApiMKk6/l3cn gkRen/DTUO9etsbKKvdqORDIEiI4h2so7e48AFWo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 16C8E60B71 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=absahu@codeaurora.org From: Abhishek Sahu To: Boris Brezillon , Miquel Raynal Subject: [PATCH 3/5] mtd: rawnand: qcom: fix NAND register write errors Date: Fri, 6 Jul 2018 13:21:57 +0530 Message-Id: <1530863519-5564-4-git-send-email-absahu@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1530863519-5564-1-git-send-email-absahu@codeaurora.org> References: <1530863519-5564-1-git-send-email-absahu@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180706_005223_559459_958C8C11 X-CRM114-Status: GOOD ( 16.83 ) X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Vasut , Abhishek Sahu , linux-mtd@lists.infradead.org, Richard Weinberger , Andy Gross , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fix the following NAND register write errors which will be generated if access protection is enabled. 1. SFLASHC_BURST_CFG register is not available for supported NAND contollers by this driver, so this can be removed. 2. NAND_CTRL is operational register and register writes to operational registers should always be done through command descriptors if BAM_MODE is already enabled. With full boot chain, bootloader already enables BAM_MODE so read the NAND_CTRL register value and write only if BAM_MODE is not set. Signed-off-by: Abhishek Sahu --- drivers/mtd/nand/raw/qcom_nandc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index df12cf3..9e6b383 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -2693,15 +2693,20 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc) { u32 nand_ctrl; - /* kill onenand */ - nandc_write(nandc, SFLASHC_BURST_CFG, 0); nandc_write(nandc, dev_cmd_reg_addr(nandc, NAND_DEV_CMD_VLD), NAND_DEV_CMD_VLD_VAL); /* enable ADM or BAM DMA */ if (nandc->props->is_bam) { nand_ctrl = nandc_read(nandc, NAND_CTRL); - nandc_write(nandc, NAND_CTRL, nand_ctrl | BAM_MODE_EN); + /* + * Once BAM_MODE_EN bit is set then QPIC_NAND_CTRL register + * should be written with BAM instead of writel. + * Check if BAM_MODE_EN is already set by bootloader and write + * only if this bit is not set. + */ + if (!(nand_ctrl & BAM_MODE_EN)) + nandc_write(nandc, NAND_CTRL, nand_ctrl | BAM_MODE_EN); } else { nandc_write(nandc, NAND_FLASH_CHIP_SELECT, DM_EN); }