kernel: fix variable erasesize patch

Update this pending patch to remove the untested (variable eraseregions)
section, alongside simplifying the patch.

Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
[refresh and split out unrelated refreshes]
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

2 files changed, 128 insertions, 416 deletions

diff --git a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
index f7ebedb44e..c634ae9aeb 100644
--- a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
+++ b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
@@ -1,159 +1,10 @@
-From patchwork Tue Jun  8 04:07:19 2021
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: John Thomson <git@johnthomson.fastmail.com.au>
-X-Patchwork-Id: 1489105
-X-Patchwork-Delegate: tudor.ambarus@gmail.com
-Return-Path: 
- <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=none (no SPF record) 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=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
-	dkim=pass (2048-bit key;
- secure) header.d=lists.infradead.org header.i=@lists.infradead.org
- header.a=rsa-sha256 header.s=bombadil.20210309 header.b=EMabhVoR;
-	dkim=fail reason="signature verification failed" (2048-bit key;
- unprotected) header.d=fastmail.com.au header.i=@fastmail.com.au
- header.a=rsa-sha256 header.s=fm3 header.b=dLzuZ6dB;
-	dkim=fail reason="signature verification failed" (2048-bit key;
- unprotected) header.d=messagingengine.com header.i=@messagingengine.com
- header.a=rsa-sha256 header.s=fm3 header.b=nSRGsW+C;
-	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 4FzcFN1j1nz9sW8
-	for <incoming@patchwork.ozlabs.org>; Tue,  8 Jun 2021 14:09:28 +1000 (AEST)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
-	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
-	List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc
-	: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=6mUWQd71FwsINycGYY1qOhKz+ecWJVNtwDkTebG3XkA=; b=EMabhVoRE3ad89
-	o3L2AgyKrs+blSofUC3hoSsQe7gi3m4si8S9HW8Z+8SsS5TufUsvGwDl80qSYGlQOytQF+1yRUWvE
-	6FJ/+bqv+TwjqZFibgJ6+9OVsQN9dZ/no1R0bBXIpmrf8ORUmv58QK4ZQquaFKbyXKpFeWOC2MSv4
-	H2MAhyhTU8a3gtooH6G8+KvsJEfVgh6C+aDbwxyh2UY3chHKuw1kvL6AktbfUE2xl4zxi3x3kc70B
-	Wi3LiJBFokxVdgnROXxTU5tI0XboWYkQV64gLuQNV4XKClcuhVpzloDK8Iok6NTd7b32a7TdEFlCS
-	lGKsEKmxtUlW2FpfoduA==;
-Received: from localhost ([::1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
-	id 1lqT1r-006OAW-DX; Tue, 08 Jun 2021 04:07:51 +0000
-Received: from new1-smtp.messagingengine.com ([66.111.4.221])
- by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
- id 1lqT1l-006O9b-Fq
- for linux-mtd@lists.infradead.org; Tue, 08 Jun 2021 04:07:50 +0000
-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
- by mailnew.nyi.internal (Postfix) with ESMTP id 4456B580622;
- Tue,  8 Jun 2021 00:07:42 -0400 (EDT)
-Received: from mailfrontend2 ([10.202.2.163])
- by compute2.internal (MEProxy); Tue, 08 Jun 2021 00:07:42 -0400
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com.au;
- h=from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding; s=fm3; bh=ZXRH+YluM1mHCS1EWUiCY/Sg8O
- LccfHe1oW5iAay6y8=; b=dLzuZ6dBYf7ZA8tWLOBFZYLi7ERsGe/4vnMXG+ovvb
- dNBO0+SaFGwoqYSFrfq/TeyHfKyvxrA7+LCdopIuT4abpLHxtRwtRiafQcDYCPat
- qJIqOZO+wCZC5S9Jc1OP7+t1FviGpgevqIMotci37P+RWc5u3AweMzFljZk90E8C
- uorV6rXagD+OssJQzllRnAIK88+rOAC9ZyXv2gWxy4d1HSCwSWgzx2vnV9CNp918
- YC/3tiHas9krbrPIaAsdBROr7Bvoe/ShRRzruKRuvZVgg5NN90vX+/5ZjI8u04GM
- p2bWCbC62CP6wlcgDaz+c/Sgr5ITd2GPENJsHfqmLRBA==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
- messagingengine.com; h=cc:content-transfer-encoding:date:from
- :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy
- :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZXRH+YluM1mHCS1EW
- UiCY/Sg8OLccfHe1oW5iAay6y8=; b=nSRGsW+CQ2Zx1RVpIUu8W/VD/k5P+32BW
- 5k2ltd+UhI3dfldBPzHrYiOP/IJqGkNW+V+rHASacW/vFygnaZoxNjRYKnOsu+26
- wb2yK3jpl6lsNTg3N1Z4XJrYY2lf9H29DMFbhC67l0PTc050rcZk4XsKTLAlv14Q
- VA4WREYSaX/4IN4O+ES4TMq0a/3gKZh6nvbbJXbsXfK0WlSHTGZtZmW3fyrqvbXa
- t+R7L8vvqWvwls0pV+Sn8LeQqb7+A69w0UOnuznjkcA3sCc2YehcHbxcUEnMH+9N
- bxOjmIDeg9/4X/829tUWUJiLhE5SFmQZ1P6oFtmbWoLrDz0ZJIVBw==
-X-ME-Sender: <xms:C-2-YD2uka4HsA6gcdsV2Ia7vebY4Yjp9E8q7KBMb54jnAzGL7-67Q>
- <xme:C-2-YCEaxASy5VlcrvNO_jLFpMDGkFCRsuVNuZGEQsiRZygk8jPHWq7unPjeT6uYS
- 2pUP6PrTQ2rggjEIg>
-X-ME-Received: 
- <xmr:C-2-YD4exeK49N_YZWWf2BWDhVyCbCY3wwvjTyDOFxeugx7Jg08pzMUToo9oJjrBpcVTaA3kbfk>
-X-ME-Proxy-Cause: 
- gggruggvucftvghtrhhoucdtuddrgeduledrfedtkedgjeduucetufdoteggodetrfdotf
- fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
- uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
- cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeflohhhnhcuvfhh
- ohhmshhonhcuoehgihhtsehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdrtghomh
- drrghuqeenucggtffrrghtthgvrhhnpefffeeihfdukedtuedufeetieeuudfhhefhkefh
- tefgtdeuffekffelleetveduieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh
- epmhgrihhlfhhrohhmpehgihhtsehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdr
- tghomhdrrghu
-X-ME-Proxy: <xmx:C-2-YI0AJZGjcB3wIbI9BoC9X8VNl4i9A7cQnBkvwZ25czWJlkKCLw>
- <xmx:C-2-YGGufw99T-O81-FeiSyEruv6_Pr0IHFhspQdxjv5k1VFTZ0lzQ>
- <xmx:C-2-YJ8BW7DhSDSCEAPSJWrwh_hHP79qreTZtWh_kOUwSh1c0MMlAg>
- <xmx:Du2-YJBeX2Fg9oFZVXGwEJ1ZrZnXHiAqNON8tbpzquYgcm2o_LM48g>
-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
- 8 Jun 2021 00:07:35 -0400 (EDT)
+From cd13e2cd28bf7313b6ad6986bb8d63ea98b37a48 Mon Sep 17 00:00:00 2001
 From: John Thomson <git@johnthomson.fastmail.com.au>
-To: Miquel Raynal <miquel.raynal@bootlin.com>,
- Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>,
- Tudor Ambarus <tudor.ambarus@microchip.com>,
- Michael Walle <michael@walle.cc>, Pratyush Yadav <p.yadav@ti.com>,
- linux-mtd@lists.infradead.org
-Cc: linux-kernel@vger.kernel.org,
- John Thomson <git@johnthomson.fastmail.com.au>,
- kernel test robot <lkp@intel.com>, Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 25 Dec 2020 18:50:08 +1000
 Subject: [PATCH] mtd: spi-nor: write support for minor aligned partitions
-Date: Tue,  8 Jun 2021 14:07:19 +1000
-Message-Id: <20210608040719.14431-1-git@johnthomson.fastmail.com.au>
-X-Mailer: git-send-email 2.31.1
 MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20210607_210745_712053_67A7D864 
-X-CRM114-Status: GOOD (  26.99  )
-X-Spam-Score: -0.8 (/)
-X-Spam-Report: Spam detection software,
- running on the system "bombadil.infradead.org",
- has NOT identified this incoming email as spam.  The original
- message has been attached to this so you can view it or label
- similar future email.  If you have any questions, see
- the administrator of that system for details.
- Content preview:  Do not prevent writing to mtd partitions where a partition
- boundary sits on a minor erasesize boundary. This addresses a FIXME that
- has been present since the start of the linux git history: /* Doesn' [...]
- Content analysis details:   (-0.8 points, 5.0 required)
- pts rule name              description
- ---- ----------------------
- --------------------------------------------------
- -0.7 RCVD_IN_DNSWL_LOW      RBL: Sender listed at https://www.dnswl.org/,
- low trust [66.111.4.221 listed in list.dnswl.org]
- -0.0 SPF_PASS               SPF: sender matches SPF record
- -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
- 0.0 RCVD_IN_MSPIKE_H3      RBL: Good reputation (+3)
- [66.111.4.221 listed in wl.mailspike.net]
- -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 RCVD_IN_MSPIKE_WL      Mailspike good senders
-X-BeenThere: linux-mtd@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>,
- <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/>
-List-Post: <mailto:linux-mtd@lists.infradead.org>
-List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
- <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe>
-Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org>
-Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Do not prevent writing to mtd partitions where a partition boundary sits
 on a minor erasesize boundary.
@@ -197,26 +48,65 @@ user    0m 0.00s		|0m 0.00s	|0m 0.01s
 sys     0m 46.94s		|0m 50.38s	|2m 12.46s
 
 Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
+Signed-off-by: Thibaut VARÈNE <hacks+kernel@slashdirt.org>
+
 ---
-Have not tested on variable erase regions device.
 
 checkpatch does not like the printk(KERN_WARNING
 these should be changed separately beforehand?
 
+Changes v1 -> v2:
+Added mtdcore sysfs for erasesize_minor
+Removed finding minor erasesize for variable erase regions device,
+as untested and no responses regarding it.
+Moved IF_ENABLED for SPINOR variable erase to guard setting
+erasesize_minor in spi-nor/core.c
+Removed setting erasesize to minor where partition boundaries require
+minor erase to be writable
+Simplified minor boundary check by relying on minor being a factor of
+major
+
 Changes RFC -> v1:
 Fix uninitialized variable smatch warning
 Reported-by: kernel test robot <lkp@intel.com>
 Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 ---
- drivers/mtd/mtdpart.c       | 52 ++++++++++++++++++++++++++++---------
- drivers/mtd/spi-nor/Kconfig | 10 +++++++
- drivers/mtd/spi-nor/core.c  | 10 +++++--
+ drivers/mtd/mtdcore.c       | 10 ++++++++++
+ drivers/mtd/mtdpart.c       | 35 +++++++++++++++++++++++++----------
+ drivers/mtd/spi-nor/Kconfig | 10 ++++++++++
+ drivers/mtd/spi-nor/core.c  | 11 +++++++++--
  include/linux/mtd/mtd.h     |  2 ++
- 4 files changed, 60 insertions(+), 14 deletions(-)
+ 5 files changed, 56 insertions(+), 12 deletions(-)
 
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -163,6 +163,15 @@ static ssize_t mtd_erasesize_show(struct
+ }
+ static DEVICE_ATTR(erasesize, S_IRUGO, mtd_erasesize_show, NULL);
+ 
++static ssize_t mtd_erasesize_minor_show(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	struct mtd_info *mtd = dev_get_drvdata(dev);
++
++	return snprintf(buf, PAGE_SIZE, "%lu\n", (unsigned long)mtd->erasesize_minor);
++}
++static DEVICE_ATTR(erasesize_minor, S_IRUGO, mtd_erasesize_minor_show, NULL);
++
+ static ssize_t mtd_writesize_show(struct device *dev,
+ 		struct device_attribute *attr, char *buf)
+ {
+@@ -312,6 +321,7 @@ static struct attribute *mtd_attrs[] = {
+ 	&dev_attr_flags.attr,
+ 	&dev_attr_size.attr,
+ 	&dev_attr_erasesize.attr,
++	&dev_attr_erasesize_minor.attr,
+ 	&dev_attr_writesize.attr,
+ 	&dev_attr_subpagesize.attr,
+ 	&dev_attr_oobsize.attr,
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -40,10 +40,11 @@ static struct mtd_info *allocate_partiti
+@@ -40,6 +40,7 @@ static struct mtd_info *allocate_partiti
  	struct mtd_info *master = mtd_get_master(parent);
  	int wr_alignment = (parent->flags & MTD_NO_ERASE) ?
  			   master->writesize : master->erasesize;
@@ -224,54 +114,22 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
  	u64 parent_size = mtd_is_partition(parent) ?
  			  parent->part.size : parent->size;
  	struct mtd_info *child;
--	u32 remainder;
-+	u32 remainder, remainder_minor;
- 	char *name;
- 	u64 tmp;
- 
-@@ -145,6 +146,7 @@ static struct mtd_info *allocate_partiti
- 		int i, max = parent->numeraseregions;
- 		u64 end = child->part.offset + child->part.size;
- 		struct mtd_erase_region_info *regions = parent->eraseregions;
-+		uint32_t erasesize_minor = child->erasesize;
- 
- 		/* Find the first erase regions which is part of this
- 		 * partition. */
-@@ -155,15 +157,24 @@ static struct mtd_info *allocate_partiti
- 		if (i > 0)
- 			i--;
- 
--		/* Pick biggest erasesize */
- 		for (; i < max && regions[i].offset < end; i++) {
-+			/* Pick biggest erasesize */
- 			if (child->erasesize < regions[i].erasesize)
- 				child->erasesize = regions[i].erasesize;
-+			/* Pick smallest non-zero erasesize */
-+			if ((erasesize_minor > regions[i].erasesize) && (regions[i].erasesize > 0))
-+				erasesize_minor = regions[i].erasesize;
- 		}
-+
-+		if (erasesize_minor < child->erasesize)
-+			child->erasesize_minor = erasesize_minor;
-+
- 		BUG_ON(child->erasesize == 0);
+@@ -164,6 +165,7 @@ static struct mtd_info *allocate_partiti
  	} else {
  		/* Single erase size */
  		child->erasesize = master->erasesize;
-+		if (master->erasesize_minor)
-+			child->erasesize_minor = master->erasesize_minor;
++		child->erasesize_minor = master->erasesize_minor;
  	}
  
  	/*
-@@ -171,26 +182,43 @@ static struct mtd_info *allocate_partiti
+@@ -171,26 +173,39 @@ static struct mtd_info *allocate_partiti
  	 * exposes several regions with different erasesize. Adjust
  	 * wr_alignment accordingly.
  	 */
 -	if (!(child->flags & MTD_NO_ERASE))
 +	if (!(child->flags & MTD_NO_ERASE)) {
  		wr_alignment = child->erasesize;
-+		if (IS_ENABLED(CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE) && child->erasesize_minor)
-+			wr_alignment_minor = child->erasesize_minor;
++		wr_alignment_minor = child->erasesize_minor;
 +	}
  
  	tmp = mtd_get_master_ofs(child, 0);
@@ -284,13 +142,11 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 -		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
 -			part->name);
 +		if (wr_alignment_minor) {
-+			tmp = mtd_get_master_ofs(child, 0);
-+			remainder_minor = do_div(tmp, wr_alignment_minor);
-+			if (remainder_minor == 0)
-+				child->erasesize = child->erasesize_minor;
++			/* rely on minor being a factor of major erasesize */
++			tmp = remainder;
++			remainder = do_div(tmp, wr_alignment_minor);
 +		}
-+
-+		if ((!wr_alignment_minor) || (wr_alignment_minor && remainder_minor != 0)) {
++		if (remainder) {
 +			child->flags &= ~MTD_WRITEABLE;
 +			printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
 +				part->name);
@@ -304,12 +160,11 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 -		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
 -			part->name);
 +		if (wr_alignment_minor) {
-+			tmp = mtd_get_master_ofs(child, 0) + child->part.size;
-+			remainder_minor = do_div(tmp, wr_alignment_minor);
-+			if (remainder_minor == 0)
-+				child->erasesize = child->erasesize_minor;
++			tmp = remainder;
++			remainder = do_div(tmp, wr_alignment_minor);
 +		}
-+		if ((!wr_alignment_minor) || (wr_alignment_minor && remainder_minor != 0)) {
++
++		if (remainder) {
 +			child->flags &= ~MTD_WRITEABLE;
 +			printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
 +				part->name);
@@ -367,11 +222,12 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
  		}
  	}
  
-@@ -2610,6 +2614,8 @@ static int spi_nor_select_erase(struct s
+@@ -2610,6 +2614,9 @@ static int spi_nor_select_erase(struct s
  		return -EINVAL;
  
  	mtd->erasesize = erase->size;
-+	if (erase_minor && erase_minor->size < erase->size)
++	if (IS_ENABLED(CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE) &&
++			erase_minor && erase_minor->size < erase->size)
 +		mtd->erasesize_minor = erase_minor->size;
  	return 0;
  }
diff --git a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
index 4ec33a0b1f..43dcbdbbce 100644
--- a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
+++ b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
@@ -1,159 +1,10 @@
-From patchwork Tue Jun  8 04:07:19 2021
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: John Thomson <git@johnthomson.fastmail.com.au>
-X-Patchwork-Id: 1489105
-X-Patchwork-Delegate: tudor.ambarus@gmail.com
-Return-Path: 
- <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=none (no SPF record) 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=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
-	dkim=pass (2048-bit key;
- secure) header.d=lists.infradead.org header.i=@lists.infradead.org
- header.a=rsa-sha256 header.s=bombadil.20210309 header.b=EMabhVoR;
-	dkim=fail reason="signature verification failed" (2048-bit key;
- unprotected) header.d=fastmail.com.au header.i=@fastmail.com.au
- header.a=rsa-sha256 header.s=fm3 header.b=dLzuZ6dB;
-	dkim=fail reason="signature verification failed" (2048-bit key;
- unprotected) header.d=messagingengine.com header.i=@messagingengine.com
- header.a=rsa-sha256 header.s=fm3 header.b=nSRGsW+C;
-	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 4FzcFN1j1nz9sW8
-	for <incoming@patchwork.ozlabs.org>; Tue,  8 Jun 2021 14:09:28 +1000 (AEST)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
-	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
-	List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc
-	: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=6mUWQd71FwsINycGYY1qOhKz+ecWJVNtwDkTebG3XkA=; b=EMabhVoRE3ad89
-	o3L2AgyKrs+blSofUC3hoSsQe7gi3m4si8S9HW8Z+8SsS5TufUsvGwDl80qSYGlQOytQF+1yRUWvE
-	6FJ/+bqv+TwjqZFibgJ6+9OVsQN9dZ/no1R0bBXIpmrf8ORUmv58QK4ZQquaFKbyXKpFeWOC2MSv4
-	H2MAhyhTU8a3gtooH6G8+KvsJEfVgh6C+aDbwxyh2UY3chHKuw1kvL6AktbfUE2xl4zxi3x3kc70B
-	Wi3LiJBFokxVdgnROXxTU5tI0XboWYkQV64gLuQNV4XKClcuhVpzloDK8Iok6NTd7b32a7TdEFlCS
-	lGKsEKmxtUlW2FpfoduA==;
-Received: from localhost ([::1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
-	id 1lqT1r-006OAW-DX; Tue, 08 Jun 2021 04:07:51 +0000
-Received: from new1-smtp.messagingengine.com ([66.111.4.221])
- by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
- id 1lqT1l-006O9b-Fq
- for linux-mtd@lists.infradead.org; Tue, 08 Jun 2021 04:07:50 +0000
-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
- by mailnew.nyi.internal (Postfix) with ESMTP id 4456B580622;
- Tue,  8 Jun 2021 00:07:42 -0400 (EDT)
-Received: from mailfrontend2 ([10.202.2.163])
- by compute2.internal (MEProxy); Tue, 08 Jun 2021 00:07:42 -0400
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com.au;
- h=from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding; s=fm3; bh=ZXRH+YluM1mHCS1EWUiCY/Sg8O
- LccfHe1oW5iAay6y8=; b=dLzuZ6dBYf7ZA8tWLOBFZYLi7ERsGe/4vnMXG+ovvb
- dNBO0+SaFGwoqYSFrfq/TeyHfKyvxrA7+LCdopIuT4abpLHxtRwtRiafQcDYCPat
- qJIqOZO+wCZC5S9Jc1OP7+t1FviGpgevqIMotci37P+RWc5u3AweMzFljZk90E8C
- uorV6rXagD+OssJQzllRnAIK88+rOAC9ZyXv2gWxy4d1HSCwSWgzx2vnV9CNp918
- YC/3tiHas9krbrPIaAsdBROr7Bvoe/ShRRzruKRuvZVgg5NN90vX+/5ZjI8u04GM
- p2bWCbC62CP6wlcgDaz+c/Sgr5ITd2GPENJsHfqmLRBA==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
- messagingengine.com; h=cc:content-transfer-encoding:date:from
- :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy
- :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZXRH+YluM1mHCS1EW
- UiCY/Sg8OLccfHe1oW5iAay6y8=; b=nSRGsW+CQ2Zx1RVpIUu8W/VD/k5P+32BW
- 5k2ltd+UhI3dfldBPzHrYiOP/IJqGkNW+V+rHASacW/vFygnaZoxNjRYKnOsu+26
- wb2yK3jpl6lsNTg3N1Z4XJrYY2lf9H29DMFbhC67l0PTc050rcZk4XsKTLAlv14Q
- VA4WREYSaX/4IN4O+ES4TMq0a/3gKZh6nvbbJXbsXfK0WlSHTGZtZmW3fyrqvbXa
- t+R7L8vvqWvwls0pV+Sn8LeQqb7+A69w0UOnuznjkcA3sCc2YehcHbxcUEnMH+9N
- bxOjmIDeg9/4X/829tUWUJiLhE5SFmQZ1P6oFtmbWoLrDz0ZJIVBw==
-X-ME-Sender: <xms:C-2-YD2uka4HsA6gcdsV2Ia7vebY4Yjp9E8q7KBMb54jnAzGL7-67Q>
- <xme:C-2-YCEaxASy5VlcrvNO_jLFpMDGkFCRsuVNuZGEQsiRZygk8jPHWq7unPjeT6uYS
- 2pUP6PrTQ2rggjEIg>
-X-ME-Received: 
- <xmr:C-2-YD4exeK49N_YZWWf2BWDhVyCbCY3wwvjTyDOFxeugx7Jg08pzMUToo9oJjrBpcVTaA3kbfk>
-X-ME-Proxy-Cause: 
- gggruggvucftvghtrhhoucdtuddrgeduledrfedtkedgjeduucetufdoteggodetrfdotf
- fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
- uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
- cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeflohhhnhcuvfhh
- ohhmshhonhcuoehgihhtsehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdrtghomh
- drrghuqeenucggtffrrghtthgvrhhnpefffeeihfdukedtuedufeetieeuudfhhefhkefh
- tefgtdeuffekffelleetveduieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh
- epmhgrihhlfhhrohhmpehgihhtsehjohhhnhhthhhomhhsohhnrdhfrghsthhmrghilhdr
- tghomhdrrghu
-X-ME-Proxy: <xmx:C-2-YI0AJZGjcB3wIbI9BoC9X8VNl4i9A7cQnBkvwZ25czWJlkKCLw>
- <xmx:C-2-YGGufw99T-O81-FeiSyEruv6_Pr0IHFhspQdxjv5k1VFTZ0lzQ>
- <xmx:C-2-YJ8BW7DhSDSCEAPSJWrwh_hHP79qreTZtWh_kOUwSh1c0MMlAg>
- <xmx:Du2-YJBeX2Fg9oFZVXGwEJ1ZrZnXHiAqNON8tbpzquYgcm2o_LM48g>
-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
- 8 Jun 2021 00:07:35 -0400 (EDT)
+From acacdac272927ae1d96e0bca51eb82899671eaea Mon Sep 17 00:00:00 2001
 From: John Thomson <git@johnthomson.fastmail.com.au>
-To: Miquel Raynal <miquel.raynal@bootlin.com>,
- Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>,
- Tudor Ambarus <tudor.ambarus@microchip.com>,
- Michael Walle <michael@walle.cc>, Pratyush Yadav <p.yadav@ti.com>,
- linux-mtd@lists.infradead.org
-Cc: linux-kernel@vger.kernel.org,
- John Thomson <git@johnthomson.fastmail.com.au>,
- kernel test robot <lkp@intel.com>, Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 25 Dec 2020 18:50:08 +1000
 Subject: [PATCH] mtd: spi-nor: write support for minor aligned partitions
-Date: Tue,  8 Jun 2021 14:07:19 +1000
-Message-Id: <20210608040719.14431-1-git@johnthomson.fastmail.com.au>
-X-Mailer: git-send-email 2.31.1
 MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20210607_210745_712053_67A7D864 
-X-CRM114-Status: GOOD (  26.99  )
-X-Spam-Score: -0.8 (/)
-X-Spam-Report: Spam detection software,
- running on the system "bombadil.infradead.org",
- has NOT identified this incoming email as spam.  The original
- message has been attached to this so you can view it or label
- similar future email.  If you have any questions, see
- the administrator of that system for details.
- Content preview:  Do not prevent writing to mtd partitions where a partition
- boundary sits on a minor erasesize boundary. This addresses a FIXME that
- has been present since the start of the linux git history: /* Doesn' [...]
- Content analysis details:   (-0.8 points, 5.0 required)
- pts rule name              description
- ---- ----------------------
- --------------------------------------------------
- -0.7 RCVD_IN_DNSWL_LOW      RBL: Sender listed at https://www.dnswl.org/,
- low trust [66.111.4.221 listed in list.dnswl.org]
- -0.0 SPF_PASS               SPF: sender matches SPF record
- -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
- 0.0 RCVD_IN_MSPIKE_H3      RBL: Good reputation (+3)
- [66.111.4.221 listed in wl.mailspike.net]
- -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 RCVD_IN_MSPIKE_WL      Mailspike good senders
-X-BeenThere: linux-mtd@lists.infradead.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>,
- <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/>
-List-Post: <mailto:linux-mtd@lists.infradead.org>
-List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
- <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe>
-Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org>
-Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Do not prevent writing to mtd partitions where a partition boundary sits
 on a minor erasesize boundary.
@@ -197,26 +48,65 @@ user    0m 0.00s		|0m 0.00s	|0m 0.01s
 sys     0m 46.94s		|0m 50.38s	|2m 12.46s
 
 Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
+Signed-off-by: Thibaut VARÈNE <hacks+kernel@slashdirt.org>
+
 ---
-Have not tested on variable erase regions device.
 
 checkpatch does not like the printk(KERN_WARNING
 these should be changed separately beforehand?
 
+Changes v1 -> v2:
+Added mtdcore sysfs for erasesize_minor
+Removed finding minor erasesize for variable erase regions device,
+as untested and no responses regarding it.
+Moved IF_ENABLED for SPINOR variable erase to guard setting
+erasesize_minor in spi-nor/core.c
+Removed setting erasesize to minor where partition boundaries require
+minor erase to be writable
+Simplified minor boundary check by relying on minor being a factor of
+major
+
 Changes RFC -> v1:
 Fix uninitialized variable smatch warning
 Reported-by: kernel test robot <lkp@intel.com>
 Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 ---
- drivers/mtd/mtdpart.c       | 52 ++++++++++++++++++++++++++++---------
- drivers/mtd/spi-nor/Kconfig | 10 +++++++
- drivers/mtd/spi-nor/core.c  | 10 +++++--
+ drivers/mtd/mtdcore.c       | 10 ++++++++++
+ drivers/mtd/mtdpart.c       | 35 +++++++++++++++++++++++++----------
+ drivers/mtd/spi-nor/Kconfig | 10 ++++++++++
+ drivers/mtd/spi-nor/core.c  | 11 +++++++++--
  include/linux/mtd/mtd.h     |  2 ++
- 4 files changed, 60 insertions(+), 14 deletions(-)
+ 5 files changed, 56 insertions(+), 12 deletions(-)
 
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -168,6 +168,15 @@ static ssize_t mtd_erasesize_show(struct
+ }
+ MTD_DEVICE_ATTR_RO(erasesize);
+ 
++static ssize_t mtd_erasesize_minor_show(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	struct mtd_info *mtd = dev_get_drvdata(dev);
++
++	return sysfs_emit(buf, "%lu\n", (unsigned long)mtd->erasesize_minor);
++}
++MTD_DEVICE_ATTR_RO(erasesize_minor);
++
+ static ssize_t mtd_writesize_show(struct device *dev,
+ 		struct device_attribute *attr, char *buf)
+ {
+@@ -313,6 +322,7 @@ static struct attribute *mtd_attrs[] = {
+ 	&dev_attr_flags.attr,
+ 	&dev_attr_size.attr,
+ 	&dev_attr_erasesize.attr,
++	&dev_attr_erasesize_minor.attr,
+ 	&dev_attr_writesize.attr,
+ 	&dev_attr_subpagesize.attr,
+ 	&dev_attr_oobsize.attr,
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -40,10 +40,11 @@ static struct mtd_info *allocate_partiti
+@@ -40,6 +40,7 @@ static struct mtd_info *allocate_partiti
  	struct mtd_info *master = mtd_get_master(parent);
  	int wr_alignment = (parent->flags & MTD_NO_ERASE) ?
  			   master->writesize : master->erasesize;
@@ -224,54 +114,22 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
  	u64 parent_size = mtd_is_partition(parent) ?
  			  parent->part.size : parent->size;
  	struct mtd_info *child;
--	u32 remainder;
-+	u32 remainder, remainder_minor;
- 	char *name;
- 	u64 tmp;
- 
-@@ -145,6 +146,7 @@ static struct mtd_info *allocate_partiti
- 		int i, max = parent->numeraseregions;
- 		u64 end = child->part.offset + child->part.size;
- 		struct mtd_erase_region_info *regions = parent->eraseregions;
-+		uint32_t erasesize_minor = child->erasesize;
- 
- 		/* Find the first erase regions which is part of this
- 		 * partition. */
-@@ -155,15 +157,24 @@ static struct mtd_info *allocate_partiti
- 		if (i > 0)
- 			i--;
- 
--		/* Pick biggest erasesize */
- 		for (; i < max && regions[i].offset < end; i++) {
-+			/* Pick biggest erasesize */
- 			if (child->erasesize < regions[i].erasesize)
- 				child->erasesize = regions[i].erasesize;
-+			/* Pick smallest non-zero erasesize */
-+			if ((erasesize_minor > regions[i].erasesize) && (regions[i].erasesize > 0))
-+				erasesize_minor = regions[i].erasesize;
- 		}
-+
-+		if (erasesize_minor < child->erasesize)
-+			child->erasesize_minor = erasesize_minor;
-+
- 		BUG_ON(child->erasesize == 0);
+@@ -164,6 +165,7 @@ static struct mtd_info *allocate_partiti
  	} else {
  		/* Single erase size */
  		child->erasesize = master->erasesize;
-+		if (master->erasesize_minor)
-+			child->erasesize_minor = master->erasesize_minor;
++		child->erasesize_minor = master->erasesize_minor;
  	}
  
  	/*
-@@ -171,26 +182,43 @@ static struct mtd_info *allocate_partiti
+@@ -171,26 +173,39 @@ static struct mtd_info *allocate_partiti
  	 * exposes several regions with different erasesize. Adjust
  	 * wr_alignment accordingly.
  	 */
 -	if (!(child->flags & MTD_NO_ERASE))
 +	if (!(child->flags & MTD_NO_ERASE)) {
  		wr_alignment = child->erasesize;
-+		if (IS_ENABLED(CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE) && child->erasesize_minor)
-+			wr_alignment_minor = child->erasesize_minor;
++		wr_alignment_minor = child->erasesize_minor;
 +	}
  
  	tmp = mtd_get_master_ofs(child, 0);
@@ -284,13 +142,11 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 -		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
 -			part->name);
 +		if (wr_alignment_minor) {
-+			tmp = mtd_get_master_ofs(child, 0);
-+			remainder_minor = do_div(tmp, wr_alignment_minor);
-+			if (remainder_minor == 0)
-+				child->erasesize = child->erasesize_minor;
++			/* rely on minor being a factor of major erasesize */
++			tmp = remainder;
++			remainder = do_div(tmp, wr_alignment_minor);
 +		}
-+
-+		if ((!wr_alignment_minor) || (wr_alignment_minor && remainder_minor != 0)) {
++		if (remainder) {
 +			child->flags &= ~MTD_WRITEABLE;
 +			printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase/write block boundary -- force read-only\n",
 +				part->name);
@@ -304,12 +160,11 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
 -		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
 -			part->name);
 +		if (wr_alignment_minor) {
-+			tmp = mtd_get_master_ofs(child, 0) + child->part.size;
-+			remainder_minor = do_div(tmp, wr_alignment_minor);
-+			if (remainder_minor == 0)
-+				child->erasesize = child->erasesize_minor;
++			tmp = remainder;
++			remainder = do_div(tmp, wr_alignment_minor);
 +		}
-+		if ((!wr_alignment_minor) || (wr_alignment_minor && remainder_minor != 0)) {
++
++		if (remainder) {
 +			child->flags &= ~MTD_WRITEABLE;
 +			printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase/write block -- force read-only\n",
 +				part->name);
@@ -367,11 +222,12 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
  		}
  	}
  
-@@ -2429,6 +2433,8 @@ static int spi_nor_select_erase(struct s
+@@ -2429,6 +2433,9 @@ static int spi_nor_select_erase(struct s
  		return -EINVAL;
  
  	mtd->erasesize = erase->size;
-+	if (erase_minor && erase_minor->size < erase->size)
++	if (IS_ENABLED(CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE) &&
++			erase_minor && erase_minor->size < erase->size)
 +		mtd->erasesize_minor = erase_minor->size;
  	return 0;
  }