From patchwork Sat Jul 13 07:15:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jungseung Lee X-Patchwork-Id: 1140192 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=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Myn6EEHz"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="E09kqqS+"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zYXq3fGYz9sN4 for ; Thu, 1 Aug 2019 12:05:27 +1000 (AEST) 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: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:In-Reply-To: List-Owner; bh=BnUFaOP4/+jFvNBgP3Hp68KFfYydQs8dYaF8DT8VuiI=; b=Myn6EEHzLw2kUZ dP2scmikgbPXs1Hnrh/l9nfrK2fYiy0faNMsimc4Vaj5PLI30prlAWAcArA4xgPU+ZyfU5xBMRWXT /HWQIoy9blAkCcfZVv7oh7tu2Le/zOmUe16DM8Bjh7i5b7+KzWNakrN34pFOnVBk9YaR1HEfuuE2k gLdRwV1yObjUHRgCzlUtT1Zll/Mm0wUbVqOT7pSVWov8QXbOff8XOmnFUIt2sIyNrYuDycDY63fL4 y7tpKKHrkGzcrClO1PmYPyHcI7njXBKMEHJyEHwCqaw4pdKFPVKkCm8EvkM5R0JEgg6SbGoLgi4I6 twHwXN0xfZAOpYDMzw/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ht0T2-0007ea-Ik; Thu, 01 Aug 2019 02:05:20 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ht0Sy-0007eH-2O for linux-mtd@lists.infradead.org; Thu, 01 Aug 2019 02:05:18 +0000 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20190801020512epoutp01e86bfe872232446444bafb86a8f5a527~2qj-7k9Gb2990229902epoutp01U for ; Thu, 1 Aug 2019 02:05:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20190801020512epoutp01e86bfe872232446444bafb86a8f5a527~2qj-7k9Gb2990229902epoutp01U DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1564625112; bh=AeiPrZYCuXKuPLbLom6cnTr7q66l59Dm2R16nrhTyHY=; h=From:To:Subject:Date:References:From; b=E09kqqS+0v4+iU/HszZfBOP+7c5VauFPa3+uAaznTDvHnnfgdmkLxu0YpQcA8AkSW YrL9ar2W1WejqKk+WkWvf14O4zg21IySFiYRdvekboSwEWozJ6EOmhcraBVD+Tf4Lj cz3K6nSptY6ITbRk9w8FZD17DHHY39fjdBkkwg1Q= Received: from epsnrtp5.localdomain (unknown [182.195.42.166]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20190801020511epcas1p4b726dec94a84bc61ae67a6c5e208ae6f~2qj-SFc021720317203epcas1p4Q; Thu, 1 Aug 2019 02:05:11 +0000 (GMT) Received: from epsmges1p5.samsung.com (unknown [182.195.40.159]) by epsnrtp5.localdomain (Postfix) with ESMTP id 45zYXQ2dShzMqYkk; Thu, 1 Aug 2019 02:05:10 +0000 (GMT) Received: from epcas1p2.samsung.com ( [182.195.41.46]) by epsmges1p5.samsung.com (Symantec Messaging Gateway) with SMTP id F4.76.04085.6D8424D5; Thu, 1 Aug 2019 11:05:10 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p1.samsung.com (KnoxPortal) with ESMTPA id 20190801020509epcas1p155f87090273be705f1a9ae752c0bca5c~2qj9vVwpb0173601736epcas1p1M; Thu, 1 Aug 2019 02:05:09 +0000 (GMT) Received: from epsmgms1p2new.samsung.com (unknown [182.195.42.42]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20190801020509epsmtrp25dfd3e4b33a4d866b7e8378801611dd9~2qj9qIOJS1129611296epsmtrp2G; Thu, 1 Aug 2019 02:05:09 +0000 (GMT) X-AuditID: b6c32a39-d03ff70000000ff5-85-5d4248d6b535 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2new.samsung.com (Symantec Messaging Gateway) with SMTP id AA.3B.03638.5D8424D5; Thu, 1 Aug 2019 11:05:09 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.100.192]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190801020509epsmtip243456eefdccf12da163225f24b92ee92~2qj9hJs2q0926809268epsmtip2W; Thu, 1 Aug 2019 02:05:09 +0000 (GMT) From: Jungseung Lee To: Marek Vasut , Tudor Ambarus , David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , u.kleine-koenig@pengutronix.de, linux-mtd@lists.infradead.org, js07.lee@gmail.com, js07.lee@samsung.com Subject: [PATCH v3 1/4] mtd: spi-nor: rename SR_TB to indicate the using bit Date: Sat, 13 Jul 2019 16:15:38 +0900 Message-Id: <20190713071541.22090-1-js07.lee@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA02SaUhUURTHu75ZnkMTt6flwYKmB0EK6ozj6DOyvXiQmRgRBMP0cK6ONJvz xqi+ZCGVltVgGy1SZLllmVtOi8pkpRTlB1ssDS1Rk7RFisq2mXlGffudc/5/zp97D00xY/JI OsfuJi67YGUVKlnTnajYmKf8CqO2sSiMqy44gbj2rhqK81SWUNzPM+Mh3OueSTl3c88lJXf3 1iuKK/G+Q9zHsmXcS08JWqbivaf6lHx9RTRfV1Wo4OvLdvG9Xy8ivqc0lz/8U8sfaqhC6fRm 62ILEczEpSH2TIc5x56dwq7dYFppMiRqdTG6ZC6J1dgFG0lhV6Wmx6zJsfoDspptgjXP30oX RJGNW7LY5chzE43FIbpTWOI0W506rTNWFGxinj07NtNhW6TTauMNfuUWq2Wo85PM2Ry+ffjJ SVk+KsVFKJQGnACeBw1UEVLRDG5G0OjtVUrFJwQDIy/lUvEFQWtrE/XXMjzoUQSYwbcRjHZG SKIJBMV7KoIDBY6G55N1QXc4HgmBsZbT8sAgDKfC4OWHQZEML4Dv5SXKAKtxMuzu7p3aMA+q a9uCoQCXKSD/2sGpwSroqSye4jAYvd+glDgSJsZvKyQWwVvpUUrmAgSvy8umRHoYH6vxm2ma wlFw9Uac1J4P3smzKMAUngHjnw/KAxLAati/l5EkLLzrL5BJDND1plguMQ/fOqUIDDbCjb5+ dATNPfVvwTmEqtBs4hRt2UTUOQ3/f00dCp5adHIzuvco1Ycwjdjp6o7C5UZGLmwTd9h8CGiK DVdfiFhqZNRmYcdO4nKYXHlWIvqQwf96HipyVqbDf7h2t0lniNfr9VxCYlKiQc9GqM9/5YwM zhbcZCshTuL66wuhQyPz0eoO1YFM+a8HuQ3T92ZZRa5yU//EtPW3Poyse3sso/t36TOT+cW0 x91pR8XPK7Oez9nlIF0fjG19bfPiBgbPqUZ9ns0hP5iMjRUj9RkzSP9pd1L9cM11JvnK8bTG XwuRo/ahr2PWe35oaNDeDhl4ZovrbXx84b4wjVZ1+EsTY8GsTLQIumjKJQp/AJhOo5eAAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsWy7bCSvO5VD6dYg6dPjS1Wt0xntDhyYS2z xcSVk5kt/s55x2Tx6OZvVovdTcvYLY7uucdsMXnnG0aLj0scLG5PnMzowOWxc9Zddo/NK7Q8 Nq3qZPPYvKTe486PpYweN+cVevT/NfDo27KKMYAjissmJTUnsyy1SN8ugSvj2clPLAU7RCqe X53B0sA4T6CLkZNDQsBE4vmTiWxdjFwcQgK7GSX+/V/HDJGQkHi08wtLFyMHkC0scfhwMUhY SOAjo8SlCW4gNpuAlsSN35tYQXpFBD4wSVyedIoFJCEs4CPxZM0ZNhCbRUBV4tfyyewgNq+A pUTjlTtQ8+UlVm84wDyBkXsBI8MqRsnUguLc9NxiwwKjvNRyveLE3OLSvHS95PzcTYzgANPS 2sF44kT8IUYBDkYlHt4TnY6xQqyJZcWVuYcYJTiYlUR4F4vbxwrxpiRWVqUW5ccXleakFh9i lOZgURLnlc8/FikkkJ5YkpqdmlqQWgSTZeLglGpgrD7/0+bsskM1r4XqWLqfTWbh4pq8St3o +uH6Dcsi9ybvnW5Unpqg5XeZZcdChc4DzjM0Qn6qJHunZ+W0H54teVXvz/ttBbon5rQsurYm ev/6/OjtstyzrKXXhVmqSYQ+859o85VX1NuRKXOT39H7v+vfzVmaGL1u0vfj1/S0nRxKP4vI 77wdrcRSnJFoqMVcVJwIAEUcNgAsAgAA X-CMS-MailID: 20190801020509epcas1p155f87090273be705f1a9ae752c0bca5c X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20190801020509epcas1p155f87090273be705f1a9ae752c0bca5c References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_190516_518155_B3E5223B X-CRM114-Status: GOOD ( 21.60 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Each vendor uses a different bits for SR_TB of flash. To avoid misunderstandings, rename SR_TB to indicate the using bit. Signed-off-by: Jungseung Lee --- drivers/mtd/spi-nor/spi-nor.c | 10 +++++----- include/linux/mtd/spi-nor.h | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 73172d7f512b..9ea03f4d943a 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1099,7 +1099,7 @@ static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs, } else { pow = ((sr & mask) ^ mask) >> shift; *len = mtd->size >> pow; - if (nor->flags & SNOR_F_HAS_SR_TB && sr & SR_TB) + if (nor->flags & SNOR_F_HAS_SR_TB && sr & SR_TB_BIT5) *ofs = 0; else *ofs = mtd->size - *len; @@ -1229,13 +1229,13 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) if (!(val & mask)) return -EINVAL; - status_new = (status_old & ~mask & ~SR_TB) | val; + status_new = (status_old & ~mask & ~SR_TB_BIT5) | val; /* Disallow further writes if WP pin is asserted */ status_new |= SR_SRWD; if (!use_top) - status_new |= SR_TB; + status_new |= SR_TB_BIT5; /* Don't bother if they're the same */ if (status_new == status_old) @@ -1311,14 +1311,14 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) return -EINVAL; } - status_new = (status_old & ~mask & ~SR_TB) | val; + status_new = (status_old & ~mask & ~SR_TB_BIT5) | val; /* Don't protect status register if we're fully unlocked */ if (lock_len == 0) status_new &= ~SR_SRWD; if (!use_top) - status_new |= SR_TB; + status_new |= SR_TB_BIT5; /* Don't bother if they're the same */ if (status_new == status_old) diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index b3d360b0ee3d..f8bbc98432ff 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -126,8 +126,12 @@ #define SR_BP0 BIT(2) /* Block protect 0 */ #define SR_BP1 BIT(3) /* Block protect 1 */ #define SR_BP2 BIT(4) /* Block protect 2 */ -#define SR_TB BIT(5) /* Top/Bottom protect */ #define SR_SRWD BIT(7) /* SR write protect */ +/* Used for STM and Micron flashes */ +#define SR_TB_BIT5 BIT(5) /* Top/Bottom protect */ +/* Used for Winbond and GigaDevice flashes */ +#define SR_TB_BIT6 BIT(6) /* Top/Bottom protect */ + /* Spansion/Cypress specific status bits */ #define SR_E_ERR BIT(5) #define SR_P_ERR BIT(6) From patchwork Sat Jul 13 07:15:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jungseung Lee X-Patchwork-Id: 1140194 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=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LlouzInd"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="UQdfP0mz"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zYYC5bkmz9sN4 for ; Thu, 1 Aug 2019 12:05:51 +1000 (AEST) 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=mfSlXR1+b4eDMrOVAmcc56bLqG4brql7mfTfIPstCkA=; b=LlouzIndIMyaJ9 FvYVfQOeijg68xu2lFD7kqWS4O9ZMQN3PFS39GhoKnorn2IS1tyAKMN4J/pXBuEwwBfTr4c8E9q8M jJz+1Qjx9/zV1QCSYEg4CLvRC71+jR/KZNCXc82VF7IA1OK4OUw6nvkhfIa9UFa5DapyL7IfYTmmZ W0u2vfJD2lWQdLz3LIMHduxcjKHwfa4ExVVsVjWQBBg+hqxoQRtd0h+9cry0x7QOQqVUao0hHlQNp Hk6uj865V86XDPgf5s9fuYZcd1PoPLABy2iSWRWV/Iw7WHqiu1PUiBZOFashhGuKImvuzEYiViNOI 231RMknj0paiTQrCXAkQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ht0T8-0007nr-MB; Thu, 01 Aug 2019 02:05:26 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ht0T4-0007em-CZ for linux-mtd@lists.infradead.org; Thu, 01 Aug 2019 02:05:24 +0000 Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20190801020519epoutp04e96e636a7f27d0b2007f0e78183f2917~2qkGlka8N2736527365epoutp04B for ; Thu, 1 Aug 2019 02:05:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20190801020519epoutp04e96e636a7f27d0b2007f0e78183f2917~2qkGlka8N2736527365epoutp04B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1564625119; bh=KT4nZD531kuc1gWghf0sFT/zQM8Rwm7eH31rccBhXJs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UQdfP0mzG6DOhXokJJkpTPtbhA5qV6Ce1qj5Xpt0h163XewOE7K6y4B5tEM/LBrn+ +basOeiTd7epGx8oXVL88baw5wII5WdIAhESXy5p0qlUdWQNa50+WRqdpMgHo9bbef 16FiI0GM3/Pm9QHqIM9i5SDm4YW8W1xGVnf+IoXE= Received: from epsnrtp6.localdomain (unknown [182.195.42.167]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20190801020518epcas1p46228cc1fadb053ae43ffbd50bc8a1d3b~2qkGHC9SZ2643426434epcas1p4X; Thu, 1 Aug 2019 02:05:18 +0000 (GMT) Received: from epsmges1p5.samsung.com (unknown [182.195.40.159]) by epsnrtp6.localdomain (Postfix) with ESMTP id 45zYXY4ZcbzMqYkk; Thu, 1 Aug 2019 02:05:17 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p5.samsung.com (Symantec Messaging Gateway) with SMTP id 90.86.04085.CD8424D5; Thu, 1 Aug 2019 11:05:16 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20190801020516epcas1p383452adf9755f7121812aac0f335a779~2qkDo8Lvz0077600776epcas1p3k; Thu, 1 Aug 2019 02:05:16 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20190801020516epsmtrp155f2af233f19d57a634db628edb5e88f~2qkDoMV3M1883318833epsmtrp1Z; Thu, 1 Aug 2019 02:05:16 +0000 (GMT) X-AuditID: b6c32a39-d03ff70000000ff5-ab-5d4248dc9b7e Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id B6.98.03706.CD8424D5; Thu, 1 Aug 2019 11:05:16 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.100.192]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190801020516epsmtip22dfa5a7a71a747dab0473035e46b2bf4~2qkDaiCl50879808798epsmtip2g; Thu, 1 Aug 2019 02:05:16 +0000 (GMT) From: Jungseung Lee To: Marek Vasut , Tudor Ambarus , David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , u.kleine-koenig@pengutronix.de, linux-mtd@lists.infradead.org, js07.lee@gmail.com, js07.lee@samsung.com Subject: [PATCH v3 2/4] mtd: spi-nor: introduce SR_BP_SHIFT define Date: Sat, 13 Jul 2019 16:15:39 +0900 Message-Id: <20190713071541.22090-2-js07.lee@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190713071541.22090-1-js07.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA01Se0hTcRTut7vH1VpdpuVhJOmV/nCg3jmn18pKC7mRfxgVkWB2cddH7dXu jDSoVSJpPhF6a1ZqafRyEc6mmI80ypLCTHwQGqSm60UlmdDmXdR/3/nOd75zOOfgmOKnRIln G62cxcjqSamv+GFnKBU2wiSkUgO/VPSt/HOI7uq/jdEVDZUYvXDZJaLHh+Yl9KOT9TK62zmG 0ZWOGUR/qd1MD1dUos2+jOPiqIyx31QxTY2FUsZee5wZmatDzFD1IaZsgWJKHzSiZDxFvyGL Y3WcJYgzppt02cbMOHL7zrQtadpoSh2mjqVjyCAja+DiyK1JyWGJ2Xr3gGTQYVaf46aSWZ4n IzZusJhyrFxQlom3xpGcWac3qylzOM8a+BxjZni6ybBOTVGRWrdyvz6rYKFaZJ4MOPKp9Cyy oWlFEcJxIKKg5eXRIuSLK4hmBCVVfVIh+Iqg3P4UCcEPBO1TH2V/K2x3AgS+FcFk4Smv6BsC x1SrO/DBpYQK3s43STwJf2JSBLNtlySehB+RAK3vazAPFhNr4U1Pi9iD5UQsNIz1ijwYiDVw 6177osaHWAd9512YxwgIpxQedz2TCGNsBedJJOj9YLrngUzASpgqK/BiHhwNFTKhNh/B+I1a b0IDrtnbmMcHI0LhbkuEQAeDY75q0RMjloPre7G3lRxOFygECQkz7/LFAgbonyjxShjo+p0o 7KEEwUTBZ1SOAi/+a1CDUCNaxZl5QybHq83a/4/UhBafThXbjJ68SOpABI7IZfLewvhUhYQ9 zOcaOhDgGOkvvx6wKVUh17G5eZzFlGbJ0XN8B9K6F1mBKVemm9wvbLSmqbWRGo2GjoqOidZq yAD51Tk6VUFkslbuIMeZOcvfOhHuo7ShFGo9HG07MKMsIvyn9w4v+VXMl4g0K8oHyIzVttpC csjlDOvu33PsWvCo+ID2xGDIfdMrJVrYd+ny6zotU73eln6BqtcsPztLfbjQMrhLVayLbS61 O1PiQzoDdXVXQp6dyRuZM42N9trvH1/6fHiHPFqdZG+bCNkesW133eBABinms1i1CrPw7B84 fjgIigMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWy7bCSvO4dD6dYgwfXuC1Wt0xntDhyYS2z xcSVk5kt/s55x2Tx6OZvVovdTcvYLY7uucdsMXnnG0aLj0scLG5PnMzowOWxc9Zddo/NK7Q8 Nq3qZPPYvKTe486PpYweN+cVevT/NfDo27KKMYAjissmJTUnsyy1SN8ugSuj7e88poIX4hXv +6YxNjC+Eupi5OCQEDCRaFgn3sXIxSEksJtRYsG2zyxdjJxAcQmJRzu/sEDUCEscPlwMEhYS +Mgo8bpDDMRmE9CSuPF7EytIr4jAByaJy5NOgfUKCzhJ7H2ygBnEZhFQlbh2fBdYnFfAUmLl vRNMEPPlJVZvOABWwylgJXF2xjtmiAWWEvf6ulgnMPIuYGRYxSiZWlCcm55bbFhgmJdarlec mFtcmpeul5yfu4kRHI5amjsYLy+JP8QowMGoxMOr0OMYK8SaWFZcmXuIUYKDWUmEd7G4fawQ b0piZVVqUX58UWlOavEhRmkOFiVx3qd5xyKFBNITS1KzU1MLUotgskwcnFINjFJXr7U+Te1m Lpxrwi74zmjS1d1OOgfkDCu5v+d5SPqUzIgKmXRy8u7eE7KXHVYlP2f6LhQQGW+2bKrapBDv FeybXkTXTt75M3zL0xa37VOL6mqfbPkWtkf796mX959ZBPLmLq3Xu7g2V9l3hkRE3pMJ318p vT5hplugfccp9ljpkte5v457MSqxFGckGmoxFxUnAgBU+wvVQwIAAA== X-CMS-MailID: 20190801020516epcas1p383452adf9755f7121812aac0f335a779 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20190801020516epcas1p383452adf9755f7121812aac0f335a779 References: <20190713071541.22090-1-js07.lee@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_190522_781013_70AB45FD X-CRM114-Status: GOOD ( 19.34 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The shift variable of SR_BP is conclusive because the first bit of SR_BP is fixed on known flash. Introduce SR_BP_SHIFT define, and let them used by stm_* functions to replace ffs operation to get shift value. Signed-off-by: Jungseung Lee --- drivers/mtd/spi-nor/spi-nor.c | 11 +++++------ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 9ea03f4d943a..dd12d3c83029 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1089,7 +1089,6 @@ 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; - int shift = ffs(mask) - 1; int pow; if (!(sr & mask)) { @@ -1097,7 +1096,7 @@ static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs, *ofs = 0; *len = 0; } else { - pow = ((sr & mask) ^ mask) >> shift; + pow = ((sr & mask) ^ mask) >> SR_BP_SHIFT; *len = mtd->size >> pow; if (nor->flags & SNOR_F_HAS_SR_TB && sr & SR_TB_BIT5) *ofs = 0; @@ -1178,7 +1177,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) struct mtd_info *mtd = &nor->mtd; int status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; - u8 shift = ffs(mask) - 1, pow, val; + u8 pow, val; loff_t lock_len; bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB; bool use_top; @@ -1222,7 +1221,7 @@ 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 << shift); + val = mask - (pow << SR_BP_SHIFT); if (val & ~mask) return -EINVAL; /* Don't "lock" with no region! */ @@ -1258,7 +1257,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) struct mtd_info *mtd = &nor->mtd; int status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; - u8 shift = ffs(mask) - 1, pow, val; + u8 pow, val; loff_t lock_len; bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB; bool use_top; @@ -1305,7 +1304,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) if (lock_len == 0) { val = 0; /* fully unlocked */ } else { - val = mask - (pow << shift); + val = mask - (pow << SR_BP_SHIFT); /* Some power-of-two sizes are not supported */ if (val & ~mask) return -EINVAL; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index f8bbc98432ff..b8f4439c30b1 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -132,6 +132,8 @@ /* Used for Winbond and GigaDevice flashes */ #define SR_TB_BIT6 BIT(6) /* Top/Bottom protect */ +#define SR_BP_SHIFT 2 + /* Spansion/Cypress specific status bits */ #define SR_E_ERR BIT(5) #define SR_P_ERR BIT(6) From patchwork Sat Jul 13 07:15:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jungseung Lee X-Patchwork-Id: 1140195 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=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ObO7Ivag"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="dGtTMZxS"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zYYG1vvnz9sN4 for ; Thu, 1 Aug 2019 12:05:54 +1000 (AEST) 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=Hp25seINjOFQyJ7bHsfDGYY5cLR/BT7VUlR7HS5Cscw=; b=ObO7IvagEy2Lvr hQ1040r+LPLlKwyi0o3rtdTUJK14ADDbOLtVQwmk0sJCf7ONk/pvuomV4ifoL/rZ8fhBdP3IuL8zz /Qxf4jOSpXsYj72DmLHZTuPmKfhl3cp5ijmWgPDotMK3BFuqxTXMCcXmHD5eQWD/1sRRx6FdLKt3K s0GQt+OLT47AL9WbAF1PPR8TjoyP7IMbFT5t8acYt5M5R9F5ujz66Q8OMmGI6LicFPoXiL275raZj 3ueHkXLPRA8jzZWXjdt8P7r5m0vbjpsNh7x1CPcGbbQ0PleIOJ7TDSbbzxBLORLyAhErdIG9A33/W cF27KiEVVh09iIt0haRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ht0TI-00081s-F7; Thu, 01 Aug 2019 02:05:36 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ht0T6-0007ia-5a for linux-mtd@lists.infradead.org; Thu, 01 Aug 2019 02:05:26 +0000 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20190801020522epoutp043177c0483f31a5a175e74beab7905c5b~2qkJFpc-_2682626826epoutp04n for ; Thu, 1 Aug 2019 02:05:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20190801020522epoutp043177c0483f31a5a175e74beab7905c5b~2qkJFpc-_2682626826epoutp04n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1564625122; bh=Tjb0Xd7PQguo2goskCorEn8GNqy8fZ17RgsxnNeoAkk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dGtTMZxSaakV3YFtJe/tFMOaCjf+zRuHQ+Loekk0PcoViGNPpOnZJ4YLvWrBvIntX Tw4DkdliIHjWp5/2gMGpGEwhoqxCRYTZFmJTj+N4+sQnrk6lvsfutjyzGMM6Puj6+z xwehTmH28I46KFbyaEKfFpLWuViJE9TXhk8KZVUA= Received: from epsnrtp4.localdomain (unknown [182.195.42.165]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20190801020521epcas1p2c67a128951d0f8e7b50647ba14a3f08e~2qkIgLVuS1618016180epcas1p22; Thu, 1 Aug 2019 02:05:21 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.162]) by epsnrtp4.localdomain (Postfix) with ESMTP id 45zYXc4BlJzMqYkV; Thu, 1 Aug 2019 02:05:20 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id B0.F8.04066.0E8424D5; Thu, 1 Aug 2019 11:05:20 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20190801020520epcas1p3a9d8fc8175a5cc74be9077c2c6ee678c~2qkHWnbR80077600776epcas1p32; Thu, 1 Aug 2019 02:05:20 +0000 (GMT) Received: from epsmgms1p2new.samsung.com (unknown [182.195.42.42]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20190801020520epsmtrp1dc0a909d83aaa1d874cb4a14e3e2c799~2qkHVo_jT1828718287epsmtrp1X; Thu, 1 Aug 2019 02:05:20 +0000 (GMT) X-AuditID: b6c32a37-e3fff70000000fe2-11-5d4248e0ba94 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2new.samsung.com (Symantec Messaging Gateway) with SMTP id CD.3B.03638.0E8424D5; Thu, 1 Aug 2019 11:05:20 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.100.192]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190801020520epsmtip28e649b385464072fc74b06d33e6bf351~2qkHI_K9o0926809268epsmtip2Y; Thu, 1 Aug 2019 02:05:20 +0000 (GMT) From: Jungseung Lee To: Marek Vasut , Tudor Ambarus , David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , u.kleine-koenig@pengutronix.de, linux-mtd@lists.infradead.org, js07.lee@gmail.com, js07.lee@samsung.com Subject: [PATCH v3 3/4] mtd: spi-nor: add 4bit block protection support Date: Sat, 13 Jul 2019 16:15:40 +0900 Message-Id: <20190713071541.22090-3-js07.lee@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190713071541.22090-1-js07.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA01Se0hTYRTn293jKq0u0/RDiOYlKwfLzW16HZnrQd5ISiqCIrGLu2zSXu5u lkEPQkSttcaszLQH2sO3aaWW5TRDqTSrP0qyECVTWyPtNZCobdeo/873e5zz43wHRUQ/eTFo rslGW02UAeeHc+8+ipdKx8gNWTLHXCxRX3geEH3DjQjhqnUjxK9KH4cYH5nnEfdPXBcQj7ve I4S70wuI2RoN8dblBppwsrPinYBsuykhW+tK+GRbzTFy1H8NkCOX8kjnLxl5+nYdyET3Gtbq aUpLW8W0KceszTXpUvGtO7M3ZquSZHKpPIVIxsUmykin4psyMqWbcw2BgLg4nzLYA1AmxTB4 wrq1VrPdRov1ZsaWitMWrcEil1nWMJSRsZt0a3LMRrVcJktUBZT7Dfqm/gaBpV996FzZluNg SFoKwlCIKaGz6QG/FISjIqwDQLdjFgkSImwOwMnZXSzxA0BvcUVAhYYcP55oWPwBgJ7pW4B9 fAXwdXEVJ+jmYxL4Zr6VFyQisSkO/PzwIi9IRGDp8IOnBwRrLhYHT75yh8YJsRR4YcTFYzMt h/UtnhAehqnhYLkPCTaCWAcfTninFmJsgmWjElYfAWf6bwvYOgZOO4sWagZ21roErLcQwPEb NQuEAvo+NyLBPggWD5vvJbBwLOycrwplQ7DF0Pf9FI8dJYTFRSJWgkPvWCGXrSEcnnAsRCZh 6dRDDrsIB4A/28fBGbCs4t+EKwDUgSjawhh1NCO3KP7/pFYQOjpJcgdoGcroBRgK8EXCgZL1 WSIelc8UGHsBRBE8UlgdnZYlEmqpgsO01ZxttRtopheoApt0ITFLc8yBEzbZsuWqRIVCQSiT kpNUCjxaeNVPZIkwHWWjD9C0hbb+9XHQsJjj4HRiXvzbiKgzaEa6Lm1vZsFZTEUfeDnYeGzP THuSkdkof3HHPDW3xN9l2FfePbatqnWHrdKndEVt9/SN7bYfshx0Xky51aN/CqL9iuFq66um b1u+pFV2uQeGtIOTDtdHRvlpRdVRTdzzlq0NJSufHll92f8sp7t5Bufjv9Wr5nU4l9FTcgli Zag/MRri0IoDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWy7bCSvO4DD6dYgy1fuC1Wt0xntDhyYS2z xcSVk5kt/s55x2Tx6OZvVovdTcvYLY7uucdsMXnnG0aLj0scLG5PnMzowOWxc9Zddo/NK7Q8 Nq3qZPPYvKTe486PpYweN+cVevT/NfDo27KKMYAjissmJTUnsyy1SN8ugStj3fE17AXHrSqm TfFsYDyn28XIwSEhYCLx7ZRDFyMXh5DAbkaJheffMnUxcgLFJSQe7fzCAlEjLHH4cDFEzUdG iccv74PVsAloSdz4vYkVJCEi8IFJ4vKkUywgCWEBd4mnBw4ygtgsAqoS3ZcnM4PYvAKWEjNv TmSFWCAvsXrDAbA4p4CVxNkZ78BsIaCae31drBMYeRcwMqxilEwtKM5Nzy02LDDKSy3XK07M LS7NS9dLzs/dxAgORy2tHYwnTsQfYhTgYFTi4T3R6RgrxJpYVlyZe4hRgoNZSYR3sbh9rBBv SmJlVWpRfnxRaU5q8SFGaQ4WJXFe+fxjkUIC6YklqdmpqQWpRTBZJg5OqQbG1ncr/Kyq6sIb bnGVV/1P53fak6rz90PSfKY983dnnmhtsss4qKYg+kqlqHT390/7Fi3evdTmUPzft2/Pan3a XakrxXDAm/0Kw2IW7ckbXbftOfLy43dG+R8tZ3fOF5/NenXyyYkbzAosU5wMi+Ys6r/tKBOn Xujkeyds0ofISJGHT+eUemy0VWIpzkg01GIuKk4EADC/319DAgAA X-CMS-MailID: 20190801020520epcas1p3a9d8fc8175a5cc74be9077c2c6ee678c X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20190801020520epcas1p3a9d8fc8175a5cc74be9077c2c6ee678c References: <20190713071541.22090-1-js07.lee@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_190524_590246_84EA019D X-CRM114-Status: GOOD ( 27.10 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.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). Because this feature is not universal to all flash that support lock/unlock, control it via a new flag. Signed-off-by: Jungseung Lee --- drivers/mtd/spi-nor/spi-nor.c | 87 +++++++++++++++++++++++++++-------- include/linux/mtd/spi-nor.h | 5 ++ 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index dd12d3c83029..0d0b92de62db 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -96,6 +96,7 @@ enum spi_nor_pp_command_index { 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]; @@ -250,7 +251,7 @@ struct flash_info { u16 page_size; u16 addr_width; - u16 flags; + u32 flags; #define SECT_4K BIT(0) /* SPINOR_OP_BE_4K works uniformly */ #define SPI_NOR_NO_ERASE BIT(1) /* No erase command needed */ #define SST_WRITE BIT(2) /* use SST byte programming */ @@ -279,6 +280,7 @@ struct flash_info { #define SPI_NOR_SKIP_SFDP BIT(13) /* Skip parsing of SFDP tables */ #define USE_CLSR BIT(14) /* use CLSR command */ #define SPI_NOR_OCTAL_READ BIT(15) /* Flash supports Octal Read */ +#define SPI_NOR_HAS_BP3 BIT(16) /* use 4 bits filed for block protect */ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups; @@ -1088,21 +1090,43 @@ static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs, uint64_t *len) { struct mtd_info *mtd = &nor->mtd; - u8 mask = SR_BP2 | SR_BP1 | SR_BP0; - int pow; + u8 sr_masked, mask, tmp; + int pow = 0; - if (!(sr & mask)) { + if (nor->flags & SNOR_F_HAS_SR_BP3) + mask = SR_BP3_BIT6 | SR_BP2 | SR_BP1 | SR_BP0; + else + mask = SR_BP2 | SR_BP1 | SR_BP0; + + sr_masked = sr & mask; + + if (!sr_masked) { /* No protection */ *ofs = 0; *len = 0; - } else { - pow = ((sr & mask) ^ mask) >> SR_BP_SHIFT; - *len = mtd->size >> pow; - if (nor->flags & SNOR_F_HAS_SR_TB && sr & SR_TB_BIT5) - *ofs = 0; + return; + } + + if (nor->flags & SNOR_F_HAS_SR_BP3) { + if (sr_masked & SR_BP3_BIT6) + tmp = (sr_masked & ~SR_BP3_BIT6) | BIT(5); else - *ofs = mtd->size - *len; + tmp = sr_masked; + + tmp >>= SR_BP_SHIFT; + + if (ilog2(nor->n_sectors) >= tmp) + pow = ilog2(nor->n_sectors) - tmp + 1; + } else { + pow = (sr_masked ^ mask) >> SR_BP_SHIFT; } + + *len = mtd->size >> pow; + + if (nor->flags & SNOR_F_HAS_SR_TB && sr & SR_TB_BIT5) + *ofs = 0; + else + *ofs = mtd->size - *len; } /* @@ -1176,12 +1200,16 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) { struct mtd_info *mtd = &nor->mtd; int status_old, status_new; - u8 mask = SR_BP2 | SR_BP1 | SR_BP0; - u8 pow, val; + u8 mask, pow, val; loff_t lock_len; bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB; bool use_top; + if (nor->flags & SNOR_F_HAS_SR_BP3) + mask = SR_BP3_BIT6 | SR_BP2 | SR_BP1 | SR_BP0; + else + mask = SR_BP2 | SR_BP1 | SR_BP0; + status_old = read_sr(nor); if (status_old < 0) return status_old; @@ -1221,7 +1249,16 @@ 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) - pow + 1; + val = val << SR_BP_SHIFT; + if (val & BIT(5)) + val = (val & ~BIT(5)) | SR_BP3_BIT6; + } else { + val = mask - (pow << SR_BP_SHIFT); + } + if (val & ~mask) return -EINVAL; /* Don't "lock" with no region! */ @@ -1256,12 +1293,16 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) { struct mtd_info *mtd = &nor->mtd; int status_old, status_new; - u8 mask = SR_BP2 | SR_BP1 | SR_BP0; - u8 pow, val; + u8 mask, pow, val; loff_t lock_len; bool can_be_top = true, can_be_bottom = nor->flags & SNOR_F_HAS_SR_TB; bool use_top; + if (nor->flags & SNOR_F_HAS_SR_BP3) + mask = SR_BP3_BIT6 | SR_BP2 | SR_BP1 | SR_BP0; + else + mask = SR_BP2 | SR_BP1 | SR_BP0; + status_old = read_sr(nor); if (status_old < 0) return status_old; @@ -1303,13 +1344,19 @@ 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) - pow + 1; + val = val << SR_BP_SHIFT; + if (val & BIT(5)) + val = (val & ~BIT(5)) | SR_BP3_BIT6; } 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 & ~SR_TB_BIT5) | val; /* Don't protect status register if we're fully unlocked */ @@ -3580,6 +3627,7 @@ static int spi_nor_init_params(struct spi_nor *nor, memset(params, 0, sizeof(*params)); /* Set SPI NOR sizes. */ + params->n_sectors = info->n_sectors; params->size = (u64)info->sector_size * info->n_sectors; params->page_size = info->page_size; @@ -4091,12 +4139,15 @@ 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_NO_ERASE) mtd->flags |= MTD_NO_ERASE; mtd->dev.parent = dev; nor->page_size = params.page_size; + nor->n_sectors = params.n_sectors; mtd->writebufsize = nor->page_size; if (np) { diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index b8f4439c30b1..751b6ea0776a 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -129,7 +129,9 @@ #define SR_SRWD BIT(7) /* SR write protect */ /* Used for STM and Micron flashes */ #define SR_TB_BIT5 BIT(5) /* Top/Bottom protect */ +#define SR_BP3_BIT6 BIT(6) /* Block protect 3 */ /* Used for Winbond and GigaDevice flashes */ +#define SR_BP3_BIT5 BIT(5) /* Block protect 3 */ #define SR_TB_BIT6 BIT(6) /* Top/Bottom protect */ #define SR_BP_SHIFT 2 @@ -249,6 +251,7 @@ enum spi_nor_option_flags { SNOR_F_BROKEN_RESET = BIT(6), SNOR_F_4B_OPCODES = BIT(7), SNOR_F_HAS_4BAIT = BIT(8), + SNOR_F_HAS_SR_BP3 = BIT(9), }; /** @@ -352,6 +355,7 @@ struct flash_info; * @dev: point to a spi device, or a spi nor controller device. * @info: spi-nor part JDEC MFR id and other info * @page_size: the page size of the SPI NOR + * @n_sectors: number of sector * @addr_width: number of address bytes * @erase_opcode: the opcode for erasing a sector * @read_opcode: the read opcode @@ -388,6 +392,7 @@ struct spi_nor { struct device *dev; const struct flash_info *info; u32 page_size; + u16 n_sectors; u8 addr_width; u8 erase_opcode; u8 read_opcode; From patchwork Sat Jul 13 07:15:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jungseung Lee X-Patchwork-Id: 1140193 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=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="E7MoLOwi"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="ibX65Sww"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zYY95Nh8z9sN4 for ; Thu, 1 Aug 2019 12:05:49 +1000 (AEST) 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=2RCrepUHOSbHJzkg7tp4K8Oli5ALXlvzoVnfmjM8a6E=; b=E7MoLOwi2/RNLE gqOoSdYLggqaeLZMY3ctvUWQgWMkVE7QyjUq6iEWhDx4ck8EFbJigDuzHeSGVufMO0iG4pZSayAjt wMVISyl/GINBBA0JhtFCx3/YrHz7NAuQ62g2hCX1zqJJ90Dbg4qoDBSGSLPto2S/XhSJRxzvJWrlV aNc7ckD3pY5Py7Yj6KqFw8wdaheJ03fLVENrB+B+RCPsxdvbra2zq7/Bk9HD+k/J4zyPyuuEA2ZJV JxwlTr+VhE8boD9P5schqBes6OlF7QoYDi+SFCwhStncN0iFHloVH6CPE9fI3lFqVSsaL2UucAvDx IBXGhSED9knsrtU72s4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ht0TT-0008Hk-PA; Thu, 01 Aug 2019 02:05:47 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ht0TA-0007ow-7G for linux-mtd@lists.infradead.org; Thu, 01 Aug 2019 02:05:29 +0000 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20190801020525epoutp047ee9dc9be1990fc7c251a50b3e0b75fd~2qkMfaBWL2736427364epoutp04J for ; Thu, 1 Aug 2019 02:05:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20190801020525epoutp047ee9dc9be1990fc7c251a50b3e0b75fd~2qkMfaBWL2736427364epoutp04J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1564625125; bh=oOGHoQ6EwfEwzS7x/MXD4YP6uUjvLs4l1JLc6WnGnLI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ibX65Sww9RcheOMVJOV6ZEgwbgbuUZ/AfvW9BiA9WDpq6rk5W1TSy6hzVh042B4SW ko1H++3vkO5rinpHuK6NWDARQKoimJkdjw9GWuhJ3FbGoLCG4dn0dfI7eCiUq7PWQi YI5P8BJQv3s7UHsRSpq8HMApP2nDauwp9u7BrcAo= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20190801020525epcas1p33419fdd3daca5f93dc0205566fe2590d~2qkMB9OJg0645306453epcas1p3d; Thu, 1 Aug 2019 02:05:25 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.165]) by epsnrtp2.localdomain (Postfix) with ESMTP id 45zYXg63X3zMqYkf; Thu, 1 Aug 2019 02:05:23 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id 03.F8.04066.3E8424D5; Thu, 1 Aug 2019 11:05:23 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p2.samsung.com (KnoxPortal) with ESMTPA id 20190801020523epcas1p27580bead294a67fccea6fe8615e73da9~2qkKWmwlW1553515535epcas1p2r; Thu, 1 Aug 2019 02:05:23 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20190801020523epsmtrp273527ee7775acf4307a82ffb3591e700~2qkKVwpmM1129811298epsmtrp2I; Thu, 1 Aug 2019 02:05:23 +0000 (GMT) X-AuditID: b6c32a37-e27ff70000000fe2-20-5d4248e3db44 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 29.98.03706.3E8424D5; Thu, 1 Aug 2019 11:05:23 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.100.192]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190801020523epsmtip2e3d5c29db543dd912b4dffd97e40481f~2qkKJnPan0654406544epsmtip2N; Thu, 1 Aug 2019 02:05:23 +0000 (GMT) From: Jungseung Lee To: Marek Vasut , Tudor Ambarus , David Woodhouse , Brian Norris , Boris Brezillon , Richard Weinberger , u.kleine-koenig@pengutronix.de, linux-mtd@lists.infradead.org, js07.lee@gmail.com, js07.lee@samsung.com Subject: [PATCH v3 4/4] mtd: spi-nor: support lock/unlock for a few Micron chips Date: Sat, 13 Jul 2019 16:15:41 +0900 Message-Id: <20190713071541.22090-4-js07.lee@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190713071541.22090-1-js07.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA02SbUhTYRTHe3b3ctVmt2V5GFR2oSjB3Jybd6K1ctQl+yBFEcFYN72otN2t ezfLSlKTlaXZMDPUosheVCyxELWMMsWgrAyCJHvB6L2NVAxpGW3eSX37n/P8/uccznNwTBWQ qfF8zsXyHGMj5ZHSjgerEhPe0+stmrqaJKqlrBZRfc9aMcrbVI1R0w1+CTU6HJBRt0uvKKj+ O28wqrrrO6LGGk3UK281MkXSXXWvFfTNa/F0e3O5nL7ZeJgembqM6OHze+mqaQ198lYzysJ3 2tLyWCaH5eNYLtuRk8/lppOZW60ZVr1Bo03QGqkUMo5j7Gw6ad6clbAh3xYckIwrYGzuYCqL EQQycU0a73C72Lg8h+BKJ1lnjs2p1ThXC4xdcHO5q7Md9lStRpOkD5K7bHlPa09jztbo/deO lsqK0UjUcRSBA5EMbePt0uMoElcRnQhe+uoVYjCO4HnJJ5kY/ERQU3kZzVruN06ELT0Iyn2D EjGYQNDnn1CEKDkRDy8D7TP2GOKzBHx362WhhwXEFhg58QsLaSmxHMreNklCWkkYoaXqcbjF UmhpuzfDRBCpMHjWj4UKAdEpB+/oFYUImeFI4EzYsAC+DtwK59Uw4e+Ri1qAriavQjSXIRi9 2hiGdOD3tQar4jhGrIIb3Yliehl0Bc7N1MSIaPBPVshCCBBKOOZRiQgJ39+VSUUN8Ox9pUzU NPR5JsP7qgyu5c6k4hRaXPevwwWEmtEi1inYc1lB69T9/1HtaObw4lM6UduTzb2IwBE5V/mw fJ1FJWMKhEJ7LwIcI2OUl2LXWlTKHKbwAMs7rLzbxgq9SB9cpRdTL8x2BM+Yc1m1+iSdTkcl G1IMeh0Zq7w4RVlURC7jYvewrJPlZ30SPEJdjDaa6io8iabMP+b9mzoUFaUWcwP3bszQPbCF NK70FBwbcy2GderYrYYVh1Klg1nbY5aoSvZlFv3ufcH1SKO/fOM9H4Zu8GdTdzzcnTQPDfvw bRlD94ihR9Yid7LJeL/4xZyjH6VRQ59/9Ju3z09ZYpnK3of/WB65KPn6Qag3vjKTUiGP0cZj vMD8BTRqGv+OAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrILMWRmVeSWpSXmKPExsWy7bCSvO5jD6dYg+/zJC1Wt0xntDhyYS2z xcSVk5kt/s55x2Tx6OZvVovdTcvYLY7uucdsMXnnG0aLj0scLG5PnMzowOWxc9Zddo/NK7Q8 Nq3qZPPYvKTe486PpYweN+cVevT/NfDo27KKMYAjissmJTUnsyy1SN8ugSvj/PQpzAVr+SpW tDexNjDe4e5i5OSQEDCROLjkM0sXIxeHkMBuRoktHUfZIRISEo92fgFKcADZwhKHDxdD1Hxk lOjobmEDqWET0JK48XsTK0hCROADk8TlSafAGoQFAiQ+NkeB1LAIqEq03F/JBGLzClhKrO4/ wwgxX15i9YYDzCA2p4CVxNkZ78BsIaCae31drBMYeRcwMqxilEwtKM5Nzy02LDDMSy3XK07M LS7NS9dLzs/dxAgOSC3NHYyXl8QfYhTgYFTi4VXocYwVYk0sK67MPcQowcGsJMK7WNw+Vog3 JbGyKrUoP76oNCe1+BCjNAeLkjjv07xjkUIC6YklqdmpqQWpRTBZJg5OqQbGljxDjtSlIfka j2sXNYXPucooyyH4qfjsMc+Dx+Qd1Iqyt/J1Xs+Vl5gYr5I/denT06J/br49X3ygc2bn2vaF h88J9/RUJX8IjV74Z97RtOuf2G8aMYqsOvxm4/sop8l6r7fk9z5duf2QcMK9jMTHnqdu3pB6 sOlhjfget7/bDBgXRCccv5xwTomlOCPRUIu5qDgRABOtSspEAgAA X-CMS-MailID: 20190801020523epcas1p27580bead294a67fccea6fe8615e73da9 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20190801020523epcas1p27580bead294a67fccea6fe8615e73da9 References: <20190713071541.22090-1-js07.lee@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_190528_453097_EA00D6EB X-CRM114-Status: GOOD ( 18.05 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Some Micron models are known to have lock/unlock support, and that also support 4bit block protection bit (bp0-3). This patch support lock/unlock feature on the flash. Tested on w25q512ax3. The Other is modified following the datasheet. Signed-off-by: Jungseung Lee --- drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 0d0b92de62db..8422f30c73f2 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1922,8 +1922,16 @@ static const struct flash_info spi_nor_ids[] = { { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) }, { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "n25q256ax1", INFO(0x20bb19, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_QUAD_READ) }, - { "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) }, - { "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) }, + { + "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024, + SECT_4K | USE_FSR | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_HAS_BP3) + }, + { + "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024, + SECT_4K | USE_FSR | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_HAS_BP3) + }, { "n25q00", INFO(0x20ba21, 0, 64 * 1024, 2048, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ | NO_CHIP_ERASE) }, { "n25q00a", INFO(0x20bb21, 0, 64 * 1024, 2048, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ | NO_CHIP_ERASE) }, { "mt25qu02g", INFO(0x20bb22, 0, 64 * 1024, 4096, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ | NO_CHIP_ERASE) },