{"id":2219637,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219637/?format=json","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/1.0/projects/3/?format=json","name":"Linux MTD development","link_name":"linux-mtd","list_id":"linux-mtd.lists.infradead.org","list_email":"linux-mtd@lists.infradead.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260403-winbond-v6-18-rc1-spi-nor-swp-v4-11-833dab5e7288@bootlin.com>","date":"2026-04-03T16:09:29","name":"[v4,11/27] mtd: spi-nor: swp: Rename a mask","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e37cee1fdd6484455d03668b56d5374125017905","submitter":{"id":73368,"url":"http://patchwork.ozlabs.org/api/1.0/people/73368/?format=json","name":"Miquel Raynal","email":"miquel.raynal@bootlin.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20260403-winbond-v6-18-rc1-spi-nor-swp-v4-11-833dab5e7288@bootlin.com/mbox/","series":[{"id":498652,"url":"http://patchwork.ozlabs.org/api/1.0/series/498652/?format=json","date":"2026-04-03T16:09:18","name":"mtd: spi-nor: Enhance software protection","version":4,"mbox":"http://patchwork.ozlabs.org/series/498652/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219637/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=oSQPiAvQ;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=desiato.20200630 header.b=HHb03HFj;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256\n header.s=dkim header.b=fX0TW3G+;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fnNwr0P6Gz1xtJ\n\tfor ; Sat, 04 Apr 2026 03:10:20 +1100 (AEDT)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w8h65-00000002HG3-1LHr;\n\tFri, 03 Apr 2026 16:10:13 +0000","from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w8h60-00000002H8Q-3fjV\n\tfor linux-mtd@bombadil.infradead.org;\n\tFri, 03 Apr 2026 16:10:09 +0000","from smtpout-04.galae.net ([185.171.202.116])\n\tby desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w8h5w-00000004ONT-3NYg\n\tfor linux-mtd@lists.infradead.org;\n\tFri, 03 Apr 2026 16:10:07 +0000","from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233])\n\tby smtpout-04.galae.net (Postfix) with ESMTPS id C8EA9C59F65;\n\tFri, 3 Apr 2026 16:10:35 +0000 (UTC)","from mail.galae.net (mail.galae.net [212.83.136.155])\n\tby smtpout-01.galae.net (Postfix) with ESMTPS id CC75B603C1;\n\tFri, 3 Apr 2026 16:10:03 +0000 (UTC)","from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon)\n with ESMTPSA id 3796A104500FB;\n\tFri, 3 Apr 2026 18:10:00 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id\n\t:MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=CPgY8Jz23uQJrMwt9QWzDkYdYYRQIY/e4DMF36TZgpw=; b=oSQPiAvQoHkr7Q\n\t+kvRa8GoddcF3xlj5wpLpqA1Ktb19UPIwGOyguPJsDYvcpzjyARGfZKCk1nw+HxdbJ06G+jDwYMtj\n\tBO8YY5ydpsb6ciAbav/FGVe/Qz+sxEtmZPlhOWIgJgKxUQkVJk2OpoTkzPwxReeiuxqSU71t01/9n\n\tbVV9UBP5kn/cssZLYFneZ++jDMSv+oKI+2fz7dvxDzNciLFcDRNXzlIo3IhjqB6T1YjwSqM81B6AZ\n\tuwvKVzGsGKnvcsHpxWL36E5+msI0TS4Hfxwn6jUDc3XvzljdpG7P3MoxDTx+rZuNLwD7avDQ98yLW\n\t3HHvC6oO+8ZCmqYymlzA==;","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References:\n\tMessage-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:\n\tFrom:Sender:Reply-To:Content-ID:Content-Description;\n\tbh=8PfJAvOeYuhH5dbaDKJSTXCqDQ9KrVUp5a2zaIJVtqQ=; b=HHb03HFjhGPcnahUp+GwG/3M8a\n\tw84SDrNrerro58ON1Iq2b6fKFywmqlxqyuuUJVkwsr+gPfkZXxzayX4e6m5mIMR25Bsto/OmE/Bpb\n\thTOYUsi5S+Ev2Pw94snmqVvk2fXwwIP1R1memZoVfIwmrHowqZGfA8duOgiaLiRFcHX8G3GWE6Kj+\n\tXAksU455X1EfaK65or39vdTPgY0M9wBuiH4NagRuLGPJ9W0x75HA74nOeZNRDJofC37GsK2YnSc6s\n\tESKY1fKKwqmByzaVES5etp6nWvJ/DnqPXwIT1Ctt+V32SsulSXXQnSGsHDgixoOxsiHJSgkDrm1pA\n\tOFgSrqNg==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim;\n\tt=1775232602; h=from:subject:date:message-id:to:cc:mime-version:content-type:\n\t content-transfer-encoding:in-reply-to:references;\n\tbh=8PfJAvOeYuhH5dbaDKJSTXCqDQ9KrVUp5a2zaIJVtqQ=;\n\tb=fX0TW3G+QCtp4oSRisM4uUPTCgxO0PWqGemlRIr5nkFNOHaoSzkduz4HpALyNhrYLSq8/F\n\tkGdMa5s3r718SBxAkzFC/oda64BcExkVZ4ZZGV2f7IZLyesthcuL2kXtBQnW1R0UccIlf0\n\tslDX60Mz/1xNX6zErIDZnwBmC8Y01TPWCDH/JZ/uHHAaw5glgP918C7Rk6WHQHzjv/Oblj\n\tLJI4abbCNTT4UKd7Jyte5s8C2jbD8q8IeVkzjwLaDT5wP4aJMfRHDqF6MxzzB2DiIyuuPL\n\tRO8y4kgbaw4xBzGXVohvHl83fX3AdLQ0FUgHy7QRpmFOxyu/Y04Sh1/koj3bHQ=="],"From":"Miquel Raynal ","Date":"Fri, 03 Apr 2026 18:09:29 +0200","Subject":"[PATCH v4 11/27] mtd: spi-nor: swp: Rename a mask","MIME-Version":"1.0","Message-Id":"\n <20260403-winbond-v6-18-rc1-spi-nor-swp-v4-11-833dab5e7288@bootlin.com>","References":"\n <20260403-winbond-v6-18-rc1-spi-nor-swp-v4-0-833dab5e7288@bootlin.com>","In-Reply-To":"\n <20260403-winbond-v6-18-rc1-spi-nor-swp-v4-0-833dab5e7288@bootlin.com>","To":"Pratyush Yadav , Michael Walle ,\n Takahiro Kuwano ,\n Richard Weinberger , Vignesh Raghavendra ,\n Jonathan Corbet ","Cc":"Sean Anderson ,\n Thomas Petazzoni ,\n Steam Lin , linux-mtd@lists.infradead.org,\n linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,\n Miquel Raynal ","X-Mailer":"b4 0.14.3","X-Last-TLS-Session-Version":"TLSv1.3","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20260403_171005_026155_565910FD ","X-CRM114-Status":"GOOD ( 11.04 )","X-Spam-Score":"-0.2 (/)","X-Spam-Report":"Spam detection software,\n running on the system \"desiato.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: \"mask\" is not very descriptive when we already manipulate\n two masks,\n and soon will manipulate three. Rename it \"bp_mask\" to align with\n the existing \"tb_mask\" and soon \"cmp_mask\". Signed-off-by: Miquel Raynal\n --- drivers/mtd/spi-nor/swp.c | 24 ++++++++++++\n 1 file changed, 12 insertions(+), 12 deletions(-)\n Content analysis details: (-0.2 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.0 SPF_HELO_PASS SPF: HELO matches SPF record\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [185.171.202.116 listed in\n sa-accredit.habeas.com]\n 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The\n query to Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [185.171.202.116 listed in\n sa-trusted.bondedsender.org]\n 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [185.171.202.116 listed in\n bl.score.senderscore.com]","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"\"mask\" is not very descriptive when we already manipulate two masks, and\nsoon will manipulate three. Rename it \"bp_mask\" to align with the\nexisting \"tb_mask\" and soon \"cmp_mask\".\n\nSigned-off-by: Miquel Raynal \n---\n drivers/mtd/spi-nor/swp.c | 24 ++++++++++++------------\n 1 file changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/mtd/spi-nor/swp.c b/drivers/mtd/spi-nor/swp.c\nindex af6e577d9b42..66f85826ba0d 100644\n--- a/drivers/mtd/spi-nor/swp.c\n+++ b/drivers/mtd/spi-nor/swp.c\n@@ -57,9 +57,9 @@ static void spi_nor_get_locked_range_sr(struct spi_nor *nor, const u8 *sr, loff_\n \t\t\t\t\tu64 *len)\n {\n \tu64 min_prot_len;\n-\tu8 mask = spi_nor_get_sr_bp_mask(nor);\n+\tu8 bp_mask = spi_nor_get_sr_bp_mask(nor);\n \tu8 tb_mask = spi_nor_get_sr_tb_mask(nor);\n-\tu8 bp, val = sr[0] & mask;\n+\tu8 bp, val = sr[0] & bp_mask;\n \n \tif (nor->flags & SNOR_F_HAS_SR_BP3_BIT6 && val & SR_BP3_BIT6)\n \t\tval = (val & ~SR_BP3_BIT6) | SR_BP3;\n@@ -160,7 +160,7 @@ static int spi_nor_sr_lock(struct spi_nor *nor, loff_t ofs, u64 len)\n \tu64 min_prot_len;\n \tint ret;\n \tu8 status_old[1] = {}, status_new[1] = {};\n-\tu8 mask = spi_nor_get_sr_bp_mask(nor);\n+\tu8 bp_mask = spi_nor_get_sr_bp_mask(nor);\n \tu8 tb_mask = spi_nor_get_sr_tb_mask(nor);\n \tu8 pow, val;\n \tloff_t lock_len;\n@@ -199,7 +199,7 @@ static int spi_nor_sr_lock(struct spi_nor *nor, loff_t ofs, u64 len)\n \t\tlock_len = ofs + len;\n \n \tif (lock_len == nor->params->size) {\n-\t\tval = mask;\n+\t\tval = bp_mask;\n \t} else {\n \t\tmin_prot_len = spi_nor_get_min_prot_length_sr(nor);\n \t\tpow = ilog2(lock_len) - ilog2(min_prot_len) + 1;\n@@ -208,15 +208,15 @@ static int spi_nor_sr_lock(struct spi_nor *nor, loff_t ofs, u64 len)\n \t\tif (nor->flags & SNOR_F_HAS_SR_BP3_BIT6 && val & SR_BP3)\n \t\t\tval = (val & ~SR_BP3) | SR_BP3_BIT6;\n \n-\t\tif (val & ~mask)\n+\t\tif (val & ~bp_mask)\n \t\t\treturn -EINVAL;\n \n \t\t/* Don't \"lock\" with no region! */\n-\t\tif (!(val & mask))\n+\t\tif (!(val & bp_mask))\n \t\t\treturn -EINVAL;\n \t}\n \n-\tstatus_new[0] = (status_old[0] & ~mask & ~tb_mask) | val;\n+\tstatus_new[0] = (status_old[0] & ~bp_mask & ~tb_mask) | val;\n \n \t/*\n \t * Disallow further writes if WP# pin is neither left floating nor\n@@ -234,7 +234,7 @@ static int spi_nor_sr_lock(struct spi_nor *nor, loff_t ofs, u64 len)\n \t\treturn 0;\n \n \t/* Only modify protection if it will not unlock other areas */\n-\tif ((status_new[0] & mask) < (status_old[0] & mask))\n+\tif ((status_new[0] & bp_mask) < (status_old[0] & bp_mask))\n \t\treturn -EINVAL;\n \n \treturn spi_nor_write_sr_and_check(nor, status_new[0]);\n@@ -250,7 +250,7 @@ static int spi_nor_sr_unlock(struct spi_nor *nor, loff_t ofs, u64 len)\n \tu64 min_prot_len;\n \tint ret;\n \tu8 status_old[1], status_new[1];\n-\tu8 mask = spi_nor_get_sr_bp_mask(nor);\n+\tu8 bp_mask = spi_nor_get_sr_bp_mask(nor);\n \tu8 tb_mask = spi_nor_get_sr_tb_mask(nor);\n \tu8 pow, val;\n \tloff_t lock_len;\n@@ -306,11 +306,11 @@ static int spi_nor_sr_unlock(struct spi_nor *nor, loff_t ofs, u64 len)\n \t\t\tval = (val & ~SR_BP3) | SR_BP3_BIT6;\n \n \t\t/* Some power-of-two sizes may not be supported */\n-\t\tif (val & ~mask)\n+\t\tif (val & ~bp_mask)\n \t\t\treturn -EINVAL;\n \t}\n \n-\tstatus_new[0] = (status_old[0] & ~mask & ~tb_mask) | val;\n+\tstatus_new[0] = (status_old[0] & ~bp_mask & ~tb_mask) | val;\n \n \t/* Don't protect status register if we're fully unlocked */\n \tif (lock_len == 0)\n@@ -324,7 +324,7 @@ static int spi_nor_sr_unlock(struct spi_nor *nor, loff_t ofs, u64 len)\n \t\treturn 0;\n \n \t/* Only modify protection if it will not lock other areas */\n-\tif ((status_new[0] & mask) > (status_old[0] & mask))\n+\tif ((status_new[0] & bp_mask) > (status_old[0] & bp_mask))\n \t\treturn -EINVAL;\n \n \treturn spi_nor_write_sr_and_check(nor, status_new[0]);\n","prefixes":["v4","11/27"]}