From patchwork Thu Feb 16 18:46:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 728875 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vPQD06Fv0z9s1h for ; Fri, 17 Feb 2017 05:48:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CFMcvV+3"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EnyBKeK2"; dkim-atps=neutral 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: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:In-Reply-To: References:List-Owner; bh=4djHqb+eUj7RxGT0ufN1+HkpHDED+sQ9C4fbSup8n60=; b=CFM cvV+3lDDgkM1mejE+bLNkNjg9i3fQduzZFwtH8rRiK7ZkMAHrdxWsZdDBfrszOM81OJLXLjG+Vviq WXVF/HNCca27NNV23te7Yk8kEULSWV3qkW+4o4JBM70esawtE6ef1siVDx+Zhilc6x52LH2b48dWS lPLDAHPaeIT7ysK8hE60h0CKRAA4jxJZq5l08aroTR+QPAyxfAIAOKGC7G9Fzm57Mhe7q5y+gMXeR 916QrbEsZvSHRbiwSh4kUP9VJTRSo4qbd6x95WecPEJ4FdEcl/frwDpov/joIMeSrkBTS220QEN8y nfnIMct27AlToxlJ8Fo97ikH3L+1laQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ceR6f-0000EC-3c; Thu, 16 Feb 2017 18:48:41 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ceR6b-00006X-DW for linux-mtd@lists.infradead.org; Thu, 16 Feb 2017 18:48:39 +0000 Received: by mail-wr0-x241.google.com with SMTP id c4so3109703wrd.1 for ; Thu, 16 Feb 2017 10:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=yj+kGnsAkE9PZIvOX3RxHv9SkKg5S2xjvU4mPU10DUI=; b=EnyBKeK2VhtbP1vx/IjL6neRV96LFkuA+BWnogL54a58dqhtYEMy8ZALSGssS33cwC A0pOoai3B9cdNAUpeyMGNQHeHLsZID/wwuGeUzk37CSiWoUb/ILbhXroDJ1MjNsGwavZ gxjKBs2wfbGJziFOtLZgH2MiJ9/mfEp6/D1akUwcneBx/+SYYkhjzx/NsceaJKDAX0jK /iUopebwZePixIocYniKjDC7Pd+FrgGieZmXdslRl2Db5y9nizc3JmJXRh7c6Sv0U9Dm MUrxDmZAsik2l+YH5UxYMgg6ibuNPj18YUY+mEs0J68AuvyfGAA67rMzNSK6rSh5P6/Q RBwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yj+kGnsAkE9PZIvOX3RxHv9SkKg5S2xjvU4mPU10DUI=; b=EXRpnIzGwefRft64XKh9JT6434JZBPxo+UYvenqk71MWHhKveMDNVt/uWvPwxDGZgJ 9ebkPQAzvg/1DmApXrIGQQWMbQJWfjZVjUlK68/5DBKpzwFlhE4WMQL+94WWqP6sX3kK /88bGWRwnuy/X9PZ282/vVwCcqhBLVwySFz032kL43H9k3oS+UB/PTY3D+cgdpKU7378 x+SSvCu4G1/lyl7Nu6Qv4+/0sZs97O4NLNxhzLdg/fAMPpqgVrjhd9rBdB9Bhg66BFGt gpTShZSv5Bj268BIUCtfBQTzunYYHTktOcgjn+Zmdj0f4EqH97lISPZ/cG7/aW6sDG7C 66MA== X-Gm-Message-State: AMke39nR/HNAC0M7Np/UsNSzDxLrKPi83b6xfDKtPo212yX8co3tiCKjzPZn2KdbQyY//Q== X-Received: by 10.223.170.137 with SMTP id h9mr3476557wrc.202.1487270891415; Thu, 16 Feb 2017 10:48:11 -0800 (PST) Received: from mail.broadcom.com ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id m29sm10005887wrm.38.2017.02.16.10.48.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Feb 2017 10:48:10 -0800 (PST) From: Kamal Dasu To: linux-mtd@lists.infradead.org Subject: [PATCH V2, 1/2] mtd: nand: brcmnand: Change brcmnand_set_wp() prototype Date: Thu, 16 Feb 2017 13:46:51 -0500 Message-Id: <1487270812-6882-1-git-send-email-kdasu.kdev@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170216_104837_638502_5EB77114 X-CRM114-Status: GOOD ( 12.45 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kdasu.kdev[at]gmail.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_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: boris.brezillon@free-electrons.com, f.fainelli@gmail.com, Kamal Dasu , richard@nod.at, marek.vasut@gmail.com, bcm-kernel-feedback-list@broadcom.com, cyrille.pitchen@atmel.com, computersforpeace@gmail.com, dwmw2@infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Changing brcmnand_set_wp() prototype in prepration for refactoring the nand write protect logic to add flash status byte check for the protection bit. Signed-off-by: Kamal Dasu --- drivers/mtd/nand/brcmnand/brcmnand.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index 42ebd73..c7c4efe 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -765,11 +765,14 @@ enum { CS_SELECT_AUTO_DEVICE_ID_CFG = BIT(30), }; -static inline void brcmnand_set_wp(struct brcmnand_controller *ctrl, bool en) +static int brcmnand_set_wp(struct brcmnand_host *host, int en) { + struct brcmnand_controller *ctrl = host->ctrl; u32 val = en ? CS_SELECT_NAND_WP : 0; brcmnand_rmw_reg(ctrl, BRCMNAND_CS_SELECT, CS_SELECT_NAND_WP, 0, val); + + return 0; } /*********************************************************************** @@ -1029,7 +1032,7 @@ static void brcmnand_wp(struct mtd_info *mtd, int wp) dev_dbg(ctrl->dev, "WP %s\n", wp ? "on" : "off"); old_wp = wp; } - brcmnand_set_wp(ctrl, wp); + brcmnand_set_wp(host, wp); } } @@ -2462,14 +2465,6 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) /* Disable XOR addressing */ brcmnand_rmw_reg(ctrl, BRCMNAND_CS_XOR, 0xff, 0, 0); - if (ctrl->features & BRCMNAND_HAS_WP) { - /* Permanently disable write protection */ - if (wp_on == 2) - brcmnand_set_wp(ctrl, false); - } else { - wp_on = 0; - } - /* IRQ */ ctrl->irq = platform_get_irq(pdev, 0); if ((int)ctrl->irq < 0) { @@ -2522,6 +2517,18 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) } list_add_tail(&host->node, &ctrl->host_list); + + if (ctrl->features & BRCMNAND_HAS_WP) { + /* Permanently disable write protection */ + if (wp_on == 2) { + ret = brcmnand_set_wp(host, false); + if (ret) + goto err; + } + } else { + wp_on = 0; + } + } }