[PATCH 04/15] mtd: nand: sunxi: move ecc strenghts in sunxi_nfc_caps

[Richard GENOUD]

Le 11/10/2025 à 12:41, Jernej Škrabec a écrit :
> Hi!
> 
> Dne petek, 10. oktober 2025 ob 10:40:31 Srednjeevropski poletni čas je Richard Genoud napisal(a):
>> H6/H616 has more ecc strenghts.
>> This commit prepares the change.
>> No functional change.
> 
> Format looks weird. Reword message to something like moving ecc to caps which
> will allow expand support for newer cores.
> 
> Also, there should be empty line before "No functional change."

I'll reword that

Thanks!

> 
> Best regards,
> Jernej
> 
>>
>> Signed-off-by: Richard Genoud <richard.genoud at bootlin.com>
>> ---
>>   drivers/mtd/nand/raw/sunxi_nand.c | 20 ++++++++++++++++----
>>   1 file changed, 16 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
>> index 10a48e0d361f..198dd40f9220 100644
>> --- a/drivers/mtd/nand/raw/sunxi_nand.c
>> +++ b/drivers/mtd/nand/raw/sunxi_nand.c
>> @@ -213,11 +213,15 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand)
>>    *			through MBUS on A23/A33 needs extra configuration.
>>    * @reg_io_data:	I/O data register
>>    * @dma_maxburst:	DMA maxburst
>> + * @ecc_strengths:	Available ECC strengths array
>> + * @nstrengths:		Size of @ecc_strengths
>>    */
>>   struct sunxi_nfc_caps {
>>   	bool has_mdma;
>>   	unsigned int reg_io_data;
>>   	unsigned int dma_maxburst;
>> +	const u8 *ecc_strengths;
>> +	unsigned int nstrengths;
>>   };
>>   
>>   /**
>> @@ -1619,9 +1623,9 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
>>   				       struct nand_ecc_ctrl *ecc,
>>   				       struct device_node *np)
>>   {
>> -	static const u8 strengths[] = { 16, 24, 28, 32, 40, 48, 56, 60, 64 };
>>   	struct sunxi_nand_chip *sunxi_nand = to_sunxi_nand(nand);
>>   	struct sunxi_nfc *nfc = to_sunxi_nfc(nand->controller);
>> +	const u8 *strengths = nfc->caps->ecc_strengths;
>>   	struct mtd_info *mtd = nand_to_mtd(nand);
>>   	struct nand_device *nanddev = mtd_to_nanddev(mtd);
>>   	int nsectors;
>> @@ -1645,7 +1649,7 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
>>   
>>   		ecc->strength = bytes * 8 / fls(8 * ecc->size);
>>   
>> -		for (i = 0; i < ARRAY_SIZE(strengths); i++) {
>> +		for (i = 0; i < nfc->caps->nstrengths; i++) {
>>   			if (strengths[i] > ecc->strength)
>>   				break;
>>   		}
>> @@ -1666,7 +1670,7 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
>>   	}
>>   
>>   	/* Add ECC info retrieval from DT */
>> -	for (i = 0; i < ARRAY_SIZE(strengths); i++) {
>> +	for (i = 0; i < nfc->caps->nstrengths; i++) {
>>   		if (ecc->strength <= strengths[i]) {
>>   			/*
>>   			 * Update ecc->strength value with the actual strength
>> @@ -1677,7 +1681,7 @@ static int sunxi_nand_hw_ecc_ctrl_init(struct nand_chip *nand,
>>   		}
>>   	}
>>   
>> -	if (i >= ARRAY_SIZE(strengths)) {
>> +	if (i >= nfc->caps->nstrengths) {
>>   		dev_err(nfc->dev, "unsupported strength\n");
>>   		return -ENOTSUPP;
>>   	}
>> @@ -2167,15 +2171,23 @@ static void sunxi_nfc_remove(struct platform_device *pdev)
>>   		dma_release_channel(nfc->dmac);
>>   }
>>   
>> +static const u8 sunxi_ecc_strengths_a10[] = {
>> +	16, 24, 28, 32, 40, 48, 56, 60, 64
>> +};
>> +
>>   static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = {
>>   	.reg_io_data = NFC_REG_A10_IO_DATA,
>>   	.dma_maxburst = 4,
>> +	.ecc_strengths = sunxi_ecc_strengths_a10,
>> +	.nstrengths = ARRAY_SIZE(sunxi_ecc_strengths_a10),
>>   };
>>   
>>   static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = {
>>   	.has_mdma = true,
>>   	.reg_io_data = NFC_REG_A23_IO_DATA,
>>   	.dma_maxburst = 8,
>> +	.ecc_strengths = sunxi_ecc_strengths_a10,
>> +	.nstrengths = ARRAY_SIZE(sunxi_ecc_strengths_a10),
>>   };
>>   
>>   static const struct of_device_id sunxi_nfc_ids[] = {
>>
> 
> 
> 
> 


-- 
Richard Genoud, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com