[PATCH v11 05/26] mtd: rawnand: sunxi: reject ECC layouts that overwrite the bad-block marker
From: James Hilliard
Date: Fri Nov 20 2026 - 20:11:36 EST
On 8-bit NAND with 512-byte pages the factory bad-block marker is at
OOB byte 5. With a 512-byte BCH16 step and 32 spare bytes, A10 and A23
can fit all the parity, but only bytes 0 through 3 are user data. Byte
5 is generated parity: programming a good block can change its marker,
and a mark-bad write cannot set it independently.
Reject on-host ECC if the marker is outside the two bytes reserved for
it by the layout. Leave the on-flash marker at its NAND-defined offset.
This also rejects some configurations that used to probe. On A10 and
A23, requesting a 1 KiB hardware ECC step on a 512-byte page could
trigger a fallback to software Hamming. That fallback kept the
controller's OOB layout: its first three parity bytes occupied offsets
4 through 6, including the marker at byte 5. Selecting software ECC or
no ECC explicitly does not install the controller's layout.
Fixes: 1fef62c1423b ("mtd: nand: add sunxi NAND flash controller support")
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
drivers/mtd/nand/raw/sunxi_nand.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index ffbe851b87c7..086618dee999 100644
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -221,6 +221,7 @@
* On H6/H616, this size became configurable, from 0 bytes to 32, via the
* USER_DATA_LEN registers.
*/
+#define SUNXI_NFC_BBM_SIZE 2
#define USER_DATA_SZ 4
#define SUNXI_NFC_MAX_USER_DATA_SZ 32
@@ -1939,14 +1940,9 @@ static int sunxi_nand_ooblayout_free(struct mtd_info *mtd, int section,
user_data_sz = sunxi_nfc_user_data_sz(sunxi_nand, section);
- /*
- * The first 2 bytes are used for BB markers, hence we
- * only have user_data_sz - 2 bytes available in the first user data
- * section.
- */
if (section == 0) {
- oobregion->offset = 2;
- oobregion->length = user_data_sz > 2 ? user_data_sz - 2 : 0;
+ oobregion->offset = SUNXI_NFC_BBM_SIZE;
+ oobregion->length = user_data_sz - SUNXI_NFC_BBM_SIZE;
return 0;
}
@@ -2099,6 +2095,12 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
if (mtd->oobsize < sunxi_get_oob_offset(sunxi_nand, ecc, nsectors))
return -EINVAL;
+ if (nand->badblockpos >= SUNXI_NFC_BBM_SIZE) {
+ dev_err(nfc->dev, "cannot store bad-block marker at OOB byte %u\n",
+ nand->badblockpos);
+ return -EOPNOTSUPP;
+ }
+
ecc->read_oob = sunxi_nfc_hw_ecc_read_oob;
ecc->write_oob = sunxi_nfc_hw_ecc_write_oob;
mtd_set_ooblayout(mtd, &sunxi_nand_ooblayout_ops);
--
2.53.0