mtd: spi-nor: swp: check SR_TB flag when getting tb_mask

DragonBluep · gregkh · commit f110ecdcfde7 · 2026-05-23T13:09:06.000+02:00
[ Upstream commit 94645aa ] When the chip does not support top/bottom block protect, the tb_mask must be set to 0, otherwise SR1 bit5 will be unexpectedly modified. Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Fixes: 3dd8012 ("mtd: spi-nor: add TB (Top/Bottom) protect support") Reviewed-by: Michael Walle <mwalle@kernel.org> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Pratyush Yadav (Google) <pratyush@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/mtd/spi-nor/swp.c b/drivers/mtd/spi-nor/swp.c
@@ -28,8 +28,10 @@ static u8 spi_nor_get_sr_tb_mask(struct spi_nor *nor)
 {
 	if (nor->flags & SNOR_F_HAS_SR_TB_BIT6)
 		return SR_TB_BIT6;
-	else
+	else if (nor->flags & SNOR_F_HAS_SR_TB)
 		return SR_TB_BIT5;
+	else
+		return 0;
 }
 
 static u64 spi_nor_get_min_prot_length_sr(struct spi_nor *nor)

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ static u8 spi_nor_get_sr_tb_mask(struct spi_nor *nor)`
`28`	`28`	`{`
`29`	`29`	`if (nor->flags & SNOR_F_HAS_SR_TB_BIT6)`
`30`	`30`	`return SR_TB_BIT6;`
`31`		`- else`
	`31`	`+ else if (nor->flags & SNOR_F_HAS_SR_TB)`
`32`	`32`	`return SR_TB_BIT5;`
	`33`	`+ else`
	`34`	`+ return 0;`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`static u64 spi_nor_get_min_prot_length_sr(struct spi_nor *nor)`