From patchwork Mon Jan 4 21:05:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 562699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1FDE814032F for ; Tue, 5 Jan 2016 08:07:26 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGCKI-0005Bb-8x; Mon, 04 Jan 2016 21:06:02 +0000 Received: from arrakis.dune.hu ([78.24.191.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGCKA-0004zC-1o for linux-mtd@lists.infradead.org; Mon, 04 Jan 2016 21:05:57 +0000 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6147228BFB8; Mon, 4 Jan 2016 22:04:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 Received: from localhost.localdomain (p548C87BE.dip0.t-ipconnect.de [84.140.135.190]) by arrakis.dune.hu (Postfix) with ESMTPSA; Mon, 4 Jan 2016 22:04:49 +0100 (CET) From: John Crispin To: David Woodhouse Subject: [PATCH 5/6] MTD: lantiq: xway: fix nand locking Date: Mon, 4 Jan 2016 22:05:00 +0100 Message-Id: <1451941501-42952-6-git-send-email-blogic@openwrt.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1451941501-42952-1-git-send-email-blogic@openwrt.org> References: <1451941501-42952-1-git-send-email-blogic@openwrt.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160104_130554_646454_5354489A X-CRM114-Status: GOOD ( 13.98 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org use a global lock in the cs function. Signed-off-by: John Crispin --- drivers/mtd/nand/xway_nand.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c index ef7c7ce..4127049 100644 --- a/drivers/mtd/nand/xway_nand.c +++ b/drivers/mtd/nand/xway_nand.c @@ -80,13 +80,16 @@ static void xway_reset_chip(struct nand_chip *chip) static void xway_select_chip(struct mtd_info *mtd, int chip) { + static unsigned long csflags; switch (chip) { case -1: ltq_ebu_w32_mask(NAND_CON_CE, 0, EBU_NAND_CON); ltq_ebu_w32_mask(NAND_CON_NANDM, 0, EBU_NAND_CON); + spin_unlock_irqrestore(&ebu_lock, csflags); break; case 0: + spin_lock_irqsave(&ebu_lock, csflags); ltq_ebu_w32_mask(0, NAND_CON_NANDM, EBU_NAND_CON); ltq_ebu_w32_mask(0, NAND_CON_CE, EBU_NAND_CON); break; @@ -99,7 +102,6 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) { struct nand_chip *this = mtd->priv; unsigned long nandaddr = (unsigned long) this->IO_ADDR_W; - unsigned long flags; if (ctrl & NAND_CTRL_CHANGE) { if (ctrl & NAND_CLE) @@ -109,11 +111,9 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) } if (cmd != NAND_CMD_NONE) { - spin_lock_irqsave(&ebu_lock, flags); writeb(cmd, (void __iomem *) (nandaddr | xway_latchcmd)); while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0) ; - spin_unlock_irqrestore(&ebu_lock, flags); } } @@ -126,12 +126,9 @@ static unsigned char xway_read_byte(struct mtd_info *mtd) { struct nand_chip *this = mtd->priv; unsigned long nandaddr = (unsigned long) this->IO_ADDR_R; - unsigned long flags; int ret; - spin_lock_irqsave(&ebu_lock, flags); ret = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA)); - spin_unlock_irqrestore(&ebu_lock, flags); return ret; } @@ -140,26 +137,20 @@ static void xway_read_buf(struct mtd_info *mtd, u_char *buf, int len) { struct nand_chip *this = mtd->priv; unsigned long nandaddr = (unsigned long) this->IO_ADDR_R; - unsigned long flags; int i; - spin_lock_irqsave(&ebu_lock, flags); for (i = 0; i < len; i++) buf[i] = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA)); - spin_unlock_irqrestore(&ebu_lock, flags); } static void xway_write_buf(struct mtd_info *mtd, const u_char *buf, int len) { struct nand_chip *this = mtd->priv; unsigned long nandaddr = (unsigned long) this->IO_ADDR_W; - unsigned long flags; int i; - spin_lock_irqsave(&ebu_lock, flags); for (i = 0; i < len; i++) ltq_w8(buf[i], (void __iomem *)(nandaddr | NAND_WRITE_DATA)); - spin_unlock_irqrestore(&ebu_lock, flags); } static int xway_nand_probe(struct platform_device *pdev)