Commit 97d13bce authored by Richard Genoud's avatar Richard Genoud Committed by Miquel Raynal
Browse files

mtd: rawnand: sunxi: introduce ecc_err_mask in sunxi_nfc_caps 



The H6/H616 error mask register is bigger than the A10/A23 one, so move
its mask into sunxi_nfc_caps.

No functional change

Signed-off-by: default avatarRichard Genoud <richard.genoud@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 6208274d

drivers/mtd/nand/raw/sunxi_nand.c

+6 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 


/* define bit use in NFC_ECC_ST */

#define NFC_ECC_ERR(x)		BIT(x)

#define NFC_ECC_ERR_MSK		GENMASK(15, 0)

#define NFC_ECC_ERR_MSK(nfc)	(nfc->caps->ecc_err_mask)



/*

 * define bit use in NFC_REG_PAT_FOUND
@@ -246,6 +246,7 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand) 
 * @random_en_mask:	RANDOM_EN mask in NFC_ECC_CTL register

 * @random_dir_mask:	RANDOM_DIRECTION mask in NFC_ECC_CTL register

 * @ecc_mode_mask:	ECC_MODE mask in NFC_ECC_CTL register

 * @ecc_err_mask:	NFC_ECC_ERR mask in NFC_ECC_ST register

 * @pat_found_mask:	ECC_PAT_FOUND mask in NFC_REG_PAT_FOUND register

 * @dma_maxburst:	DMA maxburst

 * @ecc_strengths:	Available ECC strengths array
@@ -263,6 +264,7 @@ struct sunxi_nfc_caps { 
	unsigned int random_en_mask;

	unsigned int random_dir_mask;

	unsigned int ecc_mode_mask;

	unsigned int ecc_err_mask;

	unsigned int pat_found_mask;

	unsigned int dma_maxburst;

	const u8 *ecc_strengths;
@@ -1040,7 +1042,7 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct nand_chip *nand, uint8_t *buf 
		sunxi_nfc_hw_ecc_update_stats(nand, &max_bitflips, ret);

	}



	if (status & NFC_ECC_ERR_MSK) {

	if (status & NFC_ECC_ERR_MSK(nfc)) {

		for (i = 0; i < nchunks; i++) {

			int data_off = i * ecc->size;

			int oob_off = i * (ecc->bytes + USER_DATA_SZ);
@@ -2245,6 +2247,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = { 
	.random_en_mask = BIT(9),

	.random_dir_mask = BIT(10),

	.ecc_mode_mask = GENMASK(15, 12),

	.ecc_err_mask = GENMASK(15, 0),

	.pat_found_mask = GENMASK(31, 16),

	.dma_maxburst = 4,

	.ecc_strengths = sunxi_ecc_strengths_a10,
@@ -2263,6 +2266,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = { 
	.random_en_mask = BIT(9),

	.random_dir_mask = BIT(10),

	.ecc_mode_mask = GENMASK(15, 12),

	.ecc_err_mask = GENMASK(15, 0),

	.pat_found_mask = GENMASK(31, 16),

	.dma_maxburst = 8,

	.ecc_strengths = sunxi_ecc_strengths_a10,