Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 7 Jun 2023 10:06:07 +0200
From:   Miquel Raynal <miquel.raynal@bootlin.com>
To:     William Zhang <william.zhang@broadcom.com>
Cc:     Broadcom Kernel List <bcm-kernel-feedback-list@broadcom.com>,
        Linux MTD List <linux-mtd@lists.infradead.org>,
        f.fainelli@gmail.com, rafal@milecki.pl, kursad.oney@broadcom.com,
        joel.peshkin@broadcom.com, computersforpeace@gmail.com,
        anand.gore@broadcom.com, dregan@mail.com, kamal.dasu@broadcom.com,
        tomer.yacoby@broadcom.com, dan.beygelman@broadcom.com,
        Florian Fainelli <florian.fainelli@broadcom.com>,
        Rob Herring <robh@kernel.org>, linux-kernel@vger.kernel.org,
        Vignesh Raghavendra <vigneshr@ti.com>,
        Richard Weinberger <richard@nod.at>,
        Boris Brezillon <bbrezillon@kernel.org>,
        Kamal Dasu <kdasu.kdev@gmail.com>
Subject: Re: [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field
 setting for v7.2 controller
Message-ID: <20230607100607.135bfba4@xps-13>
In-Reply-To: <20230606231252.94838-2-william.zhang@broadcom.com>
References: <20230606231252.94838-1-william.zhang@broadcom.com>
        <20230606231252.94838-2-william.zhang@broadcom.com>
Organization: Bootlin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi William,

william.zhang@broadcom.com wrote on Tue,  6 Jun 2023 16:12:41 -0700:

> v7.2 controller has different ECC level field size and shift in the acc
> control register than its predecessor and successor controller. It needs
> to be set specifically.
>=20
> Fixes: decba6d47869 ("mtd: brcmnand: Add v7.2 controller support")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
>=20
>  drivers/mtd/nand/raw/brcmnand/brcmnand.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>=20
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/=
raw/brcmnand/brcmnand.c
> index 2e9c2e2d9c9f..b2cde1082b3b 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -977,12 +977,20 @@ static inline u32 brcmnand_ecc_level_mask(struct br=
cmnand_controller *ctrl)
>  	mask <<=3D NAND_ACC_CONTROL_ECC_SHIFT;
> =20
>  	/* v7.2 includes additional ECC levels */
> -	if (ctrl->nand_version >=3D 0x0702)
> +	if (ctrl->nand_version =3D=3D 0x0702)
>  		mask |=3D 0x7 << NAND_ACC_CONTROL_ECC_EXT_SHIFT;
> =20
>  	return mask;
>  }
> =20
> +static inline int brcmnand_ecc_level_shift(struct brcmnand_controller *c=
trl)
> +{
> +	if (ctrl->nand_version =3D=3D 0x0702)
> +		return NAND_ACC_CONTROL_ECC_EXT_SHIFT;
> +	else
> +		return NAND_ACC_CONTROL_ECC_SHIFT;
> +}
> +
>  static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
>  {
>  	struct brcmnand_controller *ctrl =3D host->ctrl;
> @@ -992,8 +1000,8 @@ static void brcmnand_set_ecc_enabled(struct brcmnand=
_host *host, int en)
> =20
>  	if (en) {
>  		acc_control |=3D ecc_flags; /* enable RD/WR ECC */
> -		acc_control |=3D host->hwcfg.ecc_level
> -			       << NAND_ACC_CONTROL_ECC_SHIFT;
> +		acc_control &=3D ~brcmnand_ecc_level_mask(ctrl);

Could we use static driver data instead? Let's avoid making
non-useful function calls when this can easily be avoided.

> +		acc_control |=3D host->hwcfg.ecc_level << brcmnand_ecc_level_shift(ctr=
l);
>  	} else {
>  		acc_control &=3D ~ecc_flags; /* disable RD/WR ECC */
>  		acc_control &=3D ~brcmnand_ecc_level_mask(ctrl);


Thanks,
Miqu=C3=A8l