From patchwork Fri Dec 7 09:26:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 1009268 X-Patchwork-Delegate: tudor.ambarus@gmail.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=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UG6rnj8G"; 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 43B6cf4chXz9s3q for ; Fri, 7 Dec 2018 20:29:38 +1100 (AEDT) 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=bUi9Qa1vWS/HUnarHruUMxNWoQOJT4jq7hSWrERT+Pc=; b=UG6rnj8GYUSVCj0mlnbX56gB1V 3NLm8lFAVywwz2YuXBEPLr0sl2jcpeUUQSt55sWJvrT7BTz31bDKO8ml8nbzggNL1sHD7Q9xEpVFf KtR5f4CvsnYerrFxlrX19Pre8eUcUxV5f/4mb71XVdluxJfVCRxxhj+1gXZF2pt3i2KYFlLh4Ww0Z +V5jnLjtxbh5aT7K7pvGQ15kB55W7J6YoJSe8WxCfvtnvYGuHkrh9tCKeiPMTCMHEJ7ND2YxBNv8C P9/tk/3UznH6H1f/i8Oq6vefTUvOkbB4WY4/AgDdOZKD4ffZ+bxUW9nL+pimO3LDe7wiuEMxFri3E 5gXXzfow==; 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 1gVCRv-0003SH-Lw; Fri, 07 Dec 2018 09:29:31 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVCPf-0000zg-Bt for linux-mtd@lists.infradead.org; Fri, 07 Dec 2018 09:27:30 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id CEFAC20CEB; Fri, 7 Dec 2018 10:26:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.2 Received: from localhost.localdomain (aaubervilliers-681-1-79-44.w90-88.abo.wanadoo.fr [90.88.21.44]) by mail.bootlin.com (Postfix) with ESMTPSA id 2413F20CEC; Fri, 7 Dec 2018 10:26:39 +0100 (CET) From: Boris Brezillon To: Tudor Ambarus , Marek Vasut Subject: [RFC PATCH 07/34] mtd: spi-nor: Add a new flag to clear SW protection bits during init Date: Fri, 7 Dec 2018 10:26:10 +0100 Message-Id: <20181207092637.18687-8-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207092637.18687-1-boris.brezillon@bootlin.com> References: <20181207092637.18687-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181207_012712_519588_3B7B9547 X-CRM114-Status: GOOD ( 14.48 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 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: Yogesh Narayan Gaur , Vignesh R , Richard Weinberger , Boris Brezillon , linux-mtd@lists.infradead.org, Miquel Raynal , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Get rid of the last piece of code doing checks on SNOR_MFR to decide what to do. We add a new SNOR_F flag to explicitly ask for a SR clear at init time and this flag is set in spi_nor_scan() when the NOR supports the locking feature or directly from the SST, Intel and Atmel post-SFDP fixups hooks since NORs from those manufacturers always require clearing the protection bits. Signed-off-by: Boris Brezillon --- drivers/mtd/spi-nor/spi-nor.c | 33 +++++++++++++++++++++++++++++---- include/linux/mtd/spi-nor.h | 1 + 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 049b67b8f986..ffea0085b4fe 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -3567,10 +3567,7 @@ static int spi_nor_init(struct spi_nor *nor) * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up * with the software protection bits set */ - if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || - JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || - JEDEC_MFR(nor->info) == SNOR_MFR_SST || - nor->info->flags & SPI_NOR_HAS_LOCK) { + if (nor->flags & SNOR_F_CLR_SW_PROT_BITS) { write_enable(nor); write_sr(nor, 0); spi_nor_wait_till_ready(nor); @@ -3691,11 +3688,34 @@ static void spansion_post_sfdp_fixups(struct spi_nor *nor) } } +static void intel_post_sfdp_fixups(struct spi_nor *nor) +{ + nor->flags |= SNOR_F_CLR_SW_PROT_BITS; +} + +static void atmel_post_sfdp_fixups(struct spi_nor *nor) +{ + nor->flags |= SNOR_F_CLR_SW_PROT_BITS; +} + +static void sst_post_sfdp_fixups(struct spi_nor *nor) +{ + nor->flags |= SNOR_F_CLR_SW_PROT_BITS; +} + static int spi_nor_manufacturer_post_sfdp_fixups(struct spi_nor *nor, struct spi_nor_flash_parameter *params) { switch (JEDEC_MFR(nor->info)) { + case SNOR_MFR_ATMEL: + atmel_post_sfdp_fixups(nor); + break; + + case SNOR_MFR_INTEL: + intel_post_sfdp_fixups(nor); + break; + case SNOR_MFR_ST: case SNOR_MFR_MICRON: st_micron_post_sfdp_fixups(nor); @@ -3709,6 +3729,10 @@ spi_nor_manufacturer_post_sfdp_fixups(struct spi_nor *nor, spansion_post_sfdp_fixups(nor); break; + case SNOR_MFR_SST: + sst_post_sfdp_fixups(nor); + break; + case SNOR_MFR_WINBOND: winbond_post_sfdp_fixups(nor); break; @@ -3896,6 +3920,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, mtd->_lock = spi_nor_lock; mtd->_unlock = spi_nor_unlock; mtd->_is_locked = spi_nor_is_locked; + nor->flags |= SNOR_F_CLR_SW_PROT_BITS; } /* diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 56e6bf4ee823..73dad2a77455 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -235,6 +235,7 @@ enum spi_nor_option_flags { SNOR_F_BROKEN_RESET = BIT(6), SNOR_F_4B_OPCODES = BIT(7), SNOR_F_HAS_LOCK = BIT(8), + SNOR_F_CLR_SW_PROT_BITS = BIT(9), }; /**