Commit 0e1db393 authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by Miquel Raynal
Browse files

mtd: rawnand: meson: support for 512B ECC step size 



Meson NAND supports both 512B and 1024B ECC step size.

Signed-off-by: default avatarArseniy Krasnov <AVKrasnov@sberdevices.ru>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230717053402.1203724-3-AVKrasnov@sberdevices.ru
parent 350301a3

drivers/mtd/nand/raw/meson_nand.c

+34 −11
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct meson_nfc_nand_chip { 
struct meson_nand_ecc {

	u32 bch;

	u32 strength;

	u32 size;

};



struct meson_nfc_data {
@@ -190,7 +191,8 @@ struct meson_nfc { 
};



enum {

	NFC_ECC_BCH8_1K		= 2,

	NFC_ECC_BCH8_512	= 1,

	NFC_ECC_BCH8_1K,

	NFC_ECC_BCH24_1K,

	NFC_ECC_BCH30_1K,

	NFC_ECC_BCH40_1K,
@@ -198,15 +200,16 @@ enum { 
	NFC_ECC_BCH60_1K,

};



#define MESON_ECC_DATA(b, s)	{ .bch = (b),	.strength = (s)}

#define MESON_ECC_DATA(b, s, sz)	{ .bch = (b), .strength = (s), .size = (sz) }



static struct meson_nand_ecc meson_ecc[] = {

	MESON_ECC_DATA(NFC_ECC_BCH8_1K, 8),

	MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24),

	MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30),

	MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40),

	MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50),

	MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60),

	MESON_ECC_DATA(NFC_ECC_BCH8_512, 8,  512),

	MESON_ECC_DATA(NFC_ECC_BCH8_1K,  8,  1024),

	MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24, 1024),

	MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30, 1024),

	MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40, 1024),

	MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50, 1024),

	MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60, 1024),

};



static int meson_nand_calc_ecc_bytes(int step_size, int strength)
@@ -224,8 +227,27 @@ static int meson_nand_calc_ecc_bytes(int step_size, int strength) 


NAND_ECC_CAPS_SINGLE(meson_gxl_ecc_caps,

		     meson_nand_calc_ecc_bytes, 1024, 8, 24, 30, 40, 50, 60);

NAND_ECC_CAPS_SINGLE(meson_axg_ecc_caps,

		     meson_nand_calc_ecc_bytes, 1024, 8);



static const int axg_stepinfo_strengths[] = { 8 };

static const struct nand_ecc_step_info axg_stepinfo_1024 = {

	.stepsize = 1024,

	.strengths = axg_stepinfo_strengths,

	.nstrengths = ARRAY_SIZE(axg_stepinfo_strengths)

};



static const struct nand_ecc_step_info axg_stepinfo_512 = {

	.stepsize = 512,

	.strengths = axg_stepinfo_strengths,

	.nstrengths = ARRAY_SIZE(axg_stepinfo_strengths)

};



static const struct nand_ecc_step_info axg_stepinfo[] = { axg_stepinfo_1024, axg_stepinfo_512 };



static const struct nand_ecc_caps meson_axg_ecc_caps = {

	.stepinfos = axg_stepinfo,

	.nstepinfos = ARRAY_SIZE(axg_stepinfo),

	.calc_ecc_bytes = meson_nand_calc_ecc_bytes,

};



static struct meson_nfc_nand_chip *to_meson_nand(struct nand_chip *nand)

{
@@ -1257,7 +1279,8 @@ static int meson_nand_bch_mode(struct nand_chip *nand) 
		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(meson_ecc); i++) {

		if (meson_ecc[i].strength == nand->ecc.strength) {

		if (meson_ecc[i].strength == nand->ecc.strength &&

		    meson_ecc[i].size == nand->ecc.size) {

			meson_chip->bch_mode = meson_ecc[i].bch;

			return 0;

		}