From patchwork Tue Feb 21 03:30:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 730278 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 3vS5dM4kJ0z9s2P for ; Tue, 21 Feb 2017 14:31:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cXknfw0N"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jIbZeO70"; 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=cXk nfw0N1WA03nIwd1CzXOatv4irQHjsclg8xOU0uUwyrXYEbm8iSD6JYhgbkJNl2Y437XzACOfUAMf2 aZoH9WatQttVw4tqhB28lPOvL5Clag6kHaxq8P7rUhF+NotMu9frXi/i9wzASVhLgdaD2VdyHce4u YpI9dRr1YX7SMyQB8oa58Z2fsk1vScp9omhXL9m9lBNViV+5MmIXIexWROBSXsjZLEmKY9cMPvcGi aGdcO7N5PMHfjUV2LJSm8LAyFBgSeUh4bV/5xUfGBuifSBYqSpIGTL+yU3gsh3KUxHVFacTAcIxlt rd6sO3Ve6cyq0UADG7ZQA4CYp2fs4xQ==; 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 1cg1An-0004PL-8e; Tue, 21 Feb 2017 03:31:29 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cg1AN-0003t5-L0 for linux-mtd@lists.infradead.org; Tue, 21 Feb 2017 03:31:05 +0000 Received: by mail-pg0-x242.google.com with SMTP id s67so5215980pgb.1 for ; Mon, 20 Feb 2017 19:30:42 -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=jIbZeO70NidWhHygE6D/znHUS83kB443+Hq82jyOZBSjtSZjnbsiDQjmczbh40lXdy Q00Du0OizScenQS7ktGEYf0GuYZ8cW7zHoxjoFI8TQ3PjEYjH2bG4wMhLb+ZkISIpj/M KKmHqniZcG4ZQ5bBQn79IMsNy/jukF604o49H2JUuNuxS4IjU70o4eclG17qBOqAn52X p0L/n92TiLttl7WjfjvVb0JqVr8QBxWUkTnz9K7Rg+5ZXowy4H/cxwlo+nb+PmGiQQNX H81SPyV0kgt/U0OKumyJgDCwE3fsaMUyJsuHO9EpjV21o92L5tT2TedMEHzToEcbpUSJ Ebhw== 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=aoj5ZPaYCzsBiPGur6EniDgRdn6naKgWSSX/xiXDLVplAv/uGZf4BTJwkyfKiTH0WF 7fwQTHpyytVfrmR2JG22rcjk3f+gGCBGiHkThmQMyRcpnoj/XEv9zHG0V3v/h3idjHzs 2O3mwTlrf8YkMzrQXeyE4/5wogF6EudV0oc5p+Ye6/ttvsrpiRkq57ol+Fy0UrRdLtXA 3EHfFmrPW+ow+uqmeJhY4h/qNJIJ0Qlbd+ZvIjdXrUl4eWfoPxzpAc2lp2MvjZfpfmjd 0+dhXpcOovWD5/fuF5+Scx8jFxjIHhmiX/at3Rjb1+1Nz2IPdko0P01BAschSzvNWONs xC8w== X-Gm-Message-State: AMke39lNjnZOAvPvVIsF4xenmoHEyFP4M0CNhglUElQQZKyczo3L8rbyUpbwUIRKW3QLmw== X-Received: by 10.99.67.130 with SMTP id q124mr32208395pga.221.1487647842513; Mon, 20 Feb 2017 19:30:42 -0800 (PST) Received: from mail.broadcom.com ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id s3sm37707713pgn.55.2017.02.20.19.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Feb 2017 19:30:41 -0800 (PST) From: Kamal Dasu To: linux-mtd@lists.infradead.org Subject: [PATCH V3, 1/2] mtd: nand: brcmnand: Change brcmnand_set_wp() prototype Date: Mon, 20 Feb 2017 22:30:31 -0500 Message-Id: <1487647832-10544-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-20170220_193103_721114_26B16D06 X-CRM114-Status: GOOD ( 12.66 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kdasu.kdev[at]gmail.com) -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 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: 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; + } + } }