Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B258CC33CAE for ; Mon, 13 Jan 2020 05:39:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E4E52082E for ; Mon, 13 Jan 2020 05:39:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y8Chr/IA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="W7OxZ2Uw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E4E52082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org 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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OD2qfSt0YxgFDSPdSGzcW/Jyw5FvWjmWy767V+kH+Jo=; b=Y8Chr/IAK9L/jn Yt/B5bImqEgXAASldWd564pwkuT0jto7R2JQwT9Axp0aUdP5JgUXYFWS+Algacjcq6zkXk8Ufmm5k afzJ1UErW66IuxIkDkNmj+++FKZjJjc+13lSjmbftjsmZJat79o4I73+ixLRjI9f0Vr0/dr4ytNLv Q101qhwKQbqagUUXbnnw3YCa+eHzYw5HzoT6FrZtnKWmIQeCt4yF4vXQCgJZwHFgeRG0vij4zZzqk a0RFAMeMwTzWOXFJ/gNwzGcvqAI3S8qNQPKifYPNqBgpH/uMhjXqWcufz1CqVzyENj+QmsbZGtPqZ aGCs+/msUnWD/BqWU0IQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iqsRc-00049E-Fy; Mon, 13 Jan 2020 05:39:20 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iqsQM-0002zC-Va for linux-mtd@lists.infradead.org; Mon, 13 Jan 2020 05:38:06 +0000 Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20200113053759epoutp0432475ec3099395c01806dd9dd45a9a28~pW54_6CO_2371923719epoutp04F for ; Mon, 13 Jan 2020 05:37:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20200113053759epoutp0432475ec3099395c01806dd9dd45a9a28~pW54_6CO_2371923719epoutp04F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1578893879; bh=K2zeR0Drwfg99bKeAAHAX/P1sNXd4myXLQ7k9BXUXus=; h=From:To:Subject:Date:In-Reply-To:References:From; b=W7OxZ2UwiVpMjslNE/0jPp/VlefHu07OpcxDkpDu7Ma+AAz9Y6f5S50doBdCGP1vW 17tzgE42L7zAmb7Mi5HImt+WrLz/CfTcQd07z+bs6bUm7hWZBQzERmld01mfliYNPe T+lp1AfI1cGL/djFjFMcEbozqptIP3jyHSAMUXHw= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20200113053759epcas1p37b532242b3131c77c131e2275dcac66e~pW54rMIPC3165431654epcas1p3b; Mon, 13 Jan 2020 05:37:59 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.161]) by epsnrtp1.localdomain (Postfix) with ESMTP id 47x2Rp1bgGzMqYlr; Mon, 13 Jan 2020 05:37:58 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id C9.07.52419.5320C1E5; Mon, 13 Jan 2020 14:37:57 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200113053757epcas1p1815715938095590a8bb8342eeb1e9012~pW52yvye42077620776epcas1p16; Mon, 13 Jan 2020 05:37:57 +0000 (GMT) Received: from epsmgms1p2new.samsung.com (unknown [182.195.42.42]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200113053757epsmtrp2d30487bb551b335dbbb29cb1d5663861~pW52yJiuS0565805658epsmtrp2a; Mon, 13 Jan 2020 05:37:57 +0000 (GMT) X-AuditID: b6c32a37-59fff7000001ccc3-92-5e1c0235c521 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 22.C3.06569.5320C1E5; Mon, 13 Jan 2020 14:37:57 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.100.192]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200113053757epsmtip15ffbf05445cb54315c05b5cab9cd9dcf~pW52oYxTg2824828248epsmtip1i; Mon, 13 Jan 2020 05:37:57 +0000 (GMT) From: Jungseung Lee To: Tudor Ambarus , Vignesh Raghavendra , linux-mtd@lists.infradead.org, js07.lee@gmail.com, js07.lee@samsung.com Subject: [PATCH v2 2/3] mtd: spi-nor: add 4bit block protection support Date: Mon, 13 Jan 2020 14:37:52 +0900 Message-Id: <20200113053753.8184-2-js07.lee@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200113053753.8184-1-js07.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMKsWRmVeSWpSXmKPExsWy7bCmrq4pk0ycwcHfahZ/57xjsnh08zer xe6mZewWH5c4WPw/+4HdgdVj56y77B6bl9R73PmxlNGjb8sqRo/jN7YzBbBG5dhkpCampBYp pOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAO1WUihLzCkFCgUkFhcr 6dvZFOWXlqQqZOQXl9gqpRak5BQYGhToFSfmFpfmpesl5+daGRoYGJkCVSbkZEx/+5Sl4GRw xZQJN9kbGDfbdDFyckgImEj0tK9iBLGFBHYwSmz4Xwthf2KU+H5Hp4uRC8j+xijxdNlnFpiG 68cnMEIk9jJKTDi2mA3C+cwo8WpJC1gVm4CWxI3fm1hBEiICixklet5eBtshLOAu0TapmxnE ZhFQlbjVNQvI5uDgFbCQaD4VC7FBXmL1hgNgJZwClhKL7vwHWyAh0MgmseHaBVaIIheJX/37 oE4Slnh1fAs7hC0l8fndXjYIu1hi58qJ7BDNLYwSj5YvgSoylnj3di3YYmYBTYn1u/QhwooS O3/PBbuTWYBP4t3XHlaQEgkBXomONiGIEiWJNw9aoNZKSFx43At1jofEpR8rmSEB0cMose3P GfYJjLKzEDYsYGRcxSiWWlCcm55abFhgjBxLmxjBCUrLfAfjhnM+hxgFOBiVeHgPVEnHCbEm lhVX5h5ilOBgVhLh3XROKk6INyWxsiq1KD++qDQntfgQoykwJCcyS4km5wOTZ15JvKGpkbGx sYWJmbmZqbGSOC/Hj4uxQgLpiSWp2ampBalFMH1MHJxSDYzd82/u+v1LQ2J+j9Jr0fpd4owm VZ+9X+5z1P+4WlJfcK0bd/M5VYn9Hm3ltlOj+HN+/tL5qvy8T/b0+hVzubdufrNBK3LJM14V 0asX2JizgktCm04fMvzkcOBEr9OTS/t/Xttnd1BW54NdqHecaUCg+aQzSTrmEZ82/mlc9d7y yJbJb7d8YfZUYinOSDTUYi4qTgQA49XOq2YDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphluLIzCtJLcpLzFFi42LZdlhJTteUSSbOoK2d2+LvnHdMFo9u/ma1 2N20jN3i4xIHi/9nP7A7sHrsnHWX3WPzknqPOz+WMnr0bVnF6HH8xnamANYoLpuU1JzMstQi fbsErozpb5+yFJwMrpgy4SZ7A+Nmmy5GTg4JAROJ68cnMHYxcnEICexmlNhzYx8bREJC4tHO LyxdjBxAtrDE4cPFEDUfGSX6lq9lBqlhE9CSuPF7EytIQkRgOaPE+Z932UESwgLuEm2TusGK WARUJW51zWIGGcQrYCHRfCoWYr68xOoNB8BKOAUsJRbd+Q+2Vwio5Ob3k2wTGHkXMDKsYpRM LSjOTc8tNiwwykst1ytOzC0uzUvXS87P3cQIDiMtrR2MJ07EH2IU4GBU4uE9UCUdJ8SaWFZc mXuIUYKDWUmEd9M5qTgh3pTEyqrUovz4otKc1OJDjNIcLErivPL5xyKFBNITS1KzU1MLUotg skwcnFINjKtne1ou8GE3/yN9kkPurxJ3jwl35bLC/4W7Dy7vVdrM4f1rrcSy9X3fys16pxW8 3b43famubvCkrSLB15v66rrWcfIt6vvIt4LtVXL/n3DLt0del9kst7tw7sqB17bFZikprcoq TOv9QzIyzj+zOyAsalQ9ccnEC5nb2U3KWS5G9sjKRIVcVmIpzkg01GIuKk4EADqKMSYfAgAA X-CMS-MailID: 20200113053757epcas1p1815715938095590a8bb8342eeb1e9012 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20200113053757epcas1p1815715938095590a8bb8342eeb1e9012 References: <20200113053753.8184-1-js07.lee@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200112_213803_459660_F6D6D2C8 X-CRM114-Status: GOOD ( 26.07 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org Currently, we are supporting block protection only for flash chips with 3 block protection bits in the SR register. This patch enables block protection support for some flash with 4 block protection bits(bp0-3). Signed-off-by: Jungseung Lee --- v2 : Add sample table portion about 4bit block protection on the comment Trivial coding style change drivers/mtd/spi-nor/spi-nor.c | 127 +++++++++++++++++++++++++++++----- include/linux/mtd/spi-nor.h | 8 +++ 2 files changed, 119 insertions(+), 16 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index e3da6a8654a8..76a3f0b9a7d6 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -238,6 +238,14 @@ struct flash_info { * status register. Must be used with * SPI_NOR_HAS_TB. */ +#define SPI_NOR_HAS_BP3 BIT(17) /* + * Flash SR has 4 bit fields (BP0-3) + * for block protection. + */ +#define SPI_NOR_BP3_SR_BIT6 BIT(18) /* + * BP3 is bit 6 of status register. + * Must be used with SPI_NOR_HAS_BP3. + */ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups; @@ -1767,23 +1775,47 @@ static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs, struct mtd_info *mtd = &nor->mtd; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 tb_mask = SR_TB_BIT5; - int pow; + u8 bp; + int pow = 0; if (nor->flags & SNOR_F_HAS_SR_TB_BIT6) tb_mask = SR_TB_BIT6; - if (!(sr & mask)) { - /* No protection */ - *ofs = 0; - *len = 0; + if (nor->flags & SNOR_F_HAS_SR_BP3) { + u8 tmp; + + if (nor->flags & SNOR_F_HAS_SR_BP3_BIT6) + tmp = sr & (mask | SR_BP3_BIT6); + else + tmp = sr & (mask | SR_BP3_BIT5); + + if (tmp & SR_BP3_BIT6) + tmp = (tmp & ~BIT(6)) | BIT(5); + + bp = tmp >> SR_BP_SHIFT; + if (!bp) { + *ofs = 0; + *len = 0; + return; + } + if (bp <= ilog2(nor->n_sectors)) + pow = ilog2(nor->n_sectors) + 1 - bp; } else { - pow = ((sr & mask) ^ mask) >> SR_BP_SHIFT; - *len = mtd->size >> pow; - if (nor->flags & SNOR_F_HAS_SR_TB && sr & tb_mask) + bp = (sr & mask) >> SR_BP_SHIFT; + if (!bp) { *ofs = 0; - else - *ofs = mtd->size - *len; + *len = 0; + return; + } + pow = bp ^ (mask >> SR_BP_SHIFT); } + + if (nor->flags & SNOR_F_HAS_SR_TB && sr & tb_mask) + *ofs = 0; + else + *ofs = mtd->size - *len; + + *len = mtd->size >> pow; } /* @@ -1823,7 +1855,7 @@ static int stm_is_unlocked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len, /* * Lock a region of the flash. Compatible with ST Micro and similar flash. - * Supports the block protection bits BP{0,1,2} in the status register + * Supports the block protection bits BP{0,1,2,3} in the status register * (SR). Does not support these features found in newer SR bitfields: * - SEC: sector/block protect - only handle SEC=0 (block protect) * - CMP: complement protect - only support CMP=0 (range is not complemented) @@ -1831,7 +1863,7 @@ static int stm_is_unlocked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len, * Support for the following is provided conditionally for some flash: * - TB: top/bottom protect * - * Sample table portion for 8MB flash (Winbond w25q64fw): + * Sample table portion for 8MB flash (Winbond w25q64fw / BP0-2): * * SEC | TB | BP2 | BP1 | BP0 | Prot Length | Protected Portion * -------------------------------------------------------------------------- @@ -1851,6 +1883,32 @@ static int stm_is_unlocked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len, * 0 | 1 | 1 | 0 | 1 | 2 MB | Lower 1/4 * 0 | 1 | 1 | 1 | 0 | 4 MB | Lower 1/2 * + * Sample table portion for 64MB flash (Micron n25q512ax3 / BP0-3): + * + * TB | BP3 | BP2 | BP1 | BP0 | Prot Length | Protected Portion + * -------------------------------------------------------------------------- + * 0 | 0 | 0 | 0 | 0 | NONE | NONE + * 0 | 0 | 0 | 0 | 1 | 64 KB | Upper 1/1024 + * 0 | 0 | 0 | 1 | 0 | 128 KB | Upper 1/512 + * 0 | 0 | 0 | 1 | 1 | 256 KB | Upper 1/256 + * ... + * 0 | 1 | 0 | 0 | 1 | 16 MB | Upper 1/4 + * 0 | 1 | 0 | 1 | 0 | 32 MB | Upper 1/2 + * 0 | 1 | 0 | 1 | 1 | 64 MB | ALL + * 0 | 1 | 1 | 0 | 0 | 64 MB | ALL + * ... + * ------|-------|-------|-------|-------|---------------|------------------- + * 1 | 0 | 0 | 0 | 0 | NONE | NONE + * 1 | 0 | 0 | 0 | 1 | 64 KB | Lower 1/1024 + * 1 | 0 | 0 | 1 | 0 | 128 KB | Lower 1/512 + * 1 | 0 | 0 | 1 | 1 | 256 KB | Lower 1/256 + * ... + * 1 | 1 | 0 | 0 | 1 | 16 MB | Lower 1/4 + * 1 | 1 | 0 | 1 | 0 | 32 MB | Lower 1/2 + * 1 | 1 | 0 | 1 | 1 | 64 MB | ALL + * 1 | 1 | 1 | 0 | 0 | 64 MB | ALL + * ... + * * Returns negative on errors, 0 on success. */ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) @@ -1898,6 +1956,12 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) if (nor->flags & SNOR_F_HAS_SR_TB_BIT6) tb_mask = SR_TB_BIT6; + if (nor->flags & SNOR_F_HAS_SR_BP3) { + if (nor->flags & SNOR_F_HAS_SR_BP3_BIT6) + mask = mask | SR_BP3_BIT6; + else + mask = mask | SR_BP3_BIT5; + } /* * Need smallest pow such that: * @@ -1908,7 +1972,17 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) * pow = ceil(log2(size / len)) = log2(size) - floor(log2(len)) */ pow = ilog2(mtd->size) - ilog2(lock_len); - val = mask - (pow << SR_BP_SHIFT); + + if (nor->flags & SNOR_F_HAS_SR_BP3) { + val = ilog2(nor->n_sectors) + 1 - pow; + val = val << SR_BP_SHIFT; + + if (val & BIT(5) && mask & SR_BP3_BIT6) + val = (val & ~BIT(5)) | BIT(6); + } else { + val = mask - (pow << SR_BP_SHIFT); + } + if (val & ~mask) return -EINVAL; /* Don't "lock" with no region! */ @@ -1983,6 +2057,13 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) if (nor->flags & SNOR_F_HAS_SR_TB_BIT6) tb_mask = SR_TB_BIT6; + + if (nor->flags & SNOR_F_HAS_SR_BP3) { + if (nor->flags & SNOR_F_HAS_SR_BP3_BIT6) + mask = mask | SR_BP3_BIT6; + else + mask = mask | SR_BP3_BIT5; + } /* * Need largest pow such that: * @@ -1995,13 +2076,20 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) pow = ilog2(mtd->size) - order_base_2(lock_len); if (lock_len == 0) { val = 0; /* fully unlocked */ + } else if (nor->flags & SNOR_F_HAS_SR_BP3) { + val = ilog2(nor->n_sectors) + 1 - pow; + val = val << SR_BP_SHIFT; + + if (val & BIT(5) && mask & SR_BP3_BIT6) + val = (val & ~BIT(5)) | BIT(6); } else { val = mask - (pow << SR_BP_SHIFT); - /* Some power-of-two sizes are not supported */ - if (val & ~mask) - return -EINVAL; } + /* Some power-of-two sizes are not supported */ + if (val & ~mask) + return -EINVAL; + status_new = (status_old & ~mask & ~tb_mask) | val; /* Don't protect status register if we're fully unlocked */ @@ -4736,6 +4824,7 @@ static void spi_nor_info_init_params(struct spi_nor *nor) /* Set SPI NOR sizes. */ params->size = (u64)info->sector_size * info->n_sectors; params->page_size = info->page_size; + params->n_sectors = info->n_sectors; if (!(info->flags & SPI_NOR_NO_FR)) { /* Default to Fast Read for DT and non-DT platform devices. */ @@ -5192,6 +5281,11 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, nor->flags |= SNOR_F_NO_OP_CHIP_ERASE; if (info->flags & USE_CLSR) nor->flags |= SNOR_F_USE_CLSR; + if (info->flags & SPI_NOR_HAS_BP3) { + nor->flags |= SNOR_F_HAS_SR_BP3; + if (info->flags & SPI_NOR_BP3_SR_BIT6) + nor->flags |= SNOR_F_HAS_SR_BP3_BIT6; + } if (info->flags & SPI_NOR_NO_ERASE) mtd->flags |= MTD_NO_ERASE; @@ -5199,6 +5293,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, mtd->dev.parent = dev; nor->page_size = params->page_size; mtd->writebufsize = nor->page_size; + nor->n_sectors = params->n_sectors; if (of_property_read_bool(np, "broken-flash-reset")) nor->flags |= SNOR_F_BROKEN_RESET; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 541c06d042e8..92d550501daf 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -129,7 +129,9 @@ #define SR_BP1 BIT(3) /* Block protect 1 */ #define SR_BP2 BIT(4) /* Block protect 2 */ #define SR_TB_BIT5 BIT(5) /* Top/Bottom protect */ +#define SR_BP3_BIT5 BIT(5) /* Block protect 3 */ #define SR_TB_BIT6 BIT(6) /* Top/Bottom protect */ +#define SR_BP3_BIT6 BIT(6) /* Block protect 3 */ #define SR_SRWD BIT(7) /* SR write protect */ /* Spansion/Cypress specific status bits */ #define SR_E_ERR BIT(5) @@ -248,6 +250,8 @@ enum spi_nor_option_flags { SNOR_F_HAS_16BIT_SR = BIT(9), SNOR_F_NO_READ_CR = BIT(10), SNOR_F_HAS_SR_TB_BIT6 = BIT(11), + SNOR_F_HAS_SR_BP3 = BIT(12), + SNOR_F_HAS_SR_BP3_BIT6 = BIT(13), }; @@ -519,6 +523,7 @@ struct spi_nor_locking_ops { * * @size: the flash memory density in bytes. * @page_size: the page size of the SPI NOR flash memory. + * @n_sectors: number of sectors * @hwcaps: describes the read and page program hardware * capabilities. * @reads: read capabilities ordered by priority: the higher index @@ -541,6 +546,7 @@ struct spi_nor_locking_ops { struct spi_nor_flash_parameter { u64 size; u32 page_size; + u16 n_sectors; struct spi_nor_hwcaps hwcaps; struct spi_nor_read_command reads[SNOR_CMD_READ_MAX]; @@ -573,6 +579,7 @@ struct flash_info; * @bouncebuf_size: size of the bounce buffer * @info: spi-nor part JDEC MFR id and other info * @page_size: the page size of the SPI NOR + * @n_sector: number of sectors * @addr_width: number of address bytes * @erase_opcode: the opcode for erasing a sector * @read_opcode: the read opcode @@ -599,6 +606,7 @@ struct spi_nor { size_t bouncebuf_size; const struct flash_info *info; u32 page_size; + u16 n_sectors; u8 addr_width; u8 erase_opcode; u8 read_opcode; -- 2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/